diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-06-08 19:48:36 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-06-08 19:48:36 +0000 |
| commit | 76a8c095081a605e22337ad3aafeded3a0307690 (patch) | |
| tree | 2475f8a3c89935efbaab7c03946ab441dd5d7b82 | |
| parent | 1f41faae0a847227c82e52f07f77de7dc166a454 (diff) | |
| download | multilib-76a8c095081a605e22337ad3aafeded3a0307690.tar.gz multilib-76a8c095081a605e22337ad3aafeded3a0307690.tar.xz | |
compat32-tools: in convertpkg-compat32 preserve ICD files in the mesa package
| -rwxr-xr-x | source/compat32-tools/compat32-tools.SlackBuild | 4 | ||||
| -rwxr-xr-x | source/compat32-tools/convertpkg-compat32 | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/source/compat32-tools/compat32-tools.SlackBuild b/source/compat32-tools/compat32-tools.SlackBuild index e422f7c..9bf7152 100755 --- a/source/compat32-tools/compat32-tools.SlackBuild +++ b/source/compat32-tools/compat32-tools.SlackBuild @@ -23,10 +23,10 @@ PRGNAM=compat32-tools -VERSION=3.8 +VERSION=3.9 ARCH=noarch TAG=${TAG:-alien} -BUILD=${BUILD:-8} +BUILD=${BUILD:-1} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/compat32-tools/convertpkg-compat32 b/source/compat32-tools/convertpkg-compat32 index 9960527..08d52f8 100755 --- a/source/compat32-tools/convertpkg-compat32 +++ b/source/compat32-tools/convertpkg-compat32 @@ -180,9 +180,17 @@ if [ -d usr/lib64 -o -d lib64 ]; then fi # -# Take special care of gtk+2, gdk-pixbuf2, pango and udev when stripping things! +# Take special care of the following packages when stripping things: +# gdk-pixbuf2, gtk+2, gtk+3, mesa, pango, samba, udev # +# Stuff we need to keep, we move into KDEP/ and move it back later: +mkdir KEEP +if [ "$PKGNAM" = "mesa" ]; +then + cp -a --parents usr/share/vulkan/icd.d KEEP/ +fi + # Remove stuff we only want from the 64-bit package: if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gtk+3" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; then @@ -337,12 +345,20 @@ if [ "$PKGNAM" = "qt" -o "$PKGNAM" = "qt3" -o "$PKGNAM" = "qt5" ]; then fi +# Move everything we saved to KEEP/ back into the package: +if [ $(find KEEP/ | wc -l) -gt 1 ]; +then + rsync -a KEEP/ ./ + rm -rf KEEP +fi + # Keep documentation we might be required to keep, or is just polite: if [ -d usr/doc ]; then find usr/doc -type f ! -iname "Copyright*" -a ! -iname "COPYING*" -a ! -iname "AUTHORS*" -a ! -iname "LICENSE*" -a ! -iname "GPL*" -a ! -iname "LGPL*" -a ! -iname "THANKS*" | xargs -d '\n' rm -f find usr/doc -type d -depth | xargs -d '\n' rmdir --ignore-fail-on-non-empty fi +# Handle the slack-desc file: if [ ! -z $SLACKDESC ]; then echo "Using externally provided slack-desc ($SLACKDESC)..." cat $SLACKDESC > install/slack-desc |