From a25634cd2673da378042be73ad304b3c2b9350b7 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 31 Dec 2019 05:17:04 +0000 Subject: Tue Dec 31 05:17:04 UTC 2019 a/kmod-26-x86_64-3.txz: Rebuilt. This doesn't build with --enable-python and python3-3.8.1, so we'll disable it for now. The python additions don't appear to be widely packaged anyway. a/util-linux-2.34-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. ap/hplip-3.19.12-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. ap/ksh93-20191228_5abcbd06-x86_64-1.txz: Upgraded. ap/linuxdoc-tools-0.9.73-x86_64-3.txz: Rebuilt. Recompiled against python3-3.8.1. ap/lxc-2.0.11_fad08f383-x86_64-3.txz: Rebuilt. Recompiled against python3-3.8.1. ap/rpm-4.15.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/Cython-0.29.14-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/clisp-2.50_20191103_c26de7873-x86_64-1.txz: Upgraded. d/distcc-3.3.3-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/gdb-8.3.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/llvm-9.0.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/meson-0.52.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/python-pip-19.3.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/python-setuptools-42.0.2-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. d/python3-3.8.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. kde/pykde4-4.14.3-x86_64-10.txz: Rebuilt. Recompiled against python3-3.8.1. l/Mako-1.1.0-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/PyQt-4.12.3-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/QScintilla-2.11.4-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/alsa-lib-1.2.1.2-x86_64-2.txz: Rebuilt. Recompiled without --enable-mixer-pymods. l/dbus-python-1.2.14-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/gexiv2-0.12.0-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/gobject-introspection-1.62.0-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. l/libcaca-0.99.beta19-x86_64-5.txz: Rebuilt. Recompiled against python3-3.8.1. l/libcap-ng-0.7.10-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/libproxy-0.4.15-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. l/libwebp-1.0.3-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/libwmf-0.2.8.4-x86_64-9.txz: Rebuilt. Correct the path for the GDK_PIXBUF_DIR. Thanks to B. Watson and Robby Workman. l/libxml2-2.9.10-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/newt-0.52.21-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/pycairo-1.18.2-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/pycups-1.9.74-x86_64-3.txz: Rebuilt. Recompiled against python3-3.8.1. l/pycurl-7.43.0.3-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/pygobject-2.28.7-x86_64-5.txz: Rebuilt. Recompiled against python3-3.8.1. l/pygobject3-3.34.0-x86_64-3.txz: Rebuilt. Recompiled against python3-3.8.1. l/pyparsing-2.4.5-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-appdirs-1.4.3-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-certifi-2019.11.28-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-chardet-3.0.4-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-docutils-0.15.2-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-idna-2.8-x86_64-3.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-notify2-0.3.1-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-packaging-19.2-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-pillow-6.2.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-ply-3.11-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-requests-2.22.0-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-sane-2.8.3-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-six-1.13.0-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/python-urllib3-1.25.7-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/sip-4.19.20-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/system-config-printer-1.5.12-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/talloc-2.3.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/tdb-1.4.3-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/tevent-0.10.2-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. l/urwid-1.0.3-x86_64-5.txz: Rebuilt. Recompiled against python3-3.8.1. l/zstd-1.4.4-x86_64-2.txz: Rebuilt. Fix libdir in libzstd.pc. Thanks to orbea. n/gpgme-1.13.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. n/obexftp-0.24.2-x86_64-5.txz: Rebuilt. Recompiled against python3-3.8.1. n/pssh-2.3.1-x86_64-5.txz: Rebuilt. Recompiled against python3-3.8.1. n/s-nail-14.9.16-x86_64-1.txz: Upgraded. n/samba-4.11.4-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. x/pyxdg-0.26-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. x/xcb-proto-1.13-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. xap/blueman-2.1.1-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. xap/hexchat-2.14.3-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. extra/pure-alsa-system/alsa-lib-1.2.1.2-x86_64-2_alsa.txz: Rebuilt. Recompiled without --enable-mixer-pymods. isolinux/initrd.img: Rebuilt. SeTEFI: Patched to remove extra whitespace from lsblk output. Thanks to Didier Spaier. usb-and-pxe-installers/usbboot.img: Rebuilt. SeTEFI: Patched to remove extra whitespace from lsblk output. Thanks to Didier Spaier. --- source/l/Mako/Mako.SlackBuild | 2 +- source/l/PyQt/PyQt.SlackBuild | 2 +- source/l/QScintilla/QScintilla.SlackBuild | 2 +- source/l/alsa-lib/alsa-lib.SlackBuild | 3 +- source/l/dbus-python/dbus-python.SlackBuild | 2 +- source/l/gexiv2/gexiv2.SlackBuild | 2 +- .../gobject-introspection.SlackBuild | 2 +- source/l/libcaca/libcaca.SlackBuild | 2 +- source/l/libcap-ng/libcap-ng.SlackBuild | 2 +- source/l/libproxy/libproxy.SlackBuild | 2 +- source/l/libwebp/libwebp.SlackBuild | 2 +- .../fixup-GDK_PIXBUF_DIR-in-configure-ac.patch | 12 ++++++++ source/l/libwmf/libwmf.SlackBuild | 8 ++++- source/l/libxml2/libxml2.SlackBuild | 2 +- source/l/newt/newt.SlackBuild | 2 +- source/l/pycairo/pycairo.SlackBuild | 2 +- source/l/pycups/pycups.SlackBuild | 2 +- source/l/pycurl/pycurl.SlackBuild | 2 +- source/l/pygobject/pygobject.SlackBuild | 2 +- source/l/pygobject3/pygobject3.SlackBuild | 2 +- source/l/pyparsing/pyparsing.SlackBuild | 2 +- source/l/python-appdirs/python-appdirs.SlackBuild | 2 +- source/l/python-certifi/python-certifi.SlackBuild | 2 +- source/l/python-chardet/python-chardet.SlackBuild | 2 +- .../l/python-docutils/python-docutils.SlackBuild | 2 +- source/l/python-idna/python-idna.SlackBuild | 2 +- source/l/python-notify2/python-notify2.SlackBuild | 2 +- .../l/python-packaging/python-packaging.SlackBuild | 2 +- source/l/python-pillow/python-pillow.SlackBuild | 2 +- source/l/python-ply/python-ply.SlackBuild | 2 +- .../l/python-requests/python-requests.SlackBuild | 2 +- source/l/python-sane/python-sane.SlackBuild | 2 +- source/l/python-six/python-six.SlackBuild | 2 +- source/l/python-urllib3/python-urllib3.SlackBuild | 2 +- source/l/sip/sip.SlackBuild | 2 +- .../system-config-printer.SlackBuild | 2 +- source/l/talloc/talloc.SlackBuild | 2 +- source/l/tdb/tdb.SlackBuild | 2 +- source/l/tevent/tevent.SlackBuild | 2 +- source/l/urwid/urwid.SlackBuild | 2 +- source/l/zstd/zstd.SlackBuild | 3 +- source/l/zstd/zstd.dont.hardcode.libdir.patch | 35 ++++++++++++++++++++++ 42 files changed, 94 insertions(+), 41 deletions(-) create mode 100644 source/l/libwmf/fixup-GDK_PIXBUF_DIR-in-configure-ac.patch create mode 100644 source/l/zstd/zstd.dont.hardcode.libdir.patch (limited to 'source/l') diff --git a/source/l/Mako/Mako.SlackBuild b/source/l/Mako/Mako.SlackBuild index 82e42f2e..ff955e04 100755 --- a/source/l/Mako/Mako.SlackBuild +++ b/source/l/Mako/Mako.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=Mako VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/PyQt/PyQt.SlackBuild b/source/l/PyQt/PyQt.SlackBuild index 81811e71..c6d79e5f 100755 --- a/source/l/PyQt/PyQt.SlackBuild +++ b/source/l/PyQt/PyQt.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=PyQt VERSION=${VERSION:-$(echo ${PKGNAM}4_gpl_x11-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild index 94540a52..22e042a1 100755 --- a/source/l/QScintilla/QScintilla.SlackBuild +++ b/source/l/QScintilla/QScintilla.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=QScintilla VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild index 5f25663c..8f057a5d 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-lib VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -101,7 +101,6 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-mixer-modules \ - --enable-mixer-pymods \ --enable-topology \ --enable-ucm \ --build=$ARCH-slackware-linux || exit 1 diff --git a/source/l/dbus-python/dbus-python.SlackBuild b/source/l/dbus-python/dbus-python.SlackBuild index f3eaafe3..2b1341f0 100755 --- a/source/l/dbus-python/dbus-python.SlackBuild +++ b/source/l/dbus-python/dbus-python.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dbus-python VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/gexiv2/gexiv2.SlackBuild b/source/l/gexiv2/gexiv2.SlackBuild index 2e1d0862..098e893e 100755 --- a/source/l/gexiv2/gexiv2.SlackBuild +++ b/source/l/gexiv2/gexiv2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gexiv2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/gobject-introspection/gobject-introspection.SlackBuild b/source/l/gobject-introspection/gobject-introspection.SlackBuild index aaf84951..c4f37c03 100755 --- a/source/l/gobject-introspection/gobject-introspection.SlackBuild +++ b/source/l/gobject-introspection/gobject-introspection.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gobject-introspection VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libcaca/libcaca.SlackBuild b/source/l/libcaca/libcaca.SlackBuild index 2b735e4b..34270c35 100755 --- a/source/l/libcaca/libcaca.SlackBuild +++ b/source/l/libcaca/libcaca.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcaca VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libcap-ng/libcap-ng.SlackBuild b/source/l/libcap-ng/libcap-ng.SlackBuild index 7d58ec18..0180bd42 100755 --- a/source/l/libcap-ng/libcap-ng.SlackBuild +++ b/source/l/libcap-ng/libcap-ng.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcap-ng VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libproxy/libproxy.SlackBuild b/source/l/libproxy/libproxy.SlackBuild index b9ef175b..407b5736 100755 --- a/source/l/libproxy/libproxy.SlackBuild +++ b/source/l/libproxy/libproxy.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libproxy VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/libwebp/libwebp.SlackBuild b/source/l/libwebp/libwebp.SlackBuild index 2385f6f4..8ecd032b 100755 --- a/source/l/libwebp/libwebp.SlackBuild +++ b/source/l/libwebp/libwebp.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libwebp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libwmf/fixup-GDK_PIXBUF_DIR-in-configure-ac.patch b/source/l/libwmf/fixup-GDK_PIXBUF_DIR-in-configure-ac.patch new file mode 100644 index 00000000..35cd563e --- /dev/null +++ b/source/l/libwmf/fixup-GDK_PIXBUF_DIR-in-configure-ac.patch @@ -0,0 +1,12 @@ +diff -Nur libwmf-0.2.8.4.orig/configure.ac libwmf-0.2.8.4/configure.ac +--- libwmf-0.2.8.4.orig/configure.ac 2005-07-27 15:48:39.000000000 -0500 ++++ libwmf-0.2.8.4/configure.ac 2019-12-28 22:35:15.470031981 -0600 +@@ -745,7 +745,7 @@ + if test $LIBWMF_BUILDSTYLE != lite; then + PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ + GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" ++ GDK_PIXBUF_DIR="gdk-pixbuf-2.0/$GTK_VERSION/loaders" + wmf_gdk_pixbuf=yes + ],[ wmf_gdk_pixbuf=no + ]) diff --git a/source/l/libwmf/libwmf.SlackBuild b/source/l/libwmf/libwmf.SlackBuild index 71772f2a..9c501531 100755 --- a/source/l/libwmf/libwmf.SlackBuild +++ b/source/l/libwmf/libwmf.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libwmf VERSION=0.2.8.4 -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -84,6 +84,9 @@ find . \ zcat $CWD/libwmf-0.2.8.4-fallbackfont.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/libwmf-0.2.8.4-pixbufloaderdir.patch.gz | patch -p1 --verbose || exit 1 +# and fix a missed item from the last patch --rworkman +zcat $CWD/fixup-GDK_PIXBUF_DIR-in-configure-ac.patch.gz | patch -p1 --verbose || exit 1 + # Don't export the modified embedded GD library symbols, to avoid conflicts with # the system libgd: zcat $CWD/libwmf-0.2.8.4-reducesymbols.patch.gz | patch -p1 --verbose || exit 1 @@ -107,6 +110,9 @@ zcat $CWD/libwmf-0.2.8.4-CVE-2016-9011.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/libwmf-0.2.8.4-CVE-2016-9317.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/libwmf-0.2.8.4-CVE-2017-6362.patch.gz | patch -p1 --verbose || exit 1 +autoreconf -vif +automake + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild index 9fbe39bb..007bfa4a 100755 --- a/source/l/libxml2/libxml2.SlackBuild +++ b/source/l/libxml2/libxml2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxml2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/newt/newt.SlackBuild b/source/l/newt/newt.SlackBuild index db12aa63..3f072f1a 100755 --- a/source/l/newt/newt.SlackBuild +++ b/source/l/newt/newt.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=newt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild index 6fe2a401..c7de96ba 100755 --- a/source/l/pycairo/pycairo.SlackBuild +++ b/source/l/pycairo/pycairo.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycairo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/pycups/pycups.SlackBuild b/source/l/pycups/pycups.SlackBuild index 799ad1f6..e9586a40 100755 --- a/source/l/pycups/pycups.SlackBuild +++ b/source/l/pycups/pycups.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycups VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pycurl/pycurl.SlackBuild b/source/l/pycurl/pycurl.SlackBuild index 7b855cf8..ff5bc99a 100755 --- a/source/l/pycurl/pycurl.SlackBuild +++ b/source/l/pycurl/pycurl.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycurl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pygobject/pygobject.SlackBuild b/source/l/pygobject/pygobject.SlackBuild index 6d5b1175..3e874d8b 100755 --- a/source/l/pygobject/pygobject.SlackBuild +++ b/source/l/pygobject/pygobject.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pygobject VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/pygobject3/pygobject3.SlackBuild b/source/l/pygobject3/pygobject3.SlackBuild index 0da0e0fc..5b73afef 100755 --- a/source/l/pygobject3/pygobject3.SlackBuild +++ b/source/l/pygobject3/pygobject3.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pygobject3 SRCNAM=pygobject VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/pyparsing/pyparsing.SlackBuild b/source/l/pyparsing/pyparsing.SlackBuild index a03d7bae..08699afc 100755 --- a/source/l/pyparsing/pyparsing.SlackBuild +++ b/source/l/pyparsing/pyparsing.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pyparsing VERSION=${VERSION:-$(echo pyparsing-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-appdirs/python-appdirs.SlackBuild b/source/l/python-appdirs/python-appdirs.SlackBuild index 297fdeb3..b806a7b9 100755 --- a/source/l/python-appdirs/python-appdirs.SlackBuild +++ b/source/l/python-appdirs/python-appdirs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-appdirs VERSION=${VERSION:-$(echo appdirs-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} SRCNAM=appdirs diff --git a/source/l/python-certifi/python-certifi.SlackBuild b/source/l/python-certifi/python-certifi.SlackBuild index b72bac25..3e627782 100755 --- a/source/l/python-certifi/python-certifi.SlackBuild +++ b/source/l/python-certifi/python-certifi.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-certifi VERSION=${VERSION:-$(echo certifi-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=certifi diff --git a/source/l/python-chardet/python-chardet.SlackBuild b/source/l/python-chardet/python-chardet.SlackBuild index 3d74901e..61dd9bef 100755 --- a/source/l/python-chardet/python-chardet.SlackBuild +++ b/source/l/python-chardet/python-chardet.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-chardet VERSION=${VERSION:-$(echo chardet-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} SRCNAM=chardet diff --git a/source/l/python-docutils/python-docutils.SlackBuild b/source/l/python-docutils/python-docutils.SlackBuild index 174e016e..0817fc35 100755 --- a/source/l/python-docutils/python-docutils.SlackBuild +++ b/source/l/python-docutils/python-docutils.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-docutils VERSION=${VERSION:-$(echo docutils-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=docutils diff --git a/source/l/python-idna/python-idna.SlackBuild b/source/l/python-idna/python-idna.SlackBuild index be52f62e..b5a2144b 100755 --- a/source/l/python-idna/python-idna.SlackBuild +++ b/source/l/python-idna/python-idna.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-idna VERSION=${VERSION:-$(echo idna-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} SRCNAM=idna diff --git a/source/l/python-notify2/python-notify2.SlackBuild b/source/l/python-notify2/python-notify2.SlackBuild index c25a13eb..f73ce8be 100755 --- a/source/l/python-notify2/python-notify2.SlackBuild +++ b/source/l/python-notify2/python-notify2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-notify2 VERSION=${VERSION:-$(echo notify2-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} SRCNAM=notify2 diff --git a/source/l/python-packaging/python-packaging.SlackBuild b/source/l/python-packaging/python-packaging.SlackBuild index 412640f4..39b10db2 100755 --- a/source/l/python-packaging/python-packaging.SlackBuild +++ b/source/l/python-packaging/python-packaging.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-packaging VERSION=${VERSION:-$(echo packaging-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=packaging diff --git a/source/l/python-pillow/python-pillow.SlackBuild b/source/l/python-pillow/python-pillow.SlackBuild index 97f29418..6817cfd5 100755 --- a/source/l/python-pillow/python-pillow.SlackBuild +++ b/source/l/python-pillow/python-pillow.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pillow VERSION=${VERSION:-$(echo Pillow-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-ply/python-ply.SlackBuild b/source/l/python-ply/python-ply.SlackBuild index 58ae09ae..5121256f 100755 --- a/source/l/python-ply/python-ply.SlackBuild +++ b/source/l/python-ply/python-ply.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-ply SRCNAM=ply VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild index 077cbcbc..7458c8a8 100755 --- a/source/l/python-requests/python-requests.SlackBuild +++ b/source/l/python-requests/python-requests.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-requests VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=requests diff --git a/source/l/python-sane/python-sane.SlackBuild b/source/l/python-sane/python-sane.SlackBuild index f183c124..df36a478 100755 --- a/source/l/python-sane/python-sane.SlackBuild +++ b/source/l/python-sane/python-sane.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-sane VERSION=${VERSION:-$(echo Sane-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-six/python-six.SlackBuild b/source/l/python-six/python-six.SlackBuild index fae7e8b7..3f93fbc2 100755 --- a/source/l/python-six/python-six.SlackBuild +++ b/source/l/python-six/python-six.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-six VERSION=${VERSION:-$(echo six-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild index 52d33872..c1673bd8 100755 --- a/source/l/python-urllib3/python-urllib3.SlackBuild +++ b/source/l/python-urllib3/python-urllib3.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-urllib3 VERSION=${VERSION:-$(echo urllib3-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=urllib3 diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index 9863095a..c722f9ed 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index 3d580729..498f1d3b 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=system-config-printer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/talloc/talloc.SlackBuild b/source/l/talloc/talloc.SlackBuild index 51a9329c..92c7f082 100755 --- a/source/l/talloc/talloc.SlackBuild +++ b/source/l/talloc/talloc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=talloc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/tdb/tdb.SlackBuild b/source/l/tdb/tdb.SlackBuild index d97a4a06..e010ff2d 100755 --- a/source/l/tdb/tdb.SlackBuild +++ b/source/l/tdb/tdb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tdb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/tevent/tevent.SlackBuild b/source/l/tevent/tevent.SlackBuild index cfead54d..8b252d27 100755 --- a/source/l/tevent/tevent.SlackBuild +++ b/source/l/tevent/tevent.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tevent VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/urwid/urwid.SlackBuild b/source/l/urwid/urwid.SlackBuild index f5f3bd4c..06209b12 100755 --- a/source/l/urwid/urwid.SlackBuild +++ b/source/l/urwid/urwid.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=urwid VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/zstd/zstd.SlackBuild b/source/l/zstd/zstd.SlackBuild index fa0992ce..4b0f395a 100755 --- a/source/l/zstd/zstd.SlackBuild +++ b/source/l/zstd/zstd.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=zstd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -86,6 +86,7 @@ tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/zstd.dont.hardcode.libdir.patch.gz | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . diff --git a/source/l/zstd/zstd.dont.hardcode.libdir.patch b/source/l/zstd/zstd.dont.hardcode.libdir.patch new file mode 100644 index 00000000..32362e94 --- /dev/null +++ b/source/l/zstd/zstd.dont.hardcode.libdir.patch @@ -0,0 +1,35 @@ +From 9da6b9612ef0ed2481c762f0c78af1204e407ccc Mon Sep 17 00:00:00 2001 +From: orbea +Date: Mon, 16 Dec 2019 05:17:03 -0800 +Subject: [PATCH] pkgconfig: Don't hardcode libdir. + +--- + lib/Makefile | 1 + + lib/libzstd.pc.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/Makefile b/lib/Makefile +index fd1710cf1..cb8351e13 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -244,6 +244,7 @@ libzstd.pc: + libzstd.pc: libzstd.pc.in + @echo creating pkgconfig + @sed -e 's|@PREFIX@|$(PREFIX)|' \ ++ -e 's|@LIBDIR@|$(LIBDIR)|' \ + -e 's|@VERSION@|$(VERSION)|' \ + $< >$@ + +diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in +index e7880be47..9309426ec 100644 +--- a/lib/libzstd.pc.in ++++ b/lib/libzstd.pc.in +@@ -5,7 +5,7 @@ + prefix=@PREFIX@ + exec_prefix=${prefix} + includedir=${prefix}/include +-libdir=${exec_prefix}/lib ++libdir=@LIBDIR@ + + Name: zstd + Description: fast lossless compression algorithm library -- cgit v1.2.3