summaryrefslogtreecommitdiff
path: root/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in')
-rw-r--r--x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in58
1 files changed, 24 insertions, 34 deletions
diff --git a/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in b/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in
index 75dac641b9c0..6007fec5f8f6 100644
--- a/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in
+++ b/x11-wm/fluxbox/files/patch-util__fluxbox-generate_menu.in
@@ -1,6 +1,6 @@
---- util/fluxbox-generate_menu.in.orig 2012-12-10 18:26:53.000000000 +0100
-+++ util/fluxbox-generate_menu.in 2013-01-02 14:22:14.000000000 +0100
-@@ -68,7 +68,7 @@
+--- util/fluxbox-generate_menu.in.orig 2015-02-08 10:44:45 UTC
++++ util/fluxbox-generate_menu.in
+@@ -68,7 +68,7 @@ Options:
-d Other path(s) to recursively search for *.desktop files
-ds Wider search for *.desktop files (takes more time)
-i Other path(s) to search for icons
@@ -9,7 +9,7 @@
-is Wider search for icons (worth the extra time)
-in Skip icon search
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ Options:
Only for packagers:
-p Prefix; default is @PREFIX@
@@ -18,7 +18,7 @@
-q KDE-prefix; idem dito
-@@ -145,13 +145,42 @@
+@@ -145,13 +145,42 @@ testoption() {
esac
}
@@ -67,7 +67,7 @@
#echo "replaceWithinString: $1, $2, $3" >&2
#echo ${1//$2/$3} # causes error in BSD even though not used
-@@ -203,7 +232,7 @@
+@@ -203,7 +232,7 @@ convertIcon(){
if [ -f "${entry_icon}" ]; then
: echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2
else
@@ -76,7 +76,7 @@
convert "$1" "$entry_icon"
# echo convert "$1" , "$entry_icon" >> $ICONMAPPING
else
-@@ -275,7 +304,7 @@
+@@ -275,7 +304,7 @@ doSearch(){
# echo -n "for $temp_icon"
eval doSearchLoop $USER_ICONPATHS \
"$FB_ICONDIR" \
@@ -85,7 +85,7 @@
${OTHER_ICONPATHS} \
-@@ -558,7 +587,7 @@
+@@ -558,7 +587,7 @@ rm -f ${MENUFILENAME}.tmp
WHOAMI=`whoami`
@@ -94,7 +94,7 @@
# Check for Imlib2-support
if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then
-@@ -1271,16 +1300,16 @@
+@@ -1271,16 +1300,16 @@ if [ ! "${INSTALL}" = Yes ]; then
# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
# your prefix is: @PREFIX@
@@ -115,7 +115,7 @@
# --- Boolean variables.
-@@ -1327,29 +1356,21 @@
+@@ -1327,29 +1356,21 @@ while [ $# -gt 0 ]; do
-g) GNOMEMENU=yes; shift;;
-in) NO_ICON=yes; shift;;
-is) OTHER_ICONPATHS="
@@ -157,7 +157,7 @@
"
# /usr/share/apps \
shift;;
-@@ -1420,13 +1441,12 @@
+@@ -1420,13 +1441,12 @@ fi
# prefix
PREFIX="${PREFIX:=@PREFIX@}"
if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
@@ -173,7 +173,7 @@
if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
break;
fi
-@@ -1434,7 +1454,7 @@
+@@ -1434,7 +1454,7 @@ done
# Will remain $PREFIX if all else fails
# kde prefix
@@ -182,38 +182,28 @@
if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
break;
fi
-@@ -1522,7 +1542,7 @@
+@@ -1522,7 +1542,7 @@ if find_it_options $MY_BROWSER; then
else
[ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
#The precise order is up for debate.
-- for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
-+ for browser in chrome firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
+- for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
++ for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
if find_it_options $browser; then
DEFAULT_BROWSER=$browser
break
-@@ -1581,9 +1601,10 @@
-
- case "$DEFAULT_BROWSERNAME" in
- links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
-- firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
-+ chrome|firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
+@@ -1589,6 +1609,7 @@ case "$DEFAULT_BROWSERNAME" in
+ chrome|chromium) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
+ google-chrome) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
-- opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
-+ linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
-+ opera) append "[exec] (opera) {opera}" ;;
++ linux-opera) append "[exec] (linux-opera) {env QT_XFT=true linux-opera}" ;;
+ opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
- *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
-@@ -1600,9 +1621,10 @@
-
- append_submenu "${NETMENU}"
+@@ -1608,6 +1629,7 @@ append_submenu "${NETMENU}"
append_submenu "${BROWSERMENU}"
-- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
-+ normal_find chrome firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
+ normal_find chrome chromium firefox google-chrome mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}"
-- find_it opera append "[exec] (opera) {env QT_XFT=true opera}"
-+ find_it linux-opera append "[exec] (linux-opera) {linux-opera}"
-+ find_it opera append "[exec] (opera) {opera}"
++ find_it linux-opera append "[exec] (linux-opera) {env QT_XFT=true opera}"
+ find_it opera append "[exec] (opera) {env QT_XFT=true opera}"
find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}"
find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
- find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}"
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 17:32:02 +0000