GNU bug report logs - #68150
[PATCH 0/8] Fix usage of glib-or-gtk-build-system

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 68150 in the body.
You can then email your comments to 68150 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: Tomas Volf <~@wolfsden.cz>
To: guix-patches <at> gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 0/8] Fix usage of glib-or-gtk-build-system
Date: Sat, 30 Dec 2023 17:33:36 +0100

Using glib-or-gtk-build-system requires hard-coding the list of modules in
 #:modules.  Libreoffice and netsurf tried to use
%glib-or-gtk-build-system-modules instead, but that lead to crashes.

This series introduces new %glib-or-gtk-build-system-default-modules that
contains the list that should go into #:modules.  Using it in libreoffice and
netsurf fixes the mentioned crashes.  Other places were adjusted as well to
use it instead of copying over the list.  That would be hard to keep in sync.

Tomas Volf (8):
  build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules.
  gnu: netsurf: Actually use glib-or-gtk-build-system.
  gnu: libreoffice: Actually use glib-or-gtk-build-system.
  gnu: sugar: Dehardcode #:modules.
  gnu: sugar-datastore: Dehardcode #:modules.
  gnu: sugar-toolkit-gtk3: Dehardcode #:modules.
  gnu: nimf: Dehardcode #:modules.
  gnu: hime: Dehardcode #:modules.

 gnu/packages/language.scm         | 12 ++++--------
 gnu/packages/libreoffice.scm      |  2 +-
 gnu/packages/sugar.scm            | 15 ++++++---------
 gnu/packages/web.scm              |  2 +-
 guix/build-system/glib-or-gtk.scm |  9 +++++----
 5 files changed, 17 insertions(+), 23 deletions(-)


