diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-04-26 20:39:07 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-04-26 20:52:33 +0200 |
| commit | d38bdca344fc3ffbde34b8efa37c7dedcebae46a (patch) | |
| tree | 1a4e70138f7a2d181d48d35e0e8e34fd1d635c41 /gnu | |
| parent | d7e489d6e06a9eb6015c47df8085d7762397d849 (diff) | |
| download | guix-d38bdca344fc3ffbde34b8efa37c7dedcebae46a.tar.gz guix-d38bdca344fc3ffbde34b8efa37c7dedcebae46a.zip | |
gnu: gitg: Fix build.
* gnu/packages/patches/gitg-fix-positional-argument.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/gnome.scm (gitg)[source]<patches>: Use it here.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/gitg-fix-positional-argument.patch | 36 |
3 files changed, 39 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 77c334341d..6ba3c2a422 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1220,6 +1220,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ + %D%/packages/patches/gitg-fix-positional-argument.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e31931dbdb..7aa7180f5e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11888,7 +11888,8 @@ higher level porcelain stuff.") name "-" version ".tar.xz")) (sha256 (base32 - "0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz")))) + "0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz")) + (patches (search-patches "gitg-fix-positional-argument.patch")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/patches/gitg-fix-positional-argument.patch b/gnu/packages/patches/gitg-fix-positional-argument.patch new file mode 100644 index 0000000000..1d3513921c --- /dev/null +++ b/gnu/packages/patches/gitg-fix-positional-argument.patch @@ -0,0 +1,36 @@ +From 1978973b12848741b08695ec2020bac98584d636 Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Mon, 24 Jan 2022 12:17:52 +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:8:0: ERROR: Function does not take positional arguments. +data/meson.build:44: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 a8b90fd1..2413531d 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,6 @@ desktop_config = configuration_data() + desktop_config.set('icon', application_id) + desktop_config.set('binary', gitg_name) + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: desktop + '.in.in', +@@ -42,7 +41,6 @@ appdata_config = configuration_data() + appdata_config.set('app-id', application_id) + appdata_config.set('gettext', gitg_name) + i18n.merge_file( +- appdata, + type: 'xml', + input: configure_file( + input: appdata + '.in.in', +-- +GitLab + |