amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glib: Update to 2.83.3. Fix test for tzdata@2025a.

Browse source 
* gnu/packages/glib.scm (glib): Update to 2.83.3.
[arguments]<#:phases>: Adjust patch-pkg-config-files phase.

Change-Id: Icf53572bfbd38056a7587869a602d7d9dc778c45
This commit is contained in:
Zheng Junjie 2025-02-08 14:34:30 +08:00 • committed by Andreas Enge
parent a9ebd7822d
commit d62a455b43
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/glib.scm
View file

@ -246,7 +246,7 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
(define glib-minimal (define glib-minimal
(package (package
(name "glib") (name "glib")
(version "2.82.1") (version "2.83.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -255,7 +255,7 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
name "/" (string-take version 4) "/" name "/" (string-take version 4) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7")) (base32 "139jpar5f5qjxkf3knvqq1kgdxgsrxqqmybw4yaaagrfpcc57inh"))
(patches (patches
(search-patches "glib-appinfo-watch.patch" (search-patches "glib-appinfo-watch.patch"
"glib-skip-failing-test.patch")) "glib-skip-failing-test.patch"))
@ -333,7 +333,7 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
;; assertion failed (last_thread_id <= thread_id): (3 <= 2) ;; assertion failed (last_thread_id <= thread_id): (3 <= 2)
#~((substitute* "glib/tests/thread-pool-slow.c" #~((substitute* "glib/tests/thread-pool-slow.c"
(("^ g_assert_cmpint \\(last_thread_id.*" all) (("^ g_assert_cmpint \\(last_thread_id.*" all)
(string-append "//" all "\n")))) (string-append "//" all "\n"))))
#~()) #~())
#$@(if (system-hurd?) #$@(if (system-hurd?)
'((with-directory-excursion "gio/tests" '((with-directory-excursion "gio/tests"
@ -480,7 +480,9 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
;; outputs. ;; outputs.
(substitute* (substitute*
(list (search-input-file outputs "lib/pkgconfig/gio-2.0.pc") (list (search-input-file outputs "lib/pkgconfig/gio-2.0.pc")
(search-input-file outputs "lib/pkgconfig/glib-2.0.pc")) (search-input-file outputs "lib/pkgconfig/glib-2.0.pc")
(search-input-file outputs
"lib/pkgconfig/girepository-2.0.pc"))
(("^bindir=.*") (("^bindir=.*")
"") "")
(("=\\$\\{bindir\\}/") (("=\\$\\{bindir\\}/")