summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-01-21 16:46:03 +0000
committerSam James <sam@gentoo.org>2022-01-21 16:46:03 +0000
commit1c77b4a64254da0b7dc1da5ec008049011788ab6 (patch)
tree3d13bef7c31a1c84f994035da134d6fce1911704 /media-gfx/gnome-screenshot
parentapp-emacs/lean-mode: new package; add version 20211220 (diff)
downloadgentoo-1c77b4a64254da0b7dc1da5ec008049011788ab6.tar.gz
gentoo-1c77b4a64254da0b7dc1da5ec008049011788ab6.tar.bz2
gentoo-1c77b4a64254da0b7dc1da5ec008049011788ab6.zip
media-gfx/gnome-screenshot: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831745 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/gnome-screenshot')
-rw-r--r--media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch30
-rw-r--r--media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild4
2 files changed, 33 insertions, 1 deletions
diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..3d06a0e70388
--- /dev/null
+++ b/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/gnome-screenshot/-/commit/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch
+https://bugs.gentoo.org/831745
+
+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
+--- 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'),
+GitLab
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
index 2ae3882d508d..9c0e2fba9bbf 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -36,6 +36,8 @@ PATCHES=(
# Fix HiDPI handling in X11 fallback
# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/128
"${FILESDIR}"/${PN}-40.0-fix-hidpi.patch
+
+ "${FILESDIR}"/${P}-fix-meson-0.61-build.patch
)
DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to