ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gitg: Fix compilation.

Browse source 
* gnu/packages/gnome.scm (gitg)[#:meson]: Use meson-0.59.
[#:phases] Add ‘harden’ phase to fix test failures.
[inputs]: Use libsoup-minimal-2.
This commit is contained in:
Liliana Marie Prikler 2021-12-14 22:01:48 +01:00
parent 3eadcdc63e
commit 6454884027
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/gnome.scm
View file

@ -11294,7 +11294,8 @@ (define-public gitg
"0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-post-install-partially
@ -11309,6 +11310,19 @@ (define-public gitg
(substitute* "tests/libgitg/test-commit.vala"
(("/bin/bash") (which "bash")))
#t))
;; XXX: Remove upon next version bump
(add-after 'unpack 'harden
(lambda _
;; See <https://gitlab.gnome.org/GNOME/gitg/-/issues/337>
(substitute* "libgitg/gitg-date.vala"
(("(val\|tzs) == null" all val)
(string-append val " == null || " val " == \"\""))
(("(val\|tzs) != null" all val)
(string-append val " != null && " val " != \"\"")))
;; See <https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/159>
(substitute* "gitg/gitg-action-support.vala"
(("stash_if_needed\\((.*), Gitg.Ref head" all other)
(string-append "stash_if_needed(" other ", Gitg.Ref? head")))))
(add-after 'glib-or-gtk-wrap 'wrap-typelib
(lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
@ -11328,7 +11342,7 @@ (define-public gitg
libgit2-glib
libpeas
libsecret
libsoup
libsoup-minimal-2
libxml2))
(native-inputs
`(("glib:bin" ,glib "bin")