base-commit: f24b14767d362a84e6469682b4fe303b50f4b589
--
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system.
Date: Sat, 30 Dec 2023 17:38:36 +0100

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,
despite the name, should go into #:imported-modules.  When put into #:modules,
it leads to following warning:

    WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

    `((guix build glib-or-gtk-build-system)
      ,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively
turning glib-or-gtk-build-system with #:modules set to
%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of
 #:modules (%glib-or-gtk-build-system-default-modules) as a base of the
 #:modules.

* gnu/packages/web.scm (netsurf)[arguments]<#:modules>: Use
%glib-or-gtk-build-system-default-modules instead of
%glib-or-gtk-build-system-modules.

Change-Id: Iacc4df7e213dbdae5a783e3aedde7e6e20402025
---
 gnu/packages/web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 67f59ca9f9..df476e7ccd 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5927,7 +5927,7 @@ (define-public netsurf
                   (ice-9 match)
                   (srfi srfi-1)
                   (sxml simple)
-                  ,@%glib-or-gtk-build-system-modules)
+                  ,@%glib-or-gtk-build-system-default-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 1/8] build: glib-or-gtk: Export
 %glib-or-gtk-build-system-default-modules.
Date: Sat, 30 Dec 2023 17:38:35 +0100

The list of modules used by default was not public, so users of this build
system had to pick between copy&pasting the list, or using
%glib-or-gtk-build-system-modules.  The former is sub-optimal, since it is
hard to keep it in sync.  The latter is just wrong and leads to basically
fall-backing to gnu-build-system.

The solution is to export the default list giving the users option to use it
directly.

* guix/build-system/glib-or-gtk.scm
(%glib-or-gtk-build-system-default-modules): Renamed from %default-modules.
(define-module): Export it.
(glib-or-gtk-build), (glib-or-gtk-cross-build): Use it.

Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d
---
 guix/build-system/glib-or-gtk.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index 726d19efad..38a6eeb178 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -30,7 +30,8 @@ (define-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
-  #:export (%glib-or-gtk-build-system-modules
+  #:export (%glib-or-gtk-build-system-default-modules
+            %glib-or-gtk-build-system-modules
             glib-or-gtk-build
             glib-or-gtk-cross-build
             glib-or-gtk-build-system)
@@ -64,7 +65,7 @@ (define-module (guix build-system glib-or-gtk)
 ;;
 ;; Code:
 
-(define %default-modules
+(define %glib-or-gtk-build-system-default-modules
   ;; Build-side modules made available in the build environment.
   '((guix build glib-or-gtk-build-system)
     (guix build utils)))
@@ -144,7 +145,7 @@ (define* (glib-or-gtk-build name inputs
                             (glib-or-gtk-wrap-excluded-outputs ''())
                             (system (%current-system))
                             (imported-modules %glib-or-gtk-build-system-modules)
-                            (modules %default-modules)
+                            (modules %glib-or-gtk-build-system-default-modules)
                             allowed-references
                             disallowed-references)
   "Build SOURCE with INPUTS.  See GNU-BUILD for more details."
@@ -219,7 +220,7 @@ (define* (glib-or-gtk-cross-build name
                                   (system (%current-system))
                                   (build (nix-system->gnu-triplet system))
                                   (imported-modules %glib-or-gtk-build-system-modules)
-                                  (modules %default-modules)
+                                  (modules %glib-or-gtk-build-system-default-modules)
                                   allowed-references
                                   disallowed-references)
   "Cross-build SOURCE with INPUTS.  See GNU-BUILD for more details."
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 4/8] gnu: sugar: Dehardcode #:modules.
Date: Sat, 30 Dec 2023 17:38:38 +0100

* gnu/packages/sugar.scm (sugar)[arguments]<#:modules>: Replace the hardcoded
list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5a98d356c3e1a32b71e7949e3425da74081c1e82
---
 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 4a0de1b55a..30f78c5576 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -70,9 +70,8 @@ (define-public sugar
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-build-system
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 5/8] gnu: sugar-datastore: Dehardcode #:modules.
Date: Sat, 30 Dec 2023 17:38:39 +0100

* gnu/packages/sugar.scm (sugar-datastore)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I9ceadd163d3f6cd49ed2623b6060b223257e9aed
---
 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 30f78c5576..8a79509de2 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -252,9 +252,8 @@ (define-public sugar-datastore
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       '(modify-phases %standard-phases
          (add-after 'unpack 'patch-build-system
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules.
Date: Sat, 30 Dec 2023 17:38:40 +0100

* gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]<#:modules>: Replace
the hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I6a5e4511d2e696a673f7d5b49f75285ee488223d
---
 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 8a79509de2..6df07d5cc2 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -320,9 +320,8 @@ (define-public sugar-toolkit-gtk3
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-build-system
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system.
Date: Sat, 30 Dec 2023 17:38:37 +0100

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,
despite the name, should go into #:imported-modules.  When put into #:modules,
it leads to following warning:

    WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

    `((guix build glib-or-gtk-build-system)
      ,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively
turning glib-or-gtk-build-system with #:modules set to
%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of
 #:modules (%glib-or-gtk-build-system-default-modules) as a base of the
 #:modules.

* gnu/packages/libreoffice.scm (libreoffice)[arguments]<#:modules>: Use
%glib-or-gtk-build-system-default-modules instead of
%glib-or-gtk-build-system-modules.

Change-Id: I5304d9993af7d5f1187c6276e72a269aa60f5666
---
 gnu/packages/libreoffice.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 79b30cecaf..6368dbf5bb 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -915,7 +915,7 @@ (define-public libreoffice
                            ,@%glib-or-gtk-build-system-modules)
       #:modules `(((guix build python-build-system) #:select (python-version))
                   (ice-9 textual-ports)
-                  ,@%glib-or-gtk-build-system-modules)
+                  ,@%glib-or-gtk-build-system-default-modules)
       #:tests? #f                       ; Building the tests already fails.
       #:phases
       #~(modify-phases %standard-phases
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 8/8] gnu: hime: Dehardcode #:modules.
Date: Sat, 30 Dec 2023 17:38:42 +0100

* gnu/packages/language.scm (hime)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5360c0000173b293e9e24290a2e8eaed84e05750
---
 gnu/packages/language.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 30af9e33f5..4e64324af1 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -218,10 +218,8 @@ (define-public hime
         (guix build qt-build-system)
         (guix build qt-utils))
        #:modules
