summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lermytte <gentoo@lermytte.be>2022-02-21 12:49:05 +0100
committerSam James <sam@gentoo.org>2022-02-21 23:16:40 +0000
commit5ca2382369b7715be3cee1cd7885b9dcf7e879e7 (patch)
treeaa9f36f16fc1a191952d2c76c6ec63bcc4d0117d /gnome-extra/gnome-documents
parentprofiles: drop libxslt mask (diff)
downloadgentoo-5ca2382369b7715be3cee1cd7885b9dcf7e879e7.tar.gz
gentoo-5ca2382369b7715be3cee1cd7885b9dcf7e879e7.tar.bz2
gentoo-5ca2382369b7715be3cee1cd7885b9dcf7e879e7.zip
gnome-extra/gnome-documents: fix build with meson-0.61
Upstream looks abandoned, fixing in-tree. Signed-off-by: Christophe Lermytte <gentoo@lermytte.be> Closes: https://bugs.gentoo.org/833843 Closes: https://github.com/gentoo/gentoo/pull/24296 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-extra/gnome-documents')
-rw-r--r--gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch19
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild6
2 files changed, 24 insertions, 1 deletions
diff --git a/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 000000000000..2a3a5cd3d3e3
--- /dev/null
+++ b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/833843
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+ appdata = app + '.appdata.xml'
+
+ appdata_file = i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+ desktop = app + '.desktop'
+
+ desktop_file = i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
index 3b571baadadb..5245d0f95f9d 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -49,6 +49,10 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/fix-build-with-meson-0.61.patch
+)
+
src_configure() {
local emesonargs=(
-Ddocumentation=true #manpage