~ruther/guix-local

9322b4d30de1a4cdd04b77275d10bcfdc11eda32 — Jack Hill 4 years ago cdb0e04
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>
3 files changed, 43 insertions(+), 1 deletions(-)

M gnu/local.mk
M gnu/packages/gnome.scm
A gnu/packages/patches/gnome-screenshot-meson-0.60.patch
M gnu/local.mk => gnu/local.mk +1 -0
@@ 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		\

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +3 -1
@@ 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

A gnu/packages/patches/gnome-screenshot-meson-0.60.patch => gnu/packages/patches/gnome-screenshot-meson-0.60.patch +39 -0
@@ 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