diff options
Diffstat (limited to 'x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in')
| -rw-r--r-- | x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in | 69 |
1 files changed, 9 insertions, 60 deletions
diff --git a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in index d4ef59d6b191..72498fed3ddd 100644 --- a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in +++ b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in @@ -1,5 +1,5 @@ ---- util/fluxbox-generate_menu.in.orig Mon Jan 5 16:00:08 2004 -+++ util/fluxbox-generate_menu.in Mon Jan 5 16:09:15 2004 +--- util/fluxbox-generate_menu.in.orig Thu Jan 22 00:45:46 2004 ++++ util/fluxbox-generate_menu.in Thu Jan 22 00:51:27 2004 @@ -45,7 +45,7 @@ @@ -20,22 +20,13 @@ -q KDE-prefix; idem dito -@@ -599,7 +599,7 @@ - # Name of the outputfile - # MENUFILENAME=${HOME}/.fluxbox/menu - --# MENUTITLE=\`fluxbox -version|cut -d " " -f-2\` -+# MENUTITLE=\`fluxbox-devel -version|cut -d " " -f-2\` - - # standard url for console-browsers - # HOMEPAGE=fluxbox.org -@@ -611,19 +611,19 @@ +@@ -614,19 +614,19 @@ # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run' # --- PREFIX'es -# These are prefixes; So if fluxbox is installed in /usr/bin/fluxbox -# your prefix is: /usr -+# These are prefixes; So if fluxbox-devel is installed in @PREFIX@/bin/fluxbox-devel ++# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox +# your prefix is: @PREFIX@ -# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so @@ -52,17 +43,11 @@ # Sepparate the list of background-dirs with semicolumns ':' -# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:/usr/local/share/fluxbox/backgrounds/:/usr/share/wallpapers" -+# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox-devel/backgrounds/:%%X11BASE%%/share/wallpapers" ++# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%X11BASE%%/share/wallpapers" # --- Boolean variables. -@@ -741,12 +741,12 @@ - # prefix - PREFIX="${PREFIX:=@PREFIX@}" - if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then -- PREFIX=`which fluxbox | sed 's,/bin/fluxbox$,,'` -+ PREFIX=`which fluxbox-devel | sed 's,/bin/fluxbox$,,'` - fi +@@ -749,7 +749,7 @@ # gnome prefix @@ -71,7 +56,7 @@ if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then break; fi -@@ -754,7 +754,7 @@ +@@ -757,7 +757,7 @@ # Will remain $PREFIX if all else fails # kde prefix @@ -80,16 +65,7 @@ if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then break; fi -@@ -762,7 +762,7 @@ - - # directory for the backgrounds - if [ -z "$BACKGROUND_DIRS" ]; then -- BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:${PREFIX}/share/fluxbox/backgrounds/" -+ BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:${PREFIX}/share/fluxbox-devel/backgrounds/" - fi - - # find the default terminal -@@ -837,7 +837,7 @@ +@@ -840,7 +840,7 @@ links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; @@ -98,7 +74,7 @@ MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; esac -@@ -853,7 +853,7 @@ +@@ -856,7 +856,7 @@ append_submenu "${NETMENU}" append_submenu "${BROWSERMENU}" normal_find mozilla-firebird MozillaFirebird galeon mozilla dillo netscape @@ -107,30 +83,3 @@ 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}}" -@@ -996,7 +996,7 @@ - append "[config] (${CONFIGUREMENU})" - - append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" -- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" -+ append "[stylesdir] (${PREFIX}/share/fluxbox-devel/styles)" - append_menu_end - - append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}" -@@ -1006,7 +1006,7 @@ - # Backgroundmenu - addbackground() { - picturename=`basename "$1"` -- append "[exec] (${picturename%.???}) {fbsetbg -a \"$1\" }" -+ append "[exec] (${picturename%.???}) {fbsetbg-devel -a \"$1\" }" - } - - if [ "$BACKGROUNDMENUITEM" = yes ]; then -@@ -1014,7 +1014,7 @@ - NUMBER_OF_BACKGROUNDS=`find $BACKGROUND_DIRS -follow -type f 2> /dev/null|wc -l` - if [ "$NUMBER_OF_BACKGROUNDS" -gt 0 ]; then - append_menu "[submenu] (${BACKGROUNDMENU}) {${BACKGROUNDMENUTITLE}}" -- append "[exec] (random background) {fbsetbg -r ${HOME}/.fluxbox/backgrounds}" -+ append "[exec] (random background) {fbsetbg-devel -r ${HOME}/.fluxbox/backgrounds}" - if [ "$NUMBER_OF_BACKGROUNDS" -gt 30 ]; then - menucounter=1 ; counter=1 - append_menu "[submenu] (${BACKGROUNDMENU} $menucounter) {${BACKGROUNDMENUTITLE}}" |