diff options
Diffstat (limited to 'source/l/libwmf')
| -rw-r--r-- | source/l/libwmf/fixup-GDK_PIXBUF_DIR-in-configure-ac.patch | 12 | ||||
| -rwxr-xr-x | source/l/libwmf/libwmf.SlackBuild | 8 |
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 \ |