[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/10: gnu: gcr: Update to 3.34.0.
From: |
guix-commits |
Subject: |
09/10: gnu: gcr: Update to 3.34.0. |
Date: |
Thu, 23 Jan 2020 17:41:00 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1de804da52d172865f6b04d1dd041f2e15965f35
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Jan 23 23:27:45 2020 +0100
gnu: gcr: Update to 3.34.0.
* gnu/packages/gnome.scm (gcr): Update to 3.34.0.
[source](patches): Remove.
[arguments]: Disable D-Bus tests differently.
[native-inputs]: Remove PYTHON-2 and INTLTOOL. Add PYTHON-WRAPPER and
GETTEXT-MINIMAL.
---
gnu/packages/gnome.scm | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5301cee..631f048 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1316,7 +1316,7 @@ the font would look under various sizes.")
(define-public gcr
(package
(name "gcr")
- (version "3.28.1")
+ (version "3.34.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -1324,20 +1324,7 @@ the font would look under various sizes.")
name "-" version ".tar.xz"))
(sha256
(base32
- "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m"))
- (patches
- (list
- ;; This patch solves an ordering issue that showed up when
- ;; running the test suite against newer Glib 2.60. See
- ;; <https://gitlab.gnome.org/GNOME/gcr/merge_requests/9>.
- (origin
- (method url-fetch)
- (uri (string-append
"https://gitlab.gnome.org/GNOME/gcr/commit/"
-
"45d637578d7643ff96c0183ac267497a0b4c6344.diff"))
- (file-name "gcr-hashtable-ordering.patch")
- (sha256
- (base32
-
"1vsqiys8fsm1f1vvds783wwf7zwi5v282rhsai8jrsm6x7h79gbi")))))))
+ "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -1346,9 +1333,9 @@ the font would look under various sizes.")
;; build environment.
(add-after 'unpack 'disable-failing-tests
(lambda _
- (substitute* "gcr/test-system-prompt.c"
- (("g_test_add") "//")
- (("return.*") "return 0;"))
+ (substitute* "Makefile.in"
+ (("[[:blank:]]+test-system-prompt\\$\\(EXEEXT\\)")
+ ""))
#t))
(add-before 'check 'pre-check
(lambda _
@@ -1360,11 +1347,11 @@ the font would look under various sizes.")
("gnupg" ,gnupg) ;called as a child process during tests
("libgcrypt" ,libgcrypt)))
(native-inputs
- `(("python" ,python-2) ;for tests
+ `(("python" ,python-wrapper) ;for tests
("pkg-config" ,pkg-config)
+ ("gettext" ,gettext-minimal)
("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("intltool" ,intltool)
("libxml2" ,libxml2)
("vala" ,vala)
("xsltproc" ,libxslt)))
- branch core-updates updated (12d8adb -> 3440fec), guix-commits, 2020/01/23
- 01/10: gnu: glib: Remove redundant input., guix-commits, 2020/01/23
- 02/10: gnu: glib: Update to 2.62.4., guix-commits, 2020/01/23
- 04/10: gnu: yelp-xsl: Update to 3.34.2., guix-commits, 2020/01/23
- 07/10: gnu: shared-mime-info: Update to 1.15., guix-commits, 2020/01/23
- 03/10: gnu: glibmm: Update to 2.62.0., guix-commits, 2020/01/23
- 05/10: gnu: yelp-tools: Update to 3.32.2., guix-commits, 2020/01/23
- 06/10: gnu: vala: Update to 0.46.5., guix-commits, 2020/01/23
- 09/10: gnu: gcr: Update to 3.34.0.,
guix-commits <=
- 08/10: gnu: gnome-calculator: Update to 3.34.1., guix-commits, 2020/01/23
- 10/10: gnu: nvi: Fix build with glibc 2.30., guix-commits, 2020/01/23