diff --git a/gnu/local.mk b/gnu/local.mk index 043f8c82f8..759709129b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2231,7 +2231,6 @@ dist_patch_DATA = \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/libsequoia-fix-ffi-Makefile.patch \ %D%/packages/patches/libsequoia-remove-store.patch \ - %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \ %D%/packages/patches/shared-mime-info-xdgmime-path.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ diff --git a/gnu/packages/patches/serf-python3.patch b/gnu/packages/patches/serf-python3.patch deleted file mode 100644 index 636f51ed1e..0000000000 --- a/gnu/packages/patches/serf-python3.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix build with Python 3 scons. - -Patch taken from Arch Linux: -https://github.com/archlinux/svntogit-packages/blob/packages/serf/trunk/scons-python3.patch - ---- 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/gnu/packages/web.scm b/gnu/packages/web.scm index ef3f4ebccd..de62b8617d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2355,15 +2355,14 @@ (define-public quvi (define-public serf (package (name "serf") - (version "1.3.9") + (version "1.3.10") (source (origin (method url-fetch) (uri (string-append "mirror://apache/serf/serf-" version ".tar.bz2")) - (patches (search-patches "serf-python3.patch")) (sha256 - (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l")))) + (base32 "1rk4q0fv9xs57fivjy5mxqkk5g7pvvvssxvalz6nwld2p84fz0dy")))) (build-system scons-build-system) (propagated-inputs (list apr apr-util openssl-1.1)) @@ -2372,7 +2371,8 @@ (define-public serf ;;("gss" ,gss) zlib)) (arguments - `(#:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr")) + `(#:scons-flags (list "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types" + (string-append "APR=" (assoc-ref %build-inputs "apr")) (string-append "APU=" (assoc-ref %build-inputs "apr-util")) (string-append "OPENSSL=" (assoc-ref %build-inputs "openssl")) ;; (string-append "GSSAPI=" (assoc-ref %build-inputs "gss"))