181/181: gnu: gnome-screenshot: Remove meson patch.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 1d7402c4ed8b44044252882af0670cfeef02a7a1
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Sep 13 02:00:42 2022 -0400

    gnu: gnome-screenshot: Remove meson patch.
    
    * gnu/packages/gnome.scm (gnome-screenshot)
    [source]: Delete patches field.
    * gnu/packages/patches/gnome-screenshot-meson-0.60.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): De-register it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/gnome.scm                             |  4 +--
 .../patches/gnome-screenshot-meson-0.60.patch      | 39 ----------------------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 58742b1cc6..c9a7cb7489 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1209,7 +1209,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/gnash-fix-giflib-version.patch          \
   %D%/packages/patches/gnome-control-center-libexecdir.patch   \
   %D%/packages/patches/gnome-online-miners-tracker-3.patch     \
-  %D%/packages/patches/gnome-screenshot-meson-0.60.patch       \
   %D%/packages/patches/gnome-settings-daemon-gc.patch          \
   %D%/packages/patches/gnome-session-support-elogind.patch     \
   %D%/packages/patches/gnome-todo-libportal.patch              \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a482880195..d6d22f8eb1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9685,9 +9685,7 @@ can add your own files to the collection.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "15wmikwk62cdi93gas77nqh4fbhlrxrncyfmcd1gfa34jbn7vnsa"))
-       (patches
-        (search-patches "gnome-screenshot-meson-0.60.patch"))))
+         "15wmikwk62cdi93gas77nqh4fbhlrxrncyfmcd1gfa34jbn7vnsa"))))
     (build-system meson-build-system)
     (arguments
      '(#:glib-or-gtk? #t
diff --git a/gnu/packages/patches/gnome-screenshot-meson-0.60.patch 
b/gnu/packages/patches/gnome-screenshot-meson-0.60.patch
deleted file mode 100644
index c80ce9d6a3..0000000000
--- a/gnu/packages/patches/gnome-screenshot-meson-0.60.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-