[packages/serf] rel 6
arekm
arekm at pld-linux.org
Thu Feb 2 21:00:24 CET 2023
commit 23709a48fb151c7574b7fb0041c1c2efe340d289
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Feb 2 21:00:03 2023 +0100
rel 6
python3.patch | 27 +++++++++++++++++++++++++++
serf.spec | 4 +++-
2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/serf.spec b/serf.spec
index b062e2b..f1cb8ba 100644
--- a/serf.spec
+++ b/serf.spec
@@ -7,7 +7,7 @@ Summary: A high-performance asynchronous HTTP client library
Summary(pl.UTF-8): Wysokowydajna biblioteka asynchronicznego klienta HTTP
Name: serf
Version: 1.3.9
-Release: 5
+Release: 6
License: Apache v2.0
Group: Libraries
Source0: https://www.apache.org/dist/serf/%{name}-%{version}.tar.bz2
@@ -15,6 +15,7 @@ Source0: https://www.apache.org/dist/serf/%{name}-%{version}.tar.bz2
Patch0: %{name}-scons.patch
Patch1: openssl3.patch
Patch2: bio-ctrl.patch
+Patch3: python3.patch
URL: https://serf.apache.org/
BuildRequires: apr-devel
BuildRequires: apr-util-devel
@@ -71,6 +72,7 @@ Statyczne biblioteki serf.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p0
%build
%scons \
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..e555e18
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,27 @@
+Fix:
+
+TypeError: cannot use a string pattern on a bytes-like object:
+https://github.com/apache/serf/commit/9d30108b630b77f732ef94d1642b159066ffd890
+
+SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)?
+https://github.com/apache/serf/commit/1c0241847e845a8da265aa89f297d3db6ae483b1
+--- SConstruct.orig 2015-09-17 07:46:24.000000000 -0500
++++ SConstruct 2022-08-09 18:04:36.000000000 -0500
+@@ -167,7 +167,7 @@
+ 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))
+@@ -184,7 +184,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'])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/serf.git/commitdiff/23709a48fb151c7574b7fb0041c1c2efe340d289
More information about the pld-cvs-commit
mailing list