Fix JWM menu icons in Saluki

mavrothal · Mar 1, 2012 · 599fba5 · 599fba5
1 parent 4202833
commit 599fba5
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 5 deletions.
diff --git a/XO/XO_sfs_patches/etc_jwmrc.patch b/XO/XO_sfs_patches/etc_jwmrc.patch
@@ -8,16 +8,15 @@
 
  	<!-- Visual Styles -->
 
-@@ -120,6 +121,8 @@
+@@ -120,6 +121,7 @@
  		<IconPath>/usr/local/lib/X11/pixmaps</IconPath>
  		<IconPath>/usr/share/pixmaps</IconPath>
  		<IconPath>/usr/local/share/pixmaps</IconPath>
-+		<IconPath>/usr/share/icons/gnome/48x48/apps/</IconPath>
-+		<IconPath>/usr/share/icons/hicolor/48x48/apps/</IconPath>
++		<IconPath>/var/local/icons/</IconPath>
  	<!-- </Icons> -->
 
  	<StartupCommand>
-@@ -127,7 +130,20 @@
+@@ -127,7 +129,20 @@
 
  	<!-- Virtual Desktops -->
  	<!-- Name tags can be contained within Desktops for desktop names.  BK: syntax change with jwm 500... -->

diff --git a/XO/XO_sfs_patches/fixmenus.patch b/XO/XO_sfs_patches/fixmenus.patch
@@ -0,0 +1,11 @@
+--- a/usr/sbin/fixmenus	2012-02-08 03:49:26.000000000 +0200
++++ b/usr/sbin/fixmenus	2012-03-01 09:18:49.036643495 +0200
+@@ -47,6 +47,8 @@
+ [ `which jwm2fluxbox` ] && jwm2fluxbox  ##current fluxbox_menu_refresh doesn't support menu icons while this does
+ [ `which obmenu-refresh` ] && obmenu-refresh
+ [ `which jwm2pekwm` ] && jwm2pekwm
++# Fix menu icons under JWM in Saluki
++[ `which variconlinks_luki` ] && variconlinks_luki
+
+ gtk-update-icon-cache -f /usr/share/icons/hicolor/ 
+ touch /usr/share/applications/.fix.desktop
diff --git a/create_xo_puppy.sh b/create_xo_puppy.sh
@@ -640,6 +640,50 @@ else
 	echo "Patched _root_.jwmrc. $(date "+%Y-%m-%d %H:%M")" >> $CWD/build.log
 fi
 
+cat << EOF > $SFSROOT/usr/sbin/variconlinks_luki
+#!/bin/bash
+
+DIR=\`pwd\`
+
+rm -rf /var/local/icons
+mkdir /var/local/icons
+
+ln -fs /usr/share/icons/hicolor/16x16/apps/* /var/local/icons/ 2>/dev/null
+ln -fs /usr/share/icons/hicolor/22x22/apps/* /var/local/icons/ 2>/dev/null
+ln -fs /usr/share/icons/hicolor/24x24/apps/* /var/local/icons/ 2>/dev/null
+ln -fs /usr/share/icons/hicolor/32x32/apps/* /var/local/icons/ 2>/dev/null
+ln -fs /usr/share/icons/hicolor/48x48/apps/* /var/local/icons/ 2>/dev/null
+ln -fs /usr/share/icons/gnome/48x48/apps/* /var/local/icons/ 2>/dev/null
+ln -fs /usr/share/icons/gnome/48x48/devices/* /var/local/icons/ 2>/dev/null
+ln -fs /usr/share/pixmaps/abiword.png /var/local/icons/ 2>/dev/null
+
+
+cd /var/local/icons
+ls | grep xpm | while read FILE
+do
+FILE2=\`echo "\$FILE" | sed 's/.xpm//'\`
+ln -s "\$FILE" "\$FILE2" 2>/dev/null
+done
+ls | grep png | while read FILE
+do
+FILE2=\`echo "\$FILE" | sed 's/.png//'\`
+ln -s "\$FILE" "\$FILE2" 2>/dev/null
+done
+
+cd "\$DIR"
+exit 0
+EOF
+chmod 755 $SFSROOT/usr/sbin/variconlinks_luki
+
+#Patch fixmenus to use variconlinks_luki
+patch -p1 < $patches/fixmenus.patch
+if [ $? -ne 0 ]; then
+	echo "Failed to Patch fixmenus for Saluki . $(date "+%Y-%m-%d %H:%M")" >> $CWD/build.log
+	rm -f usr/sbin/fixmenus.{orig,rej}
+else
+	echo "Patched fixmenus for Saluki. $(date "+%Y-%m-%d %H:%M")" >> $CWD/build.log
+fi
+
 #Add pmount in the tray
 patch -p1 < $patches/jwmrc-tray_luki.patch
 if [ $? -ne 0 ]; then
@@ -799,8 +843,14 @@ cd $SFSROOT
 # Fix permissions for fido
 chmod -R 777 tmp
 
+#log list of XO-specific files included
+echo "The following XO-specific files where included in the build" >> $CWD/build.log
+#SAFE=$(printf "%s\n" "$XOSFS" | sed 's/[][\.*^$(){}?+|/]/\\&/g')
+y=$(printf "%s\n" "$XOSFS" | sed 's/[/]/\\&/g') # specific case
+find $XOSFS | sed s/$y//g >> $CWD/build.log
+
 echo "copying in the XO files"
-cp -rf $XOSFS/* ./
+cp -arf $XOSFS/* ./
 
 statusfunc $?