diff options
| author | Jack Hill <jackhill@jackhill.us> | 2021-11-18 01:26:10 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-18 09:53:16 +0100 |
| commit | 9322b4d30de1a4cdd04b77275d10bcfdc11eda32 (patch) | |
| tree | 714f00e02797ce5d45ec189d05b3f9faa08adc3b /gnu | |
| parent | cdb0e04a76109f22738fdae3fe60917ac83c2253 (diff) | |
| download | guix-9322b4d30de1a4cdd04b77275d10bcfdc11eda32.tar.gz | |
gnu: gnome-screenshot: Fix build with Meson 0.60.0.
* gnu/packages/patches/gnome-screenshot-meson-0.60.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (gnome-screenshot)[patches]: New field. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/gnome-screenshot-meson-0.60.patch | 39 |
3 files changed, 43 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index e710766eda..dde9c99a1f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1164,6 +1164,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ + %D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-shell-disable-test.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8677a6849d..f07ff28701 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9212,7 +9212,9 @@ can add your own files to the collection.") name "-" version ".tar.xz")) (sha256 (base32 - "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n")))) + "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n")) + (patches + (search-patches "gnome-screenshot-meson-0.60.patch")))) (build-system meson-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/gnome-screenshot-meson-0.60.patch b/gnu/packages/patches/gnome-screenshot-meson-0.60.patch new file mode 100644 index 0000000000..c80ce9d6a3 --- /dev/null +++ b/gnu/packages/patches/gnome-screenshot-meson-0.60.patch @@ -0,0 +1,39 @@ +Fixes build issue with Meson 0.60.0. Taken from upstream +https://gitlab.gnome.org/GNOME/gnome-screenshot/-/merge_requests/57 + +From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001 +From: Jack Hill <jackhill@jackhill.us> +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'), +-- +2.33.1 + |