diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 14:33:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 14:55:58 +0100 |
| commit | f55ef78b5cede8b04463db781ea2d04eaaba3e7c (patch) | |
| tree | 8f3d6042b35c8eeb2c2cca49e1d7d2c7ebf9c8ce /gnu/packages | |
| parent | ac85920a74bc7e8fb88820ff3858d143bc30a449 (diff) | |
| download | guix-f55ef78b5cede8b04463db781ea2d04eaaba3e7c.tar guix-f55ef78b5cede8b04463db781ea2d04eaaba3e7c.tar.gz | |
gnu: gtk+@2: Update to 2.24.32.
* gnu/packages/patches/gtk2-fix-failing-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/gtk.scm (gtk+-2): Update to 2.24.32.
[source]: Remove 'gtk2-fix-failing-test.patch'.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/gtk.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/patches/gtk2-fix-failing-test.patch | 39 |
2 files changed, 3 insertions, 43 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e344a74308..10281c139e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -591,7 +591,7 @@ is part of the GNOME accessibility project.") (define-public gtk+-2 (package (name "gtk+") - (version "2.24.31") + (version "2.24.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -599,11 +599,10 @@ is part of the GNOME accessibility project.") name "-" version ".tar.xz")) (sha256 (base32 - "0n26jm09n03nqbd00d2ij63xrby3vik56sk5yj6w1vy768kr5hb8")) + "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" - "gtk2-theme-paths.patch" - "gtk2-fix-failing-test.patch")))) + "gtk2-theme-paths.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs diff --git a/gnu/packages/patches/gtk2-fix-failing-test.patch b/gnu/packages/patches/gtk2-fix-failing-test.patch deleted file mode 100644 index 721dc012c7..0000000000 --- a/gnu/packages/patches/gtk2-fix-failing-test.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 12d8b4e8f2f9c9a7707d1d3fccba382732212e3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com> -Date: Tue, 5 Dec 2017 20:06:36 +0100 -Subject: [PATCH] Fix test failing on new GLib versions. - -This test fails on newer GLib version, because GLib exports a new public marshaller. -The additional symbol making the test fail is: -g_cclosure_marshal_BOOLEAN__BOXED_BOXED - -The fix makes the test ignore non-gtk related abi. -This ensures if future marshallers are added to glib those will not pose a problem. - -The fix also ensures that the test still checks the gtk abi for identity, and -that the library provides a superset of the required abi. - -Upstream reponse to this problem was: - -GLib added a new marshaller in its public API -And the `abicheck.sh`in GTK+ 2.24 hasn't been updated because GTK+ 2.24 is in deep -maintenance mode and very few people test it against newer versions of GLib - ---- - gtk/abicheck.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh -index 0d033fb..53b7bfe 100755 ---- a/gtk/abicheck.sh -+++ b/gtk/abicheck.sh -@@ -1,5 +1,5 @@ - #! /bin/sh - - cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi --nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi -+nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | egrep '^gtk_' | sort > actual-abi - diff -u expected-abi actual-abi && rm -f expected-abi actual-abi --- -2.15.0 - |