summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-03-25 22:53:06 +0000
committer Eric Hameleers <alien@slackware.com>2020-03-26 08:59:49 +0100
commitf1c067fa42f709006ec1867a73a30f6517010f56 (patch)
tree4a80f91d8c3b8024192ac316f9da75feb74d4e4a /source
parent62f75c0a4e3cb8292cc39d62d6ac8a17f0f40ef9 (diff)
downloadcurrent-f1c067fa42f709006ec1867a73a30f6517010f56.tar.gz
current-f1c067fa42f709006ec1867a73a30f6517010f56.tar.xz
Wed Mar 25 22:53:06 UTC 202020200325225306
a/e2fsprogs-1.45.6-x86_64-2.txz: Rebuilt. Fixed RELEASE-NOTES dangling symlink. a/kernel-generic-5.4.28-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.28-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.28-x86_64-1.txz: Upgraded. ap/nano-4.9-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.28-x86-1.txz: Upgraded. d/llvm-10.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/rust-1.42.0-x86_64-2.txz: Rebuilt. Recompiled against llvm-10.0.0. d/scons-3.1.2-x86_64-3.txz: Rebuilt. Fixed shebangs for python3, removed useless .bat files. Thanks to teeemcee and ponce. d/vala-0.48.2-x86_64-1.txz: Upgraded. k/kernel-source-5.4.28-noarch-1.txz: Upgraded. l/libgsf-1.14.47-x86_64-1.txz: Upgraded. l/neon-0.31.0-x86_64-1.txz: Upgraded. l/netpbm-10.89.03-x86_64-1.txz: Upgraded. l/qt5-5.13.2-x86_64-3.txz: Rebuilt. Recompiled against llvm-10.0.0. x/mesa-20.0.2-x86_64-2.txz: Rebuilt. Recompiled against llvm-10.0.0. xfce/thunar-1.8.14-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/e2fsprogs/e2fsprogs.SlackBuild11
-rwxr-xr-xsource/d/llvm/llvm.SlackBuild5
-rw-r--r--source/d/llvm/llvm.polly.hack.diff12
-rw-r--r--source/d/llvm/llvm.url40
-rwxr-xr-xsource/d/rust/rust.SlackBuild2
-rwxr-xr-xsource/d/scons/scons.SlackBuild10
-rw-r--r--source/k/kernel-configs/config-generic-5.4.28 (renamed from source/k/kernel-configs/config-generic-5.4.27)2
-rw-r--r--source/k/kernel-configs/config-generic-5.4.28.x64 (renamed from source/k/kernel-configs/config-generic-5.4.27.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.4.28-smp (renamed from source/k/kernel-configs/config-generic-smp-5.4.27-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.28 (renamed from source/k/kernel-configs/config-huge-5.4.27)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.28.x64 (renamed from source/k/kernel-configs/config-huge-5.4.27.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.4.28-smp (renamed from source/k/kernel-configs/config-huge-smp-5.4.27-smp)2
-rw-r--r--source/l/FTBFSlog3
-rwxr-xr-xsource/l/libgsf/libgsf.SlackBuild11
-rwxr-xr-xsource/l/neon/neon.SlackBuild2
-rw-r--r--source/l/neon/neon.url2
-rwxr-xr-xsource/l/qt5/qt5.SlackBuild2
-rw-r--r--source/l/serf/serf.SConstruct.python3.diff24
-rwxr-xr-xsource/l/serf/serf.SlackBuild3
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild2
-rw-r--r--source/xfce/thunar/thunar.url2
21 files changed, 103 insertions, 40 deletions
diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild
index c3e6df1ea..afe17b857 100755
--- a/source/a/e2fsprogs/e2fsprogs.SlackBuild
+++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2015, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=e2fsprogs
VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -202,6 +202,13 @@ cp -a ext2ed/README $PKG/usr/doc/e2fsprogs-$VERSION/README.ext2ed
cp -a lib/uuid/COPYING $PKG/usr/doc/e2fsprogs-$VERSION/COPYING.uuid
chmod 644 $PKG/usr/doc/e2fsprogs-$VERSION/*
+# If RELEASE-NOTES is a symlink, fix that:
+if [ -L $PKG/usr/doc/e2fsprogs-$VERSION/RELEASE-NOTES ]; then
+ rm $PKG/usr/doc/e2fsprogs-$VERSION/RELEASE-NOTES
+ cp -a $(readlink RELEASE-NOTES) $PKG/usr/doc/e2fsprogs-$VERSION/RELEASE-NOTES
+ chmod 644 $PKG/usr/doc/e2fsprogs-$VERSION/RELEASE-NOTES
+fi
+
# Trim RELEASE-NOTES to only include recent history:
if [ -r RELEASE-NOTES ]; then
DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 0df856d8a..81a18569f 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=llvm
VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -113,6 +113,9 @@ cd ../
# Support GCC built for i586-slackware-linux:
zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p1 --verbose || exit 1
+# Hack to fix build with polly. Maybe we should just not use polly... ?
+zcat $CWD/llvm.polly.hack.diff.gz | patch -p1 --verbose || exit 1
+
# As of clang-tools-extra-7.0.0 we get the following error on i586 or i686:
# CMakeFiles/clangDaemon.dir/Trace.cpp.o:Trace.cpp:function std::unique_ptr<clang::clangd::trace::(anonymous namespace)::JSONTracer::JSONSpan, std::default_delete<clang::clangd::trace::(anonymous namespace)::JSONTracer::JSONSpan> >::~unique_ptr(): error: undefined reference to '__atomic_load_8'
# Attempts to try to fix this have failed here, so for now we will not build
diff --git a/source/d/llvm/llvm.polly.hack.diff b/source/d/llvm/llvm.polly.hack.diff
new file mode 100644
index 000000000..eb607ca2b
--- /dev/null
+++ b/source/d/llvm/llvm.polly.hack.diff
@@ -0,0 +1,12 @@
+--- ./projects/polly/lib/CMakeLists.txt.orig 2020-03-23 10:01:02.000000000 -0500
++++ ./projects/polly/lib/CMakeLists.txt 2020-03-24 14:47:14.602756953 -0500
+@@ -139,7 +139,8 @@
+ )
+
+ # Polly-ACC requires the NVPTX target to be present in the executable it is linked to
+- set_property(TARGET bugpoint APPEND PROPERTY LINK_LIBRARIES LLVMTarget)
++ # Randomly commented to fix build lol
++ #set_property(TARGET bugpoint APPEND PROPERTY LINK_LIBRARIES LLVMTarget)
+ endif ()
+
+ # Create a loadable module Polly.so that can be loaded using
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index af8426744..14e4fdc37 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,21 +1,21 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/llvm-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/clang-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/clang-tools-extra-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/compiler-rt-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/lldb-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/openmp-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/polly-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/libcxx-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/libcxxabi-9.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/lld-9.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/llvm-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang-tools-extra-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/compiler-rt-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/lldb-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/openmp-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/polly-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxx-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxxabi-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/lld-10.0.0.src.tar.xz
-#http://llvm.org/releases/9.0.1/llvm-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/clang-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/clang-tools-extra-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/compiler-rt-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/lldb-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/openmp-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/polly-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/libcxx-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/libcxxabi-9.0.1.src.tar.xz
-#http://llvm.org/releases/9.0.1/lld-9.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.0/llvm-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/clang-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/clang-tools-extra-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/compiler-rt-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/lldb-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/openmp-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/polly-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/libcxx-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/libcxxabi-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.0/lld-10.0.0.src.tar.xz
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 70fe5f357..57d454398 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rust
SRCNAM="${PKGNAM}c"
VERSION=${VERSION:-1.42.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
# YES is probably better (when it works...)
diff --git a/source/d/scons/scons.SlackBuild b/source/d/scons/scons.SlackBuild
index c62599b7e..58c43bdf5 100755
--- a/source/d/scons/scons.SlackBuild
+++ b/source/d/scons/scons.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# Copyright 2015 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scons
VERSION=${VERSION:-$(echo scons-*.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
@@ -81,6 +81,12 @@ python3 setup.py install \
--standard-lib \
--root=$PKG || exit 1
+# Fix shebangs for python3:
+sed -i "s|env python$|env python3|" $PKG/usr/bin/*
+
+# Get rid of MS-DOS batch files:
+rm -f $PKG/usr/bin/*.bat
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/k/kernel-configs/config-generic-5.4.27 b/source/k/kernel-configs/config-generic-5.4.28
index e6b8ec05f..10c57d386 100644
--- a/source/k/kernel-configs/config-generic-5.4.27
+++ b/source/k/kernel-configs/config-generic-5.4.28
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27 Kernel Configuration
+# Linux/x86 5.4.28 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-5.4.27.x64 b/source/k/kernel-configs/config-generic-5.4.28.x64
index 2cd24b52b..740c0d2a5 100644
--- a/source/k/kernel-configs/config-generic-5.4.27.x64
+++ b/source/k/kernel-configs/config-generic-5.4.28.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27 Kernel Configuration
+# Linux/x86 5.4.28 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.27-smp b/source/k/kernel-configs/config-generic-smp-5.4.28-smp
index 200b88e29..6adf66d68 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.27-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.28-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27 Kernel Configuration
+# Linux/x86 5.4.28 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.27 b/source/k/kernel-configs/config-huge-5.4.28
index 463e8c356..5201d4452 100644
--- a/source/k/kernel-configs/config-huge-5.4.27
+++ b/source/k/kernel-configs/config-huge-5.4.28
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27 Kernel Configuration
+# Linux/x86 5.4.28 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.27.x64 b/source/k/kernel-configs/config-huge-5.4.28.x64
index c81ae8398..f84b5f5c1 100644
--- a/source/k/kernel-configs/config-huge-5.4.27.x64
+++ b/source/k/kernel-configs/config-huge-5.4.28.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27 Kernel Configuration
+# Linux/x86 5.4.28 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.27-smp b/source/k/kernel-configs/config-huge-smp-5.4.28-smp
index 332541ae6..4612518c2 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.27-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.28-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.27 Kernel Configuration
+# Linux/x86 5.4.28 Kernel Configuration
#
#
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index ad0a7b630..ecf14cab4 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Wed Mar 25 19:00:00 UTC 2020
+ serf: fix for python3 based scons. Thanks to nobodino and ponce.
++--------------------------+
Tue Jan 14 18:38:45 UTC 2020
libplist: added export PYTHONWARNINGS=ignore:::pkg_resources.py2_warn
to avoid a fatal warning about Python 2.7 EOL. At least this new
diff --git a/source/l/libgsf/libgsf.SlackBuild b/source/l/libgsf/libgsf.SlackBuild
index 20824fdac..e99b9b369 100755
--- a/source/l/libgsf/libgsf.SlackBuild
+++ b/source/l/libgsf/libgsf.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libgsf
-VERSION=${VERSION:-$(echo libgsf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo libgsf-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -67,7 +67,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf libgsf-$VERSION
-tar xvf $CWD/libgsf-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/libgsf-$VERSION.tar.?z || exit 1
cd libgsf-$VERSION || exit 1
chown -R root:root .
find . \
@@ -76,12 +76,17 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+if [ ! -r configure ]; then
+ NOCONFIGURE=1 ./autogen.sh
+fi
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --enable-gtk-doc \
--with-html-dir=/usr/share/gtk-doc/html \
--mandir=/usr/man \
--disable-static \
diff --git a/source/l/neon/neon.SlackBuild b/source/l/neon/neon.SlackBuild
index 0d7becd37..10d9b2e1b 100755
--- a/source/l/neon/neon.SlackBuild
+++ b/source/l/neon/neon.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=neon
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/neon/neon.url b/source/l/neon/neon.url
index e250f239e..66d887747 100644
--- a/source/l/neon/neon.url
+++ b/source/l/neon/neon.url
@@ -1 +1 @@
-https://fossies.org/linux/www/neon-0.30.2.tar.gz
+http://www.webdav.org/neon
diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild
index 58439f31e..4ec23c9c9 100755
--- a/source/l/qt5/qt5.SlackBuild
+++ b/source/l/qt5/qt5.SlackBuild
@@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=qt5
VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
PKGSRC=$(echo $VERSION | cut -d - -f 1)
PKGVER=$(echo $VERSION | tr - _)
diff --git a/source/l/serf/serf.SConstruct.python3.diff b/source/l/serf/serf.SConstruct.python3.diff
new file mode 100644
index 000000000..144f5e39e
--- /dev/null
+++ b/source/l/serf/serf.SConstruct.python3.diff
@@ -0,0 +1,24 @@
+--- serf-1.3.9/SConstruct.orig 2019-07-26 17:49:30.910189251 +0000
++++ serf-1.3.9/SConstruct 2019-07-26 17:49:54.073821735 +0000
+@@ -163,9 +163,9 @@
+ suffix='.def', src_suffix='.h')
+ })
+
+-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+- 'SERF_MINOR_VERSION ([0-9]+).*'
+- 'SERF_PATCH_VERSION ([0-9]+)',
++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
++ b'SERF_MINOR_VERSION ([0-9]+).*'
++ b'SERF_PATCH_VERSION ([0-9]+)',
+ env.File('serf.h').get_contents(),
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+@@ -183,7 +183,7 @@
+
+ unknown = opts.UnknownVariables()
+ if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++ print ('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])
diff --git a/source/l/serf/serf.SlackBuild b/source/l/serf/serf.SlackBuild
index a1a8df3bc..fef6ca521 100755
--- a/source/l/serf/serf.SlackBuild
+++ b/source/l/serf/serf.SlackBuild
@@ -85,6 +85,9 @@ find . \
sed -i "/Default/s:lib_static,::" SConstruct
sed -i "/Alias/s:install_static,::" SConstruct
+# Fix for python3 based scons:
+zcat $CWD/serf.SConstruct.python3.diff.gz | patch -p1 --verbose || exit 1
+
scons $NUMJOBS \
PREFIX=/usr \
LIBDIR=/usr/lib${LIBDIRSUFFIX} \
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index da435062d..ea18f8bfe 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mesa
VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
DEMOVERS=${DEMOVERS:-8.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
BUILD_DEMOS=${BUILD_DEMOS:-YES}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/xfce/thunar/thunar.url b/source/xfce/thunar/thunar.url
index ec8f2301d..3424577a3 100644
--- a/source/xfce/thunar/thunar.url
+++ b/source/xfce/thunar/thunar.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.12.tar.bz2
+http://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.14.tar.bz2