diff options
Diffstat (limited to 'source')
15 files changed, 171 insertions, 11 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index ea866996e..6d8db3ed3 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_elflibs VERSION=${VERSION:-15.0} -BUILD=${BUILD:-14} +BUILD=${BUILD:-15} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp index 42ac7dde2..b7919fe8b 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp @@ -14,3 +14,7 @@ # Add the shared library from libdvdread-6.0.1 until third party packages catch up: # /usr/lib/libdvdread.so.4 +# Need these saved here during the KDE4 -> Plasma 5 transition: +/usr/lib/libexiv2.so.26 +/usr/lib/libraw.so.16 +/usr/lib/libraw_r.so.16 diff --git a/source/e/emacs/0001-Support-ImageMagick-version-7.patch b/source/e/emacs/0001-Support-ImageMagick-version-7.patch new file mode 100644 index 000000000..15e11b6d5 --- /dev/null +++ b/source/e/emacs/0001-Support-ImageMagick-version-7.patch @@ -0,0 +1,81 @@ +From 9648f9e622471b36111847c0ed352303c8c09504 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Mon, 26 Nov 2018 17:37:16 -0800
+Subject: [PATCH] Support ImageMagick version 7
+
+Backport from master.
+* configure.ac (HAVE_IMAGEMAGICK7): New macro.
+(HAVE_IMAGEMAGICK): Also define if using ImageMagick 7 or later.
+* src/image.c [HAVE_IMAGEMAGICK7]: Include
+<MagickWand/MagickWand.h> and <MagickCore/version.h> instead of
+<wand/MagickWand.h> and <magick/version.h>.
+(PixelSetMagickColor, MagickPixelPacket) [HAVE_IMAGEMAGICK7]:
+New compatibility definitions.
+---
+ configure.ac | 15 +++++++++------
+ src/image.c | 13 +++++++++++--
+ 2 files changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dc6d776d45..a4d0feaad5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2521,11 +2521,14 @@ AC_DEFUN
+ HAVE_IMAGEMAGICK=no
+ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then
+ if test "${with_imagemagick}" != "no"; then
+- ## 6.3.5 is the earliest version known to work; see Bug#17339.
+- ## 6.8.2 makes Emacs crash; see Bug#13867.
+- ## 7 and later have not been ported to; See Bug#25967.
+- IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
+- EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
++ EMACS_CHECK_MODULES([IMAGEMAGICK], [MagickWand >= 7])
++ if test $HAVE_IMAGEMAGICK = yes; then
++ AC_DEFINE([HAVE_IMAGEMAGICK7], 1, [Define to 1 if using ImageMagick7.])
++ else
++ ## 6.3.5 is the earliest version known to work; see Bug#17339.
++ ## 6.8.2 makes Emacs crash; see Bug#13867.
++ EMACS_CHECK_MODULES([IMAGEMAGICK], [Wand >= 6.3.5 Wand != 6.8.2])
++ fi
+
+ if test $HAVE_IMAGEMAGICK = yes; then
+ OLD_CFLAGS=$CFLAGS
+@@ -5404,7 +5407,7 @@ AC_DEFUN
+ Does Emacs use -lrsvg-2? ${HAVE_RSVG}
+ Does Emacs use cairo? ${HAVE_CAIRO}
+ Does Emacs use -llcms2? ${HAVE_LCMS2}
+- Does Emacs use imagemagick (version 6)? ${HAVE_IMAGEMAGICK}
++ Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}
+ Does Emacs support sound? ${HAVE_SOUND}
+ Does Emacs use -lgpm? ${HAVE_GPM}
+ Does Emacs use -ldbus? ${HAVE_DBUS}
+diff --git a/src/image.c b/src/image.c
+index a6b2d9060b..cc99f33d5f 100644
+--- a/src/image.c
++++ b/src/image.c
+@@ -8272,11 +8272,20 @@ imagemagick_image_p (Lisp_Object object)
+ /* The GIF library also defines DrawRectangle, but its never used in Emacs.
+ Therefore rename the function so it doesn't collide with ImageMagick. */
+ #define DrawRectangle DrawRectangleGif
+-#include <wand/MagickWand.h>
++
++#ifdef HAVE_IMAGEMAGICK7
++# include <MagickWand/MagickWand.h>
++# include <MagickCore/version.h>
++/* ImageMagick 7 compatibility definitions. */
++# define PixelSetMagickColor PixelSetPixelColor
++typedef PixelInfo MagickPixelPacket;
++#else
++# include <wand/MagickWand.h>
++# include <magick/version.h>
++#endif
+
+ /* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.
+ Emacs seems to work fine with the hidden version, so unhide it. */
+-#include <magick/version.h>
+ #if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
+ extern WandExport void PixelGetMagickColor (const PixelWand *,
+ MagickPixelPacket *);
+--
+2.19.1
+
diff --git a/source/e/emacs/emacs.SlackBuild b/source/e/emacs/emacs.SlackBuild index da07e32fe..cb251e006 100755 --- a/source/e/emacs/emacs.SlackBuild +++ b/source/e/emacs/emacs.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=emacs -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Determine version number the tarball is labeled with: TARBALLVER=${TARBALLVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # OK, now what's being used as the source directory version number... account @@ -92,6 +92,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/0001-Support-ImageMagick-version-7.patch.gz | patch -p1 --verbose || exit 1 +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/k/kernel-configs/config-generic-4.19.82 b/source/k/kernel-configs/config-generic-4.19.83 index a5d987c49..247c7e316 100644 --- a/source/k/kernel-configs/config-generic-4.19.82 +++ b/source/k/kernel-configs/config-generic-4.19.83 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.82 Kernel Configuration +# Linux/x86 4.19.83 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.82.x64 b/source/k/kernel-configs/config-generic-4.19.83.x64 index 1b8396740..4df058366 100644 --- a/source/k/kernel-configs/config-generic-4.19.82.x64 +++ b/source/k/kernel-configs/config-generic-4.19.83.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.82 Kernel Configuration +# Linux/x86 4.19.83 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.82-smp b/source/k/kernel-configs/config-generic-smp-4.19.83-smp index 9b5987013..b0bdd68af 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.82-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.83-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.82 Kernel Configuration +# Linux/x86 4.19.83 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.82 b/source/k/kernel-configs/config-huge-4.19.83 index 7f06c286c..e21d6e62c 100644 --- a/source/k/kernel-configs/config-huge-4.19.82 +++ b/source/k/kernel-configs/config-huge-4.19.83 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.82 Kernel Configuration +# Linux/x86 4.19.83 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.82.x64 b/source/k/kernel-configs/config-huge-4.19.83.x64 index 258b1a79a..ef4b95227 100644 --- a/source/k/kernel-configs/config-huge-4.19.82.x64 +++ b/source/k/kernel-configs/config-huge-4.19.83.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.82 Kernel Configuration +# Linux/x86 4.19.83 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.82-smp b/source/k/kernel-configs/config-huge-smp-4.19.83-smp index b2cadf8b4..a3224c0e7 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.82-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.83-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.82 Kernel Configuration +# Linux/x86 4.19.83 Kernel Configuration # # diff --git a/source/l/qt/patches/qt-4.8-disable-sslv3.patch b/source/l/qt/patches/qt-4.8-disable-sslv3.patch new file mode 100644 index 000000000..c9b1996ec --- /dev/null +++ b/source/l/qt/patches/qt-4.8-disable-sslv3.patch @@ -0,0 +1,56 @@ +--- ./src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2019-11-09 12:55:26.646752874 -0600 ++++ ./src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-11-09 12:58:22.032754751 -0600 +@@ -253,7 +253,9 @@ + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + #if OPENSSL_VERSION_NUMBER < 0x10100000L + DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) + #else +@@ -263,7 +265,9 @@ + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + #if OPENSSL_VERSION_NUMBER < 0x10100000L + DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) + #else +@@ -272,7 +276,9 @@ + DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) + #else + DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) +@@ -756,7 +762,9 @@ + RESOLVEFUNC(SSL_shutdown, 173, libs.first ) + RESOLVEFUNC(SSL_write, 188, libs.first ) + RESOLVEFUNC(SSLv2_client_method, 192, libs.first ) ++#ifndef OPENSSL_NO_SSL3 + RESOLVEFUNC(SSLv3_client_method, 195, libs.first ) ++#endif + RESOLVEFUNC(SSLv23_client_method, 189, libs.first ) + RESOLVEFUNC(TLSv1_client_method, 198, libs.first ) + RESOLVEFUNC(SSLv2_server_method, 194, libs.first ) +--- ./src/network/ssl/qsslsocket_openssl.cpp.orig 2019-11-09 12:55:01.605752606 -0600 ++++ ./src/network/ssl/qsslsocket_openssl.cpp 2019-11-09 12:55:26.632752874 -0600 +@@ -273,7 +273,11 @@ + #endif + break; + case QSsl::SslV3: ++#ifndef OPENSSL_NO_SSL3 + ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); ++#else ++ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error ++#endif + break; + case QSsl::SecureProtocols: // SslV2 will be disabled below + case QSsl::TlsV1SslV3: // SslV2 will be disabled below diff --git a/source/l/qt/qt-nowebkit.SlackBuild b/source/l/qt/qt-nowebkit.SlackBuild index 28368c6e1..1b72d99d1 100755 --- a/source/l/qt/qt-nowebkit.SlackBuild +++ b/source/l/qt/qt-nowebkit.SlackBuild @@ -43,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-14} +BUILD=${BUILD:-15} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -164,6 +164,7 @@ zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch.gz | patc zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch.gz | patch -p1 --verbose || exit 1 #zcat $CWD/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/qt-4.8-disable-sslv3.patch.gz | patch -p1 --verbose || exit 1 # All other distros I checked build with -no-webkit. But this has the downside of # breaking the build when QtWebKit is present on the build system and some things diff --git a/source/xap/xine-lib/xine-lib-imagemagick7.patch b/source/xap/xine-lib/xine-lib-imagemagick7.patch new file mode 100644 index 000000000..34062222e --- /dev/null +++ b/source/xap/xine-lib/xine-lib-imagemagick7.patch @@ -0,0 +1,13 @@ +http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD + +--- xine-lib-1.2.6/src/video_dec/image.c ++++ xine-lib-1.2.6/src/video_dec/image.c +@@ -39,7 +39,7 @@ + #define LOG + */ + +-#include <wand/magick_wand.h> ++#include <MagickWand/MagickWand.h> + #ifdef PACKAGE_NAME + #undef PACKAGE_BUGREPORT + #undef PACKAGE_NAME diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild index e7c6776ca..6dd61e8d9 100755 --- a/source/xap/xine-lib/xine-lib.SlackBuild +++ b/source/xap/xine-lib/xine-lib.SlackBuild @@ -32,7 +32,7 @@ DIRVER=1.2.9 # Version used for the Slackware package PKGVER=1.2.9 -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -95,6 +95,8 @@ cd xine-lib-$DIRVER || exit 1 # sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \ # -i m4/video_out.m4 && +zcat $CWD/xine-lib-imagemagick7.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index a75f9ffad..ef6d12c72 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xlockmore VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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 |