[bug#63584] [PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.

[bug#63584] [PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.

[Zhu Zihao]

Fix the build error:

data/meson.build:15:0: ERROR: Function does not take positional arguments.
data/meson.build:27:0: ERROR: Function does not take positional arguments.

* gnu/packages/patches/d-feet-drop-unused-meson-argument.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add new entry.
* gnu/packages/gnome.scm (d-feet)[source]: Apply the patch.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gnome.scm                        | 19 +++++-----
 .../d-feet-drop-unused-meson-argument.patch   | 36 +++++++++++++++++++
 3 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/d-feet-drop-unused-meson-argument.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d31b40f3bf..f44192b28f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1033,6 +1033,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/cvs-CVE-2017-12836.patch		\
   %D%/packages/patches/c++-gsl-find-system-gtest.patch		\
   %D%/packages/patches/c++-gsl-move-array-bounds-tests.patch	\
+  %D%/packages/patches/d-feet-drop-unused-meson-argument.patch	\
   %D%/packages/patches/date-output-pkg-config-files.patch	\
   %D%/packages/patches/datefudge-gettimeofday.patch		\
   %D%/packages/patches/dbacl-include-locale.h.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 754bb668ba..5a0259d5ab 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -74,6 +74,7 @@
 ;;; Copyright © 2022 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -7190,14 +7191,16 @@ (define-public d-feet
   (package
     (name "d-feet")
     (version "0.3.16")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1jqw5ndpgyb0zxh0g21ai1911lfrm56vz18xbccfqm4sk95wwcw7"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1jqw5ndpgyb0zxh0g21ai1911lfrm56vz18xbccfqm4sk95wwcw7"))
+       (patches (search-patches "d-feet-drop-unused-meson-argument.patch"))))
     (build-system meson-build-system)
     (arguments
      (list
diff --git a/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch b/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch
new file mode 100644
index 0000000000..5d728d7d60
--- /dev/null
+++ b/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch
@@ -0,0 +1,36 @@
+From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:11:57 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:27:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 026bd80..3b03b94 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
-- 
2.39.2

[bug#63584] Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.)

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

ping.

And this should close https://issues.guix.gnu.org/63270

-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[bug#63584] Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.)

[Liliana Marie Prikler]

Am Montag, dem 29.05.2023 um 23:02 +0800 schrieb Zhu Zihao:
> ping.
> 
> And this should close https://issues.guix.gnu.org/63270
Note that you mentioned the wrong thread there, but anyway: the patch
mixes functional and non-functional changes, which I think should be
kept separate.  If I count my columns correctly, you can do with -1/+2
on gnu/packages/gnome.scm

Cheers 

[bug#63584] Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.)

[Zhu Zihao]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]


Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Note that you mentioned the wrong thread there, but anyway: the patch
> mixes functional and non-functional changes, which I think should be
> kept separate.  If I count my columns correctly, you can do with -1/+2
> on gnu/packages/gnome.scm

Do you mean I should not change the indentation here?

-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[bug#63584] Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.)

[Liliana Marie Prikler]

Am Mittwoch, dem 31.05.2023 um 12:05 +0800 schrieb Zhu Zihao:
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Note that you mentioned the wrong thread there, but anyway: the
> > patch mixes functional and non-functional changes, which I think
> > should be kept separate.  If I count my columns correctly, you can
> > do with -1/+2 on gnu/packages/gnome.scm
> 
> Do you mean I should not change the indentation here?
Exactly.  If you wish to apply `guix style' or similar formatting, I
recommend a follow-up commit.

Cheers

[bug#63584] Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.)

[Zhu Zihao]

[-- Attachment #1.1: Type: text/plain, Size: 187 bytes --]


Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Exactly.  If you wish to apply `guix style' or similar formatting, I
> recommend a follow-up commit.

Done it with -1/+3 :)


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[-- Attachment #2: 0001-gnu-d-feet-Fix-the-build-error-when-using-Meson-1.1..patch --]
[-- Type: text/x-patch, Size: 3806 bytes --]

From 954ffef03e1637048b537f704f05d78b823b5806 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 19 May 2023 19:51:41 +0800
Subject: [PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.

Fix the build error:

data/meson.build:15:0: ERROR: Function does not take positional arguments.
data/meson.build:27:0: ERROR: Function does not take positional arguments.

* gnu/packages/patches/d-feet-drop-unused-meson-argument.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add new entry.
* gnu/packages/gnome.scm (d-feet)[source]: Apply the patch.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gnome.scm                        |  5 ++-
 .../d-feet-drop-unused-meson-argument.patch   | 36 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/d-feet-drop-unused-meson-argument.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 18e8235140..68dfc21df1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1034,6 +1034,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/cvs-CVE-2017-12836.patch		\
   %D%/packages/patches/c++-gsl-find-system-gtest.patch		\
   %D%/packages/patches/c++-gsl-move-array-bounds-tests.patch	\
+  %D%/packages/patches/d-feet-drop-unused-meson-argument.patch	\
   %D%/packages/patches/date-output-pkg-config-files.patch	\
   %D%/packages/patches/datefudge-gettimeofday.patch		\
   %D%/packages/patches/dbacl-include-locale.h.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7df18f055f..516c9f98d3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -76,6 +76,7 @@
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
 ;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
+;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -7199,7 +7200,9 @@ (define-public d-feet
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1jqw5ndpgyb0zxh0g21ai1911lfrm56vz18xbccfqm4sk95wwcw7"))))
+                "1jqw5ndpgyb0zxh0g21ai1911lfrm56vz18xbccfqm4sk95wwcw7"))
+              (patches
+               (search-patches "d-feet-drop-unused-meson-argument.patch"))))
     (build-system meson-build-system)
     (arguments
      (list
diff --git a/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch b/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch
new file mode 100644
index 0000000000..5d728d7d60
--- /dev/null
+++ b/gnu/packages/patches/d-feet-drop-unused-meson-argument.patch
@@ -0,0 +1,36 @@
+From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:11:57 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:27:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 026bd80..3b03b94 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
-- 
2.39.2


[-- Attachment #3: Type: text/plain, Size: 101 bytes --]



-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

bug#63584: Acknowledgement ([PATCH] gnu: d-feet: Fix the build error when using Meson 1.1.0.)

[Liliana Marie Prikler]

Am Donnerstag, dem 01.06.2023 um 21:27 +0800 schrieb Zhu Zihao:
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Exactly.  If you wish to apply `guix style' or similar formatting,
> > I recommend a follow-up commit.
> 
> Done it with -1/+3 :)
+4 due to copyright, but good enough for me.

Thanks