ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcr: Update to 3.34.0.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2020-01-23 23:27:45 +01:00
parent 4cb09502f2
commit 1de804da52
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/gnome.scm
View file

@ -1316,7 +1316,7 @@ (define-public gnome-font-viewer
(define-public gcr (define-public gcr
(package (package
(name "gcr") (name "gcr")
(version "3.28.1") (version "3.34.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -1324,20 +1324,7 @@ (define-public gcr
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m")) "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"))))
(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")))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -1346,9 +1333,9 @@ (define-public gcr
;; build environment. ;; build environment.
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
(substitute* "gcr/test-system-prompt.c" (substitute* "Makefile.in"
(("g_test_add") "//") (("[[:blank:]]+test-system-prompt\\$\\(EXEEXT\\)")
(("return.*") "return 0;")) ""))
#t)) #t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
@ -1360,11 +1347,11 @@ (define-public gcr
("gnupg" ,gnupg) ;called as a child process during tests ("gnupg" ,gnupg) ;called as a child process during tests
("libgcrypt" ,libgcrypt))) ("libgcrypt" ,libgcrypt)))
(native-inputs (native-inputs
`(("python" ,python-2) ;for tests `(("python" ,python-wrapper) ;for tests
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
("glib" ,glib "bin") ("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("vala" ,vala) ("vala" ,vala)
("xsltproc" ,libxslt))) ("xsltproc" ,libxslt)))