replace pngoverlay with pngoverlay-cairo

this doesn't require X

need to compile armhf version

ref #1470

merge2out

@@ -283,8 +283,11 @@ else
 fi
 
 # make sure target has these...
-cp -af woof-arch/${TARGETARCH}/build/support/debdb2pupdb ${WOOF_OUT}/${NEWBASE}/rootfs-skeleton/usr/local/petget/ 2>&1 | tee -a ${WOOF_OUT}/merge2out.log
-cp -af woof-arch/${TARGETARCH}/build/support/find_cat ${WOOF_OUT}/${NEWBASE}/rootfs-skeleton/usr/local/petget/ 2>&1 | tee -a ${WOOF_OUT}/merge2out.log
+(
+	cp -afv woof-arch/${TARGETARCH}/build/support/debdb2pupdb ${WOOF_OUT}/rootfs-skeleton/usr/local/petget/ 2>&1
+	cp -afv woof-arch/${TARGETARCH}/build/support/find_cat ${WOOF_OUT}/rootfs-skeleton/usr/local/petget/ 2>&1 
+	cp -afv woof-arch/${TARGETARCH}/target/rootfs-skeleton/usr/sbin/pngoverlay-cairo ${WOOF_OUT}/support/ 2>&1
+) | tee -a ${WOOF_OUT}/merge2out.log
 
 echo
 echo "Directory '${WOOF_OUT}'

woof-arch/x86/target/rootfs-skeleton/usr/sbin/pngoverlay

@@ -0,0 +1 @@
+pngoverlay-cairo

woof-arch/x86_64/target/rootfs-skeleton/usr/sbin/pngoverlay

@@ -0,0 +1 @@
+pngoverlay-cairo

woof-code/3builddistro-Z

@@ -18,6 +18,10 @@ create_local_repos_dirs
 set_layer_type       # aufs or overlay
 set_archdir_var      # ex: ARCHDIR=x86_64-linux-gnu
 
+if [ -f support/pngoverlay-cairo ] ; then # merge2out
+	export PNGOVERLAY=${PWD}/support/pngoverlay-cairo # ./usr/sbin/icon_switcher 
+fi
+
 # -release cli param
 for i in $@ ; do
 	case $i in

woof-code/rootfs-skeleton/usr/sbin/icon_switcher

@@ -13,6 +13,12 @@
 export TEXTDOMAIN=icon_switcher
 export OUTPUT_CHARSET=UTF-8
 
+if [ -z "$PNGOVERLAY" ] ; then
+	if which pngoverlay-cairo &>/dev/null ; then
+		PNGOVERLAY='pngoverlay-cairo'
+	fi
+fi
+
 func_switch (){
 
 	echo
@@ -59,16 +65,14 @@ func_switch (){
 	fi
 
 	#new standardised icons to show when mounted...
-	if [ "`which pngoverlay`" -a -e ${SYSROOT}/usr/local/lib/X11/pixmaps/closebox_outline48.png ];then
+	if [ -n "$PNGOVERLAY" -a -e ${SYSROOT}/usr/local/lib/X11/pixmaps/closebox_outline48.png ];then
 		rm -f ${SYSROOT}/usr/local/lib/X11/pixmaps/*_mntd*.png
 		(
 			cd ${SYSROOT}/usr/local/lib/X11/pixmaps
-			cp -fv `which pngoverlay` ./pngoverlay #dumb, but needs to be in same folder.
 			for ONEDRV in card drive floppy optical usbdrv; do
-				./pngoverlay ${ONEDRV}48.png closebox_outline48.png ${ONEDRV}_mntd48.png #background foreground output.
-				./pngoverlay ${ONEDRV}48.png locked_outline48.png ${ONEDRV}_mntd_boot48.png
+				$PNGOVERLAY ${ONEDRV}48.png closebox_outline48.png ${ONEDRV}_mntd48.png #background foreground output.
+				$PNGOVERLAY ${ONEDRV}48.png locked_outline48.png ${ONEDRV}_mntd_boot48.png
 			done
-			rm -fv ./pngoverlay
 		)
 	fi