diff options
| 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 |
| commit | f1c067fa42f709006ec1867a73a30f6517010f56 (patch) | |
| tree | 4a80f91d8c3b8024192ac316f9da75feb74d4e4a /source/l/serf | |
| parent | 62f75c0a4e3cb8292cc39d62d6ac8a17f0f40ef9 (diff) | |
| download | current-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/l/serf')
| -rw-r--r-- | source/l/serf/serf.SConstruct.python3.diff | 24 | ||||
| -rwxr-xr-x | source/l/serf/serf.SlackBuild | 3 |
2 files changed, 27 insertions, 0 deletions
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} \ |