From 434798b3de156fdd4ca11e56b64db31c54e83fb5 Mon Sep 17 00:00:00 2001 From: OscarL Date: Mon, 9 Dec 2024 06:18:39 -0300 Subject: [PATCH] serf: update to version 1.3.10. (#11416) Dropped support for gcc2 version (only user on-tree, subversion, is "!x86_gcc2"). Dropped now unneeded patches. Builds OK out of the box. Fixes #11414. --- ...print-in-the-scons-file-to-unbreak-b.patch | 29 ------------------- ...-Fix-path-quoting-for-.def-generator.patch | 27 ----------------- net-libs/serf/patches/0003-gen_def.patch | 27 ----------------- ...11083-fix-building-with-scons-3.0.0-.patch | 29 ------------------- net-libs/serf/patches/serf-1.3.9.patchset | 23 --------------- .../{serf-1.3.9.recipe => serf-1.3.10.recipe} | 15 +++------- 6 files changed, 4 insertions(+), 146 deletions(-) delete mode 100644 net-libs/serf/patches/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch delete mode 100644 net-libs/serf/patches/0002-SConstruct-Fix-path-quoting-for-.def-generator.patch delete mode 100644 net-libs/serf/patches/0003-gen_def.patch delete mode 100644 net-libs/serf/patches/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch delete mode 100644 net-libs/serf/patches/serf-1.3.9.patchset rename net-libs/serf/{serf-1.3.9.recipe => serf-1.3.10.recipe} (90%) diff --git a/net-libs/serf/patches/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch b/net-libs/serf/patches/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch deleted file mode 100644 index 4a5832ac1..000000000 --- a/net-libs/serf/patches/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 99f6e1b0d68281b63218d6adfe68cd9e331ac5be Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 3 Sep 2018 10:50:08 -0700 -Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building - with most recent scons version. - -* SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python - 3.0 and 2.7. - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1809132&r2=1811083&diff_format=h] -Signed-off-by: Khem Raj ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 1670459..18a45fa 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -184,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) - - 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/net-libs/serf/patches/0002-SConstruct-Fix-path-quoting-for-.def-generator.patch b/net-libs/serf/patches/0002-SConstruct-Fix-path-quoting-for-.def-generator.patch deleted file mode 100644 index cec881ee1..000000000 --- a/net-libs/serf/patches/0002-SConstruct-Fix-path-quoting-for-.def-generator.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e51b4b37916dd20b13133cb7af16601b6bf3ace9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 3 Sep 2018 10:54:54 -0700 -Subject: [PATCH] SConstruct: Fix path quoting for .def generator - -Patch by: Martin Keller -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1807594&r2=1809132] - -Signed-off-by: Khem Raj ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 18a45fa..571bdce 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -160,7 +160,7 @@ env = Environment(variables=opts, - - env.Append(BUILDERS = { - 'GenDef' : -- Builder(action = sys.executable + ' build/gen_def.py $SOURCES > $TARGET', -+ Builder(action = '"%s" "%s" $SOURCES > $TARGET' % (sys.executable, gen_def_script,), - suffix='.def', src_suffix='.h') - }) - diff --git a/net-libs/serf/patches/0003-gen_def.patch b/net-libs/serf/patches/0003-gen_def.patch deleted file mode 100644 index edba0ee16..000000000 --- a/net-libs/serf/patches/0003-gen_def.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 98e793d9f2250e7c1f9f1eb5dfd616a6a8829e9a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 3 Sep 2018 11:12:27 -0700 -Subject: [PATCH] gen_def - -This is partial port because half of this patch is already present in our -patches - -Upstream-Status: Backport [https://github.com/apache/serf/commit/8f07c9626106873a594fd07e7c257e9080d8660b] -Signed-off-by: Khem Raj ---- - SConstruct | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SConstruct b/SConstruct -index 7bb4a85..01ec245 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -157,6 +157,8 @@ env = Environment(variables=opts, - CPPPATH=['.', ], - ) - -+gen_def_script = env.File('build/gen_def.py').rstr() -+ - env.Append(BUILDERS = { - 'GenDef' : - Builder(action = '"%s" "%s" $SOURCES > $TARGET' % (sys.executable, gen_def_script,), diff --git a/net-libs/serf/patches/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch b/net-libs/serf/patches/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch deleted file mode 100644 index 02fa9e3a0..000000000 --- a/net-libs/serf/patches/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 3 Sep 2018 11:12:38 -0700 -Subject: [PATCH] Follow-up to r1811083 fix building with scons 3.0.0 and - Python3 - -* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid - TypeError: cannot use a string pattern on a bytes-like object - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604] -Signed-off-by: Khem Raj ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 877731e..7678bb1 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -169,7 +169,7 @@ env.Append(BUILDERS = { - match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' - 'SERF_MINOR_VERSION ([0-9]+).*' - 'SERF_PATCH_VERSION ([0-9]+)', -- env.File('serf.h').get_contents(), -+ env.File('serf.h').get_contents().decode('utf-8'), - re.DOTALL) - MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] - env.Append(MAJOR=str(MAJOR)) diff --git a/net-libs/serf/patches/serf-1.3.9.patchset b/net-libs/serf/patches/serf-1.3.9.patchset deleted file mode 100644 index 5fa2101ca..000000000 --- a/net-libs/serf/patches/serf-1.3.9.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From 5dc2e27bbd86a6fdfc6a3d9a724abfb35619f979 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Wed, 17 Sep 2014 16:27:17 +0200 -Subject: remove option unknown to gcc2. - - -diff --git a/SConstruct b/SConstruct -index 0e4f988..0755dec 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -249,8 +249,7 @@ if sys.platform != 'win32': - - if have_gcc: - env.Append(CFLAGS=['-std=c89']) -- env.Append(CCFLAGS=['-Wdeclaration-after-statement', -- '-Wmissing-prototypes', -+ env.Append(CCFLAGS=['-Wmissing-prototypes', - '-Wall']) - - if debug: --- -1.8.3.4 - diff --git a/net-libs/serf/serf-1.3.9.recipe b/net-libs/serf/serf-1.3.10.recipe similarity index 90% rename from net-libs/serf/serf-1.3.9.recipe rename to net-libs/serf/serf-1.3.10.recipe index e62bff5cd..62d269deb 100644 --- a/net-libs/serf/serf-1.3.9.recipe +++ b/net-libs/serf/serf-1.3.10.recipe @@ -6,19 +6,12 @@ transformations are kept to a minimum to provide high performance operation." HOMEPAGE="https://serf.apache.org/" COPYRIGHT="2002-2019 Justin Erenkrantz and Greg Stein" LICENSE="Apache v2" -REVISION="11" +REVISION="1" SOURCE_URI="https://archive.apache.org/dist/serf/serf-$portVersion.tar.bz2" -CHECKSUM_SHA256="549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc" -PATCHES=" - serf-$portVersion.patchset - 0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch - 0002-SConstruct-Fix-path-quoting-for-.def-generator.patch - 0003-gen_def.patch - 0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch - " +CHECKSUM_SHA256="be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6" -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" libVersion="1.3.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}"