ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 04:29:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gnome-screenshot: Remove meson patch.

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2022-09-13 02:00:42 -04:00
parent 51ea0a7958
commit 1d7402c4ed
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -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 \

4
gnu/packages/gnome.scm
View file

@ -9685,9 +9685,7 @@ (define-public gnome-screenshot
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

39
gnu/packages/patches/gnome-screenshot-meson-0.60.patch
View file

@ -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