From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-libs/serf/files/serf-1.3.9-python3.patch | 28 +++++++++++++++++++++++ net-libs/serf/files/serf-1.3.9-python3_byte.patch | 28 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 net-libs/serf/files/serf-1.3.9-python3.patch create mode 100644 net-libs/serf/files/serf-1.3.9-python3_byte.patch (limited to 'net-libs/serf/files') diff --git a/net-libs/serf/files/serf-1.3.9-python3.patch b/net-libs/serf/files/serf-1.3.9-python3.patch new file mode 100644 index 000000000000..7ba43d91968c --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-python3.patch @@ -0,0 +1,28 @@ +From 1c0241847e845a8da265aa89f297d3db6ae483b1 Mon Sep 17 00:00:00 2001 +From: Bert Huijben +Date: Wed, 4 Oct 2017 14:56:22 +0000 +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. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-0310-9956-ffa450edef68 +--- + SConstruct | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index e5d407b..fab9828 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -199,7 +199,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/files/serf-1.3.9-python3_byte.patch b/net-libs/serf/files/serf-1.3.9-python3_byte.patch new file mode 100644 index 000000000000..ab86af2082d9 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-python3_byte.patch @@ -0,0 +1,28 @@ +From 9d30108b630b77f732ef94d1642b159066ffd890 Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Wed, 8 Nov 2017 17:05:28 +0000 +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 + + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1814604 13f79535-47bb-0310-9956-ffa450edef68 +--- + SConstruct | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index 5f5036b..71e5b0a 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -182,7 +182,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)) -- cgit v1.2.3