GNU bug report logs - #72923
[PATCH 0/2] Fix gitg

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72923 in the body.
You can then email your comments to 72923 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Fix gitg
Date: Sun, 1 Sep 2024 02:02:25 +0200

Hi Guix

This is a quick series that fixes the gitg build on master.
I'm not quite sure how we should deal with newer Meson versions
(last time we had a graft for 1.2, but I think a public package
*could* be fine – let me know what you think).

Cheers

Liliana Marie Prikler (2):
  gnu: Add meson-1.5.
  gnu: gitg: Fix build.

 gnu/packages/build-tools.scm | 13 +++++++++++++
 gnu/packages/gnome.scm       |  2 ++
 2 files changed, 15 insertions(+)


base-commit: 19e0b937857563e77841a4fc5433589fa98c810d
prerequisite-patch-id: ce1c559ff080d2a116e5fefd876cb1b32570f977
-- 
2.45.2

Message #8 received at 72923 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 72923 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Add meson-1.5.
Date: Sun, 1 Sep 2024 02:00:11 +0200

* gnu/packages/build-tools.scm (meson-1.5): New variable.
---
 gnu/packages/build-tools.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index d6a788e21c..21df25e4f5 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -329,6 +329,19 @@ (define-public meson
 resembles Python.")
     (license license:asl2.0)))
 
+(define-public meson-1.5
+  (package
+    (inherit meson)
+    (version "1.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/mesonbuild/meson/"
+                                  "releases/download/" version  "/meson-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1vab706pw1q17vh9rbsmlirgiji3k6wljl735lxffp95vwx56zjn"))))))
+
 (define-public meson-python
   (package
     (name "meson-python")
-- 
2.45.2

Message #11 received at 72923 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 72923 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: gitg: Fix build.
Date: Sun, 1 Sep 2024 02:00:33 +0200

* gnu/packages/gnome.scm (gitg)[arguments]<#:meson>: Use meson-1.5.
<#:build-type>: Set to “release”.
---
 gnu/packages/gnome.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 53e5a8f3ea..5e7f27fe69 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12353,7 +12353,9 @@ (define-public gitg
     (build-system meson-build-system)
     (arguments
      (list
+      #:meson meson-1.5                 ; XXX: breaks with Meson 1.2
       #:glib-or-gtk? #t
+      #:build-type "release"            ; don't look at -Wformat…
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'disable-post-install-partially
-- 
2.45.2

Message #14 received at 72923 <at> debbugs.gnu.org (full text, mbox):

From: Ian Eure <ian <at> retrospec.tv>
To: 72923 <at> debbugs.gnu.org
Subject: Re: 72923 <at> debbugs.gnu.org
Date: Sun, 01 Sep 2024 09:31:06 -0700

This looks good to me.

Thanks,

 — Ian

Message #17 received at 72923 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Stevenson <tomfunnyguy1234 <at> gmail.com>
To: 72923 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Ian Eure <ian <at> retrospec.tv>
Subject: Re: [PATCH 0/2] Fix gitg
Date: Mon, 2 Sep 2024 06:36:17 +0000

Hi,


> This looks good to me.
>
> Thanks,
>

> — Ian

Looks good to me too. I think having a separate variable is more 
appropriate in this situation, as build systems are one of those things 
that can realistically just stay pinned at certain versions upstream 
indefinitely. A graft would indicate a more temporary situation.

Btw, I've built it and it works :)

Warmly,

Ada

Message #20 received at 72923 <at> debbugs.gnu.org (full text, mbox):

From: Ada Stevenson <adanskana <at> gmail.com>
To: control <at> debbugs.gnu.org, 72923 <at> debbugs.gnu.org
Subject: QA review for 72923
Date: Fri, 6 Sep 2024 07:12:45 +0000

user guix
usertag 72923 + reviewed-looks-good
thanks

Guix QA review form submission:


Items marked as checked: Lint warnings, Package builds, Commit messages

Message #25 received at 72923-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 72923-done <at> debbugs.gnu.org
Subject: Re: [PATCH 2/2] gnu: gitg: Fix build.
Date: Sun, 08 Sep 2024 16:02:05 +0200

Am Sonntag, dem 01.09.2024 um 02:00 +0200 schrieb Liliana Marie
Prikler:
> * gnu/packages/gnome.scm (gitg)[arguments]<#:meson>: Use meson-1.5.
> <#:build-type>: Set to “release”.
> ---
I pushed this some while ago, so let's mark it as done.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.