diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-11-22 14:33:40 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-11-22 14:33:40 +0000 |
| commit | 682ffad5872e2597560852bc6a83436dcce6be21 (patch) | |
| tree | b9214563cd1c68564842e2609d1236d6f6f07a00 /compat32-tools | |
| parent | 06c20701be746095a51a060bbd5db16f4b1c62a5 (diff) | |
| download | multilib-682ffad5872e2597560852bc6a83436dcce6be21.tar.gz multilib-682ffad5872e2597560852bc6a83436dcce6be21.tar.xz | |
convertpkg-compat32: eudev replaced udev in 14.2. Prepare for gtk+-3 and qt5
Diffstat (limited to 'compat32-tools')
| -rwxr-xr-x | compat32-tools/convertpkg-compat32 | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/compat32-tools/convertpkg-compat32 b/compat32-tools/convertpkg-compat32 index d1dab4a..959d9b7 100755 --- a/compat32-tools/convertpkg-compat32 +++ b/compat32-tools/convertpkg-compat32 @@ -184,7 +184,7 @@ fi # # Remove stuff we only want from the 64-bit package: -if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; +if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gtk+3" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; then rm -rf bin sbin usr/{include,sbin,share,info,man,libexec} else @@ -192,7 +192,7 @@ else fi # Take care of 32bit binaries: -if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; +if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gtk+3" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; then find usr/bin -type f ! -name "*-32" -exec mv {} {}-32 \; elif [ "$PKGNAM" = "llvm" ]; then @@ -208,19 +208,18 @@ elif [ -d usr/bin ]; then mv ./32 usr/bin/ fi -if [ "$PKGNAM" = "udev" ]; then +if [ "$PKGNAM" = "udev" -o "$PKGNAM" = "eudev" ]; then # These are part of the 64-bit package: rm -rf lib/firmware + rm -rf lib/modprobe.d rm -rf lib/udev + rm -rf run # Only in Slackware 13.37: rm -rf usr/lib/ConsoleKit - # Only in Slackware 14.0: - rm -rf lib/modprobe.d - rm -rf run fi # Strip doinst.sh from everything we can't use: -if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; +if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gtk+3" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; then # Get rid of symlinks in bin and doc directory: cat install/doinst.sh | grep -v '( cd usr/bin' | grep -v '( cd usr/doc' \ @@ -232,7 +231,7 @@ then echo "config etc/gtk-2.0/im-multipress.conf.new" \ >> install/doinst.sh fi -elif [ "$PKGNAM" = "udev" ]; then +elif [ "$PKGNAM" = "udev" -o "$PKGNAM" = "eudev" ]; then # Get rid of symlinks in sbin and lib directory, and all the other # non-symlinking stuff: cat install/doinst.sh \ @@ -293,7 +292,7 @@ fi # you will have to add /usr/lib/qt/bin/ to your $PATH # We will remove a lot of stuff which we do not need in the compat32 package # -if [ "$PKGNAM" = "qt" -o "$PKGNAM" = "qt3" ]; then +if [ "$PKGNAM" = "qt" -o "$PKGNAM" = "qt3" -o "$PKGNAM" = "qt5" ]; then if [ -d usr/lib/qt ] ; then for ITEM in q3porting.xml demos doc examples ; do @@ -301,6 +300,12 @@ if [ "$PKGNAM" = "qt" -o "$PKGNAM" = "qt3" ]; then rm -rf "usr/lib/qt/$ITEM" fi done + elif [ -d usr/lib/qt5 ] ; then + for ITEM in demos doc examples ; do + if [ -e "usr/lib/qt5/$ITEM" ] ; then + rm -rf "usr/lib/qt5/$ITEM" + fi + done fi cat install/doinst.sh | grep -v 'usr/bin' | grep -v 'opt/kde3/bin' \ |