Add xap/sane for the benefit of compiling wine

1 files changed, 25 insertions, 6 deletions

diff --git a/compat32-tools/massconvert32.sh b/compat32-tools/massconvert32.sh
index a044710..d14f608 100755
--- a/compat32-tools/massconvert32.sh
+++ b/compat32-tools/massconvert32.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
-
+# $Id$
+#
 # Written 2009, 2010  Eric Hameleers, Eindhoven, NL
-
+#
 # Convert 32bit slackware packages 'en masse' into compatibility packages
 # to be installed on slackware64 - providing the 32bit part of multilib.
 # The string "-compat32" is added at the end of package name when a
@@ -9,7 +10,7 @@
 # on slackware64 alongside the native 64bit versions.
 # For example: the original 32bit package "bzip2" will be converted to a new
 #              package with the name "bzip2-compat32"
-
+#
 # You also have to install multilib versions of glibc and gcc !
 
 # Before we start
@@ -178,8 +179,8 @@ fi
 
 # We can not proceed if there are no packages and we did not get an URL:
 if [ -z "$SLACK32URL" ]; then
-  if [ ! -d $SLACK32ROOT/a -o ! -d $SLACK32ROOT/ap -o ! -d $SLACK32ROOT/d -o ! -d $SLACK32ROOT/l -o ! -d $SLACK32ROOT/n -o ! -d $SLACK32ROOT/x ]; then
-    echo "Required package directories a,ap,d,l,n,x below '$SLACK32ROOT' are not found! Aborting..."
+  if [ ! -d $SLACK32ROOT/a -o ! -d $SLACK32ROOT/ap -o ! -d $SLACK32ROOT/d -o ! -d $SLACK32ROOT/l -o ! -d $SLACK32ROOT/n -o ! -d $SLACK32ROOT/x -o ! -d $SLACK32ROOT/xap ]; then
+    echo "Required package directories a,ap,d,l,n,x,xap below '$SLACK32ROOT' are not found! Aborting..."
     exit 1
   fi
 fi
@@ -319,8 +320,13 @@ mesa
 pixman
 "
 
+# The XAP/ series:
+XAP_COMPAT32="
+sane
+"
+
 # Create target directories if they do not exist:
-for TDIR in a-compat32 ap-compat32 d-compat32 l-compat32 n-compat32 x-compat32 ; do
+for TDIR in a-compat32 ap-compat32 d-compat32 l-compat32 n-compat32 x-compat32 xap-compat32 ; do
   mkdir -p $TARGET64ROOT/$TDIR
   if [ ! -w $TARGET64ROOT/$TDIR ]; then
     echo "Directory '$TARGET64ROOT/$TDIR' is not writable! Aborting..."
@@ -404,6 +410,19 @@ for INPKG in $X_COMPAT32 ; do
   sh $CONV32 -i $FULLPKG -d $TARGET64ROOT/x-compat32
 done
 
+echo "*** 'XAP' series:"
+for INPKG in $XAP_COMPAT32 ; do
+  [ -n "$SLACK32URL" ] && download_pkg $SLACK32ROOT/xap/$INPKG $SLACK32URL
+  FULLPKG=$(get_pkgfullpath $SLACK32ROOT/xap/$INPKG)
+  if [ -z "$FULLPKG" ]; then
+    echo "*** FAIL: package '$INPKG' was not found!"
+    continue
+  fi
+  [ "$VERBOSE" = "1" ] && echo "--- $INPKG"
+  sh $CONV32 -i $FULLPKG -d $TARGET64ROOT/xap-compat32
+done
+
+
 # Mention downloaded packages if we used a URL as source:
 if [ -n "$SLACK32URL" ]; then
   echo "WARNING: packages which were downloaded from '$SLACK32URL'"