diff mbox series

[bug#52490,WIP] gnu: gitg: Fix compilation.

Message ID ce25f82aead8bc9e79538a6cf78e0c23f0cb3372.camel@gmail.com
State Accepted
Headers show
Series [bug#52490,WIP] gnu: gitg: Fix compilation. | expand

Commit Message

Liliana Marie Prikler Dec. 14, 2021, 9:01 p.m. UTC 
* gnu/packages/gnome.scm (gitg)[#:meson]: Use meson-0.59.
[#tests?] Disable.
[inputs]: Use libsoup-minimal-2.
[native-inputs]: Add xorg-server-for-tests.
---
Hi ladies,

as of the core-updates-frozen merge, gitg fails to build on master.
The package below still runs on GNOME 3 as before the merge, but tests
now fail with no clear reason as to why; I tried spawing an Xvfb, but to
no avail.  Help welcome.

Cheers

 gnu/packages/gnome.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Liliana Marie Prikler Dec. 15, 2021, 7:43 p.m. UTC | #1 
Nvm, I found a solution and pushed it.
diff mbox series

Patch

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5f46eb4d63..767d983285 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11294,7 +11294,11 @@  (define-public gitg
                 "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59
+       #:glib-or-gtk? #t
+       ;; XXX: assertion 'GDK_IS_SCREEN (screen)' failed
+       ;; XXX: assertion 'datetime != NULL' failed
+       #:tests? #f
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'disable-post-install-partially
@@ -11328,7 +11332,7 @@  (define-public gitg
            libgit2-glib
            libpeas
            libsecret
-           libsoup
+           libsoup-minimal-2
            libxml2))
     (native-inputs
      `(("glib:bin" ,glib "bin")
@@ -11336,7 +11340,8 @@  (define-public gitg
        ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
-       ("vala" ,vala)))
+       ("vala" ,vala)
+       ("xorg-server" ,xorg-server-for-tests)))
     (synopsis "Graphical user interface for git")
     (description
      "gitg is a graphical user interface for git.  It aims at being a small,