Ticket #42317: patch-libcpp.diff

src/fluxbox.cc

@@ -1355 +1355 @@
         FocusControl::setFocusedWindow(0);
 }
 
-bool Fluxbox::validateClient(const WinClient *client) const {
+bool Fluxbox::validateClient(WinClient *client) const {
     WinClientMap::const_iterator it =
         find_if(m_window_search.begin(),
                 m_window_search.end(),

src/fluxbox.hh

@@ -88 +88 @@
     /// main event loop
     void eventLoop();
     bool validateWindow(Window win) const;
-    bool validateClient(const WinClient *client) const;
+    bool validateClient(WinClient *client) const;
 
     void grab();
     void ungrab();

util/fbsetbg

@@ -49 +49 @@
 
 
 WHOAMI=`whoami`
-[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
+[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin && . @PREFIX@/bin/init.sh
 
 command="`basename \"$0\"`"
 

util/fluxbox-generate_menu.in

@@ -275 +275 @@
     # echo -n "for $temp_icon"
     eval doSearchLoop $USER_ICONPATHS \
       "$FB_ICONDIR" \
+      "@PREFIX@/share/${execname%% *}" \
       "/usr/share/${execname%% *}" \
       ${OTHER_ICONPATHS} \
 
@@ -558 +559 @@
 
 
 WHOAMI=`whoami`
-[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin && . @PREFIX@/bin/init.sh
 
 # Check for Imlib2-support
 if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then
@@ -1327 +1328 @@
         -g) GNOMEMENU=yes; shift;;
         -in) NO_ICON=yes; shift;;
         -is) OTHER_ICONPATHS="
+                @PREFIX@/share/icons,
+                @PREFIX@/share/pixmaps,
+                @PREFIX@/share/icons/default/16x16,
+                @PREFIX@/share/icons/kde/16x16,
+                @PREFIX@/share/icons/default.kde/16x16,
+                @PREFIX@/share/icons/gnome/16x16,
+                @PREFIX@/share/icons/hicolor/16x16,
+                @PREFIX@/share/icons/locolor/16x16,
                 /usr/share/icons
                 /usr/share/icons/mini
                 /usr/share/pixmaps
@@ -1346 +1355 @@
             "
             shift;;
         -ds) OTHER_DESKTOP_PATHS="
-                /usr/share/mimelnk 
-                /usr/share/applications
-                /usr/share/xsessions 
-                /usr/share/services 
+                @PREFIX@/share/mimelnk 
+                @PREFIX@/share/applications
+                @PREFIX@/share/xsessions 
+                @PREFIX@/share/services 
             "
             # /usr/share/apps \
             shift;;
@@ -1426 +1435 @@
 
 
 # gnome prefix
-for GNOME_PREFIX in "${GNOME_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
+for GNOME_PREFIX in "${GNOME_PREFIX}" @PREFIX@ /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
     if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
         break;
     fi
@@ -1434 +1443 @@
 # Will remain $PREFIX if all else fails
 
 # kde prefix
-for KDE_PREFIX in "${KDE_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
+for KDE_PREFIX in "${KDE_PREFIX}" @PREFIX@ /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
     if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
         break;
     fi