diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-11-17 08:55:25 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-11-17 08:55:25 +0000 |
| commit | f6750d6ffc7bf3e09f40421e9f22ddb054f9c6bc (patch) | |
| tree | 1fd667548d29d432c18b67b83550a166f4280f9e /compat32-tools/convertpkg-compat32 | |
| parent | 0d8019b7c96a6b9c892c54b27799a28eafdfdf3a (diff) | |
| download | multilib-f6750d6ffc7bf3e09f40421e9f22ddb054f9c6bc.tar.gz multilib-f6750d6ffc7bf3e09f40421e9f22ddb054f9c6bc.tar.xz | |
gdk-pixbuf2 needs to be treated like gtk+2 and pango
Diffstat (limited to 'compat32-tools/convertpkg-compat32')
| -rwxr-xr-x | compat32-tools/convertpkg-compat32 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/compat32-tools/convertpkg-compat32 b/compat32-tools/convertpkg-compat32 index 7db53f0..c818b5b 100755 --- a/compat32-tools/convertpkg-compat32 +++ b/compat32-tools/convertpkg-compat32 @@ -165,18 +165,20 @@ cd $PKG || exit 1 /sbin/explodepkg $PKGPATH # -# Take special care of gtk+2 and pango when stripping things! +# Take special care of gtk+2 , gdk-pixbuf2 and pango when stripping things! # # Remove stuff we only want from the 64-bit package: -if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "pango" ]; then +if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; +then rm -rf bin sbin usr/{include,sbin,share,info,man,libexec} else rm -rf etc bin sbin usr/{include,sbin,share,info,man,libexec} fi # Take care of 32bit binaries: -if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "pango" ]; then +if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; +then find usr/bin -type f ! -name "*-32" -exec mv {} {}-32 \; elif [ -d usr/bin ]; then mkdir ./32 @@ -186,7 +188,8 @@ elif [ -d usr/bin ]; then fi # Strip doinst.sh from everything we can't use: -if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "pango" ]; then +if [ "$PKGNAM" = "gtk+2" -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' \ > install/doinst.sh.2 |