mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 14:56:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: serf: Update to 1.3.10 and fix build with gcc-14.

Browse source 
* gnu/packages/patches/serf-python3.patch: Remove file.N
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/web.scm (serf): Update to 1.3.10 and remove it.
[arguments]: Add CFLAGS to #:scons-flags to relax gcc-14's strictness.

Change-Id: I2cb4d9bc7e22ab0bedacbd79b98d33a1b6a27bd0
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-09 11:04:37 +01:00
parent 316cff52c9
commit 00a0dc2d0f
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 4 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -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 \

29
gnu/packages/patches/serf-python3.patch
View file

@ -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'])

8
gnu/packages/web.scm
View file

@ -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"))