summaryrefslogtreecommitdiffstats
path: root/source/l/libwmf
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-12-31 05:17:04 +0000
committer Eric Hameleers <alien@slackware.com>2019-12-31 14:59:51 +0100
commita25634cd2673da378042be73ad304b3c2b9350b7 (patch)
treeae404d75cd221b6166a203bfe95c228dc71d9fcd /source/l/libwmf
parentd1b5924935577356046594dd8cb34d19a6caea56 (diff)
downloadcurrent-a25634cd2673da378042be73ad304b3c2b9350b7.tar.gz
current-a25634cd2673da378042be73ad304b3c2b9350b7.tar.xz
Tue Dec 31 05:17:04 UTC 201920191231051704
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.
Diffstat (limited to 'source/l/libwmf')
-rw-r--r--source/l/libwmf/fixup-GDK_PIXBUF_DIR-in-configure-ac.patch12
-rwxr-xr-xsource/l/libwmf/libwmf.SlackBuild8
2 files changed, 19 insertions, 1 deletions
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 000000000..35cd563e4
--- /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 71772f2ab..9c5015319 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 \