-       ((guix build glib-or-gtk-build-system)
-        ((guix build qt-build-system)
-         #:prefix qt:)
-        (guix build utils))
+       (((guix build qt-build-system) #:prefix qt:)
+        ,@%glib-or-gtk-build-system-default-modules)
        #:configure-flags
        (list
         ;; FIXME
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH 7/8] gnu: nimf: Dehardcode #:modules.
Date: Sat, 30 Dec 2023 17:38:41 +0100

* gnu/packages/language.scm (nimf)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5eaaac4cdd50b635d24b10c7fa2d365dcf392498
---
 gnu/packages/language.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index db78425ec9..30af9e33f5 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -99,10 +99,8 @@ (define-public nimf
                            (guix build cmake-build-system)
                            (guix build qt-build-system)
                            (guix build qt-utils))
-      #:modules '((guix build glib-or-gtk-build-system)
-                  ((guix build qt-build-system)
-                   #:prefix qt:)
-                  (guix build utils))
+      #:modules `(((guix build qt-build-system) #:prefix qt:)
+                  ,@%glib-or-gtk-build-system-default-modules)
       #:configure-flags
       #~(list "--with-im-config-data"
               "--with-imsettings-data"
-- 
2.41.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system.
Date: Sun,  6 Oct 2024 19:00:25 +0200

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,
despite the name, should go into #:imported-modules.  When put into #:modules,
it leads to following warning:

    WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

    `((guix build glib-or-gtk-build-system)
      ,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively
turning glib-or-gtk-build-system with #:modules set to
%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of
 #:modules (%glib-or-gtk-build-system-default-modules) as a base of the
 #:modules.

* gnu/packages/web.scm (netsurf)[arguments]<#:modules>: Use
%glib-or-gtk-build-system-default-modules instead of
%glib-or-gtk-build-system-modules.

Change-Id: Iacc4df7e213dbdae5a783e3aedde7e6e20402025
---
Rebase on latest master.

 gnu/packages/web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 552abf83c5..0ed88c11cf 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6265,7 +6265,7 @@ (define-public netsurf
                   (ice-9 match)
                   (srfi srfi-1)
                   (sxml simple)
-                  ,@%glib-or-gtk-build-system-modules)
+                  ,@%glib-or-gtk-build-system-default-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
--
2.46.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 3/8] gnu: libreoffice: Actually use
 glib-or-gtk-build-system.
Date: Sun,  6 Oct 2024 19:00:26 +0200

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,
despite the name, should go into #:imported-modules.  When put into #:modules,
it leads to following warning:

    WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

    `((guix build glib-or-gtk-build-system)
      ,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively
turning glib-or-gtk-build-system with #:modules set to
%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of
 #:modules (%glib-or-gtk-build-system-default-modules) as a base of the
 #:modules.

* gnu/packages/libreoffice.scm (libreoffice)[arguments]<#:modules>: Use
%glib-or-gtk-build-system-default-modules instead of
%glib-or-gtk-build-system-modules.

Change-Id: I5304d9993af7d5f1187c6276e72a269aa60f5666
---
Rebase on latest master.

 gnu/packages/libreoffice.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ed8dfd432b..2acbddaa3b 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -908,7 +908,7 @@ (define-public libreoffice
                            ,@%glib-or-gtk-build-system-modules)
       #:modules `(((guix build python-build-system) #:select (python-version))
                   (ice-9 textual-ports)
-                  ,@%glib-or-gtk-build-system-modules)
+                  ,@%glib-or-gtk-build-system-default-modules)
       #:tests? #f                       ; Building the tests already fails.
       #:phases
       #~(modify-phases %standard-phases
--
2.46.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 4/8] gnu: sugar: Dehardcode #:modules.
Date: Sun,  6 Oct 2024 19:00:27 +0200

* gnu/packages/sugar.scm (sugar)[arguments]<#:modules>: Replace the hardcoded
list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5a98d356c3e1a32b71e7949e3425da74081c1e82
---
Rebase on latest master.

 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 77008bc078..e9cfd1a21a 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -74,9 +74,8 @@ (define-public sugar
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-build-system
--
2.46.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 5/8] gnu: sugar-datastore: Dehardcode #:modules.
Date: Sun,  6 Oct 2024 19:00:28 +0200

* gnu/packages/sugar.scm (sugar-datastore)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I9ceadd163d3f6cd49ed2623b6060b223257e9aed
---
Rebase on latest master.

 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index e9cfd1a21a..1a353f6f3c 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -251,9 +251,8 @@ (define-public sugar-datastore
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       '(modify-phases %standard-phases
          (add-after 'unpack 'patch-build-system
--
2.46.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 1/8] build: glib-or-gtk: Export
 %glib-or-gtk-build-system-default-modules.
Date: Sun,  6 Oct 2024 19:00:24 +0200

The list of modules used by default was not public, so users of this build
system had to pick between copy&pasting the list, or using
%glib-or-gtk-build-system-modules.  The former is sub-optimal, since it is
hard to keep it in sync.  The latter is just wrong and leads to basically
fall-backing to gnu-build-system.

The solution is to export the default list giving the users option to use it
directly.

* guix/build-system/glib-or-gtk.scm
(%glib-or-gtk-build-system-default-modules): Renamed from %default-modules.
(define-module): Export it.
(glib-or-gtk-build), (glib-or-gtk-cross-build): Use it.

Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d
---
Rebase on latest master.

 guix/build-system/glib-or-gtk.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index 5d026ec5ab..6c69a950e8 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -30,7 +30,8 @@ (define-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
-  #:export (%glib-or-gtk-build-system-modules
+  #:export (%glib-or-gtk-build-system-default-modules
+            %glib-or-gtk-build-system-modules
             glib-or-gtk-build
             glib-or-gtk-cross-build
             glib-or-gtk-build-system)
@@ -64,7 +65,7 @@ (define-module (guix build-system glib-or-gtk)
 ;;
 ;; Code:

-(define %default-modules
+(define %glib-or-gtk-build-system-default-modules
   ;; Build-side modules made available in the build environment.
   '((guix build glib-or-gtk-build-system)
     (guix build utils)))
@@ -144,7 +145,7 @@ (define* (glib-or-gtk-build name inputs
                             (glib-or-gtk-wrap-excluded-outputs ''())
                             (system (%current-system))
                             (imported-modules %glib-or-gtk-build-system-modules)
-                            (modules %default-modules)
+                            (modules %glib-or-gtk-build-system-default-modules)
                             allowed-references
                             disallowed-references)
   "Build SOURCE with INPUTS.  See GNU-BUILD for more details."
@@ -219,7 +220,7 @@ (define* (glib-or-gtk-cross-build name
                                   (system (%current-system))
                                   (build (nix-system->gnu-triplet system))
                                   (imported-modules %glib-or-gtk-build-system-modules)
-                                  (modules %default-modules)
+                                  (modules %glib-or-gtk-build-system-default-modules)
                                   allowed-references
                                   disallowed-references)
   "Cross-build SOURCE with INPUTS.  See GNU-BUILD for more details."
--
2.46.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules.
Date: Sun,  6 Oct 2024 19:00:29 +0200

* gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]<#:modules>: Replace
the hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I6a5e4511d2e696a673f7d5b49f75285ee488223d
---
Rebase on latest master.

 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 1a353f6f3c..10893a1dfd 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -320,9 +320,8 @@ (define-public sugar-toolkit-gtk3
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-build-system
--
2.46.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 8/8] gnu: hime: Dehardcode #:modules.
Date: Sun,  6 Oct 2024 19:00:31 +0200

* gnu/packages/language.scm (hime)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5360c0000173b293e9e24290a2e8eaed84e05750
---
Rebase on latest master.

 gnu/packages/language.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 2d522f6877..fb8d090fa3 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -218,10 +218,8 @@ (define-public hime
         (guix build qt-build-system)
         (guix build qt-utils))
        #:modules
-       ((guix build glib-or-gtk-build-system)
-        ((guix build qt-build-system)
-         #:prefix qt:)
-        (guix build utils))
+       (((guix build qt-build-system) #:prefix qt:)
+        ,@%glib-or-gtk-build-system-default-modules)
        #:configure-flags
        (list
         ;; FIXME
--
2.46.0

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

From: Tomas Volf <~@wolfsden.cz>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v2 7/8] gnu: nimf: Dehardcode #:modules.
Date: Sun,  6 Oct 2024 19:00:30 +0200

* gnu/packages/language.scm (nimf)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5eaaac4cdd50b635d24b10c7fa2d365dcf392498
---
Rebase on latest master.

 gnu/packages/language.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 7a3deb0b43..2d522f6877 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -99,10 +99,8 @@ (define-public nimf
                            (guix build cmake-build-system)
                            (guix build qt-build-system)
                            (guix build qt-utils))
-      #:modules '((guix build glib-or-gtk-build-system)
-                  ((guix build qt-build-system)
-                   #:prefix qt:)
-                  (guix build utils))
+      #:modules `(((guix build qt-build-system) #:prefix qt:)
+                  ,@%glib-or-gtk-build-system-default-modules)
       #:configure-flags
       #~(list "--with-im-config-data"
               "--with-imsettings-data"
--
2.46.0

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH v3 0/8] Fix usage of glib-or-gtk-build-system
Date: Fri, 24 Jan 2025 12:48:20 +0100

This is a rebased version of the patch series by Tomas Volf.

Using glib-or-gtk-build-system requires hard-coding the list of modules in
 #:modules.  Libreoffice and netsurf tried to use
%glib-or-gtk-build-system-modules instead, but that lead to crashes.

This series introduces new %glib-or-gtk-build-system-default-modules that
contains the list that should go into #:modules.  Using it in libreoffice and
netsurf fixes the mentioned crashes.  Other places were adjusted as well to
use it instead of copying over the list.  That would be hard to keep in sync.

Tomas Volf (8):
  build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules.
  gnu: netsurf: Actually use glib-or-gtk-build-system.
  gnu: libreoffice: Actually use glib-or-gtk-build-system.
  gnu: sugar: Dehardcode #:modules.
  gnu: sugar-datastore: Dehardcode #:modules.
  gnu: sugar-toolkit-gtk3: Dehardcode #:modules.
  gnu: nimf: Dehardcode #:modules.
  gnu: hime: Dehardcode #:modules.

 gnu/packages/language.scm         | 12 ++++--------
 gnu/packages/libreoffice.scm      |  2 +-
 gnu/packages/sugar.scm            | 15 ++++++---------
 gnu/packages/web.scm              |  2 +-
 guix/build-system/glib-or-gtk.scm |  9 +++++----
 5 files changed, 17 insertions(+), 23 deletions(-)

-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 1/8] build: glib-or-gtk: Export
 %glib-or-gtk-build-system-default-modules.
Date: Fri, 24 Jan 2025 12:48:21 +0100

From: Tomas Volf <~@wolfsden.cz>

The list of modules used by default was not public, so users of this build
system had to pick between copy&pasting the list, or using
%glib-or-gtk-build-system-modules.  The former is sub-optimal, since it is
hard to keep it in sync.  The latter is just wrong and leads to basically
fall-backing to gnu-build-system.

The solution is to export the default list giving the users option to use it
directly.

* guix/build-system/glib-or-gtk.scm
(%glib-or-gtk-build-system-default-modules): Renamed from %default-modules.
(define-module): Export it.
(glib-or-gtk-build), (glib-or-gtk-cross-build): Use it.

Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d
---
 guix/build-system/glib-or-gtk.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index 5d026ec5ab..6c69a950e8 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -30,7 +30,8 @@ (define-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
-  #:export (%glib-or-gtk-build-system-modules
+  #:export (%glib-or-gtk-build-system-default-modules
+            %glib-or-gtk-build-system-modules
             glib-or-gtk-build
             glib-or-gtk-cross-build
             glib-or-gtk-build-system)
@@ -64,7 +65,7 @@ (define-module (guix build-system glib-or-gtk)
 ;;
 ;; Code:
 
-(define %default-modules
+(define %glib-or-gtk-build-system-default-modules
   ;; Build-side modules made available in the build environment.
   '((guix build glib-or-gtk-build-system)
     (guix build utils)))
@@ -144,7 +145,7 @@ (define* (glib-or-gtk-build name inputs
                             (glib-or-gtk-wrap-excluded-outputs ''())
                             (system (%current-system))
                             (imported-modules %glib-or-gtk-build-system-modules)
-                            (modules %default-modules)
+                            (modules %glib-or-gtk-build-system-default-modules)
                             allowed-references
                             disallowed-references)
   "Build SOURCE with INPUTS.  See GNU-BUILD for more details."
@@ -219,7 +220,7 @@ (define* (glib-or-gtk-cross-build name
                                   (system (%current-system))
                                   (build (nix-system->gnu-triplet system))
                                   (imported-modules %glib-or-gtk-build-system-modules)
-                                  (modules %default-modules)
+                                  (modules %glib-or-gtk-build-system-default-modules)
                                   allowed-references
                                   disallowed-references)
   "Cross-build SOURCE with INPUTS.  See GNU-BUILD for more details."
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system.
Date: Fri, 24 Jan 2025 12:48:22 +0100

From: Tomas Volf <~@wolfsden.cz>

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,
despite the name, should go into #:imported-modules.  When put into #:modules,
it leads to following warning:

    WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

    `((guix build glib-or-gtk-build-system)
      ,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively
turning glib-or-gtk-build-system with #:modules set to
%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of
 #:modules (%glib-or-gtk-build-system-default-modules) as a base of the
 #:modules.

* gnu/packages/web.scm (netsurf)[arguments]<#:modules>: Use
%glib-or-gtk-build-system-default-modules instead of
%glib-or-gtk-build-system-modules.

Change-Id: Iacc4df7e213dbdae5a783e3aedde7e6e20402025
---
 gnu/packages/web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b781c13b62..58384a193f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6344,7 +6344,7 @@ (define-public netsurf
                   (ice-9 match)
                   (srfi srfi-1)
                   (sxml simple)
-                  ,@%glib-or-gtk-build-system-modules)
+                  ,@%glib-or-gtk-build-system-default-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 3/8] gnu: libreoffice: Actually use
 glib-or-gtk-build-system.
Date: Fri, 24 Jan 2025 12:48:23 +0100

From: Tomas Volf <~@wolfsden.cz>

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,
despite the name, should go into #:imported-modules.  When put into #:modules,
it leads to following warning:

    WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

    `((guix build glib-or-gtk-build-system)
      ,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively
turning glib-or-gtk-build-system with #:modules set to
%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of
 #:modules (%glib-or-gtk-build-system-default-modules) as a base of the
 #:modules.

* gnu/packages/libreoffice.scm (libreoffice)[arguments]<#:modules>: Use
%glib-or-gtk-build-system-default-modules instead of
%glib-or-gtk-build-system-modules.

Change-Id: I5304d9993af7d5f1187c6276e72a269aa60f5666
---
 gnu/packages/libreoffice.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 22112ccee7..e61ed11143 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -916,7 +916,7 @@ (define-public libreoffice
                   (ice-9 textual-ports)
                   (srfi srfi-1)
                   (srfi srfi-26)
-                  ,@%glib-or-gtk-build-system-modules)
+                  ,@%glib-or-gtk-build-system-default-modules)
       #:tests? #f                       ; Building the tests already fails.
       #:phases
       #~(modify-phases %standard-phases
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 4/8] gnu: sugar: Dehardcode #:modules.
Date: Fri, 24 Jan 2025 12:48:24 +0100

From: Tomas Volf <~@wolfsden.cz>

* gnu/packages/sugar.scm (sugar)[arguments]<#:modules>: Replace the hardcoded
list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5a98d356c3e1a32b71e7949e3425da74081c1e82
---
 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 9a82b5fb20..e53d8404e6 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -74,9 +74,8 @@ (define-public sugar
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-build-system
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules.
Date: Fri, 24 Jan 2025 12:48:26 +0100

From: Tomas Volf <~@wolfsden.cz>

* gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]<#:modules>: Replace
the hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I6a5e4511d2e696a673f7d5b49f75285ee488223d
---
 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index c66ca1692a..2bf1377b66 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -320,9 +320,8 @@ (define-public sugar-toolkit-gtk3
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-build-system
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 7/8] gnu: nimf: Dehardcode #:modules.
Date: Fri, 24 Jan 2025 12:48:27 +0100

From: Tomas Volf <~@wolfsden.cz>

* gnu/packages/language.scm (nimf)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5eaaac4cdd50b635d24b10c7fa2d365dcf392498
---
 gnu/packages/language.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 6facc27174..cc76164f41 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -108,10 +108,8 @@ (define-public nimf
                            (guix build cmake-build-system)
                            (guix build qt-build-system)
                            (guix build qt-utils))
-      #:modules '((guix build glib-or-gtk-build-system)
-                  ((guix build qt-build-system)
-                   #:prefix qt:)
-                  (guix build utils))
+      #:modules `(((guix build qt-build-system) #:prefix qt:)
+                  ,@%glib-or-gtk-build-system-default-modules)
       #:configure-flags
       #~(list "--with-im-config-data"
               "--with-imsettings-data"
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 8/8] gnu: hime: Dehardcode #:modules.
Date: Fri, 24 Jan 2025 12:48:28 +0100

From: Tomas Volf <~@wolfsden.cz>

* gnu/packages/language.scm (hime)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5360c0000173b293e9e24290a2e8eaed84e05750
---
 gnu/packages/language.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index cc76164f41..1d45c7e180 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -227,10 +227,8 @@ (define-public hime
         (guix build qt-build-system)
         (guix build qt-utils))
        #:modules
-       ((guix build glib-or-gtk-build-system)
-        ((guix build qt-build-system)
-         #:prefix qt:)
-        (guix build utils))
+       (((guix build qt-build-system) #:prefix qt:)
+        ,@%glib-or-gtk-build-system-default-modules)
        #:configure-flags
        (list
         ;; FIXME
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH v3 5/8] gnu: sugar-datastore: Dehardcode #:modules.
Date: Fri, 24 Jan 2025 12:48:25 +0100

From: Tomas Volf <~@wolfsden.cz>

* gnu/packages/sugar.scm (sugar-datastore)[arguments]<#:modules>: Replace the
hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I9ceadd163d3f6cd49ed2623b6060b223257e9aed
---
 gnu/packages/sugar.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index e53d8404e6..c66ca1692a 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -251,9 +251,8 @@ (define-public sugar-datastore
       `(,@%glib-or-gtk-build-system-modules
         (guix build python-build-system))
       #:modules
-      '((guix build glib-or-gtk-build-system)
-        ((guix build python-build-system) #:prefix python:)
-        (guix build utils))
+      `(((guix build python-build-system) #:prefix python:)
+        ,@%glib-or-gtk-build-system-default-modules)
       #:phases
       '(modify-phases %standard-phases
          (add-after 'unpack 'patch-build-system
-- 
2.47.1

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 68150 <at> debbugs.gnu.org
Subject: [PATCH v3 9/8] gnu: libreoffice: Update to 24.8.4.2.
Date: Fri, 24 Jan 2025 14:35:37 +0100

* gnu/packages/libreoffice.scm (libreoffice): Update to 24.8.4.2.

This patch is to complement #68150, if we're rebuilding libreoffice,
let's update it too.
---
 gnu/packages/libreoffice.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index e61ed11143..4ca0857b01 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "24.8.3.2")               ;keep in sync with hunspell dictionaries
+    (version "24.8.4.2")               ;keep in sync with hunspell dictionaries
     (source
      (origin
        (method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
           "https://downloadarchive.documentfoundation.org/libreoffice/old/"
           version "/src/libreoffice-" version ".tar.xz")))
        (sha256
-        (base32 "1sa7bxxh7v26p77vj1mspynhn2l2b1vnz1mpyczhnmcxcan9nw2x"))))
+        (base32 "05qs12z0xkpqy3yl7378d99y82rswic101aw65k1macslcpdwr0m"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      (list
--
2.47.1



--
Best regards,
Nicolas Graves

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: control <at> debbugs.gnu.org,68150 <at> debbugs.gnu.org
Subject: QA review for 68150
Date: Sat, 25 Jan 2025 10:21:46 +0100

user guix
usertag 68150 + reviewed-looks-good
thanks

Guix QA review form submission:
Tested, makes
guix shell --pure libreoffice -- libreoffice
work properly (fixes reopened #30642)

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

-- 
Best regards,
Nicolas Graves

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

From: Andreas Enge <andreas <at> enge.fr>
To: 68150-done <at> debbugs.gnu.org
Subject: Close
Date: Mon, 17 Feb 2025 13:20:33 +0100

Thanks for the review, which has allowed me to push the patch series in
a field where I do not feel competent. And thanks for the patch, of
course, I hope it solves the problem in #30642.

Andreas

Previous Next

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