| 1 |
commit: b02e1593d0916e5657fb7e1d3bf34a90b8f34f03 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 03:09:26 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 03:09:26 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02e1593 |
| 7 |
|
| 8 |
app-text/zathura: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831468 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/zathura-0.4.8-meson-0.61-build.patch | 27 ++++++++++++++++++++++ |
| 14 |
app-text/zathura/zathura-0.4.8.ebuild | 6 ++++- |
| 15 |
2 files changed, 32 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..577eddc4da1f |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch |
| 22 |
@@ -0,0 +1,27 @@ |
| 23 |
+https://github.com/pwmt/zathura/commit/c6ec5044c5ff843979050bfb81742d14740bb656.patch |
| 24 |
+https://bugs.gentoo.org/831468 |
| 25 |
+ |
| 26 |
+From: Sebastian Ramacher <sebastian@××××××××.at> |
| 27 |
+Date: Sat, 30 Oct 2021 15:41:25 +0200 |
| 28 |
+Subject: [PATCH] Fix build with meson 0.60 |
| 29 |
+ |
| 30 |
+--- a/data/meson.build |
| 31 |
++++ b/data/meson.build |
| 32 |
+@@ -19,7 +19,7 @@ endif |
| 33 |
+ i18n = import('i18n') |
| 34 |
+ podir = join_paths(meson.project_source_root(), 'po') |
| 35 |
+ |
| 36 |
+-desktop = i18n.merge_file('desktop', |
| 37 |
++desktop = i18n.merge_file( |
| 38 |
+ input: 'org.pwmt.zathura.desktop.in', |
| 39 |
+ output: 'org.pwmt.zathura.desktop', |
| 40 |
+ install: true, |
| 41 |
+@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop', |
| 42 |
+ type: 'desktop' |
| 43 |
+ ) |
| 44 |
+ |
| 45 |
+-appdata = i18n.merge_file('appdata', |
| 46 |
++appdata = i18n.merge_file( |
| 47 |
+ input: 'org.pwmt.zathura.appdata.xml.in', |
| 48 |
+ output: 'org.pwmt.zathura.appdata.xml', |
| 49 |
+ install: true, |
| 50 |
|
| 51 |
diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild |
| 52 |
index 0de2aed7939f..83b02ddfd08f 100644 |
| 53 |
--- a/app-text/zathura/zathura-0.4.8.ebuild |
| 54 |
+++ b/app-text/zathura/zathura-0.4.8.ebuild |
| 55 |
@@ -1,4 +1,4 @@ |
| 56 |
-# Copyright 1999-2021 Gentoo Authors |
| 57 |
+# Copyright 1999-2022 Gentoo Authors |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
EAPI=7 |
| 61 |
@@ -40,6 +40,10 @@ BDEPEND="doc? ( dev-python/sphinx ) |
| 62 |
dev-libs/check ) |
| 63 |
virtual/pkgconfig" |
| 64 |
|
| 65 |
+PATCHES=( |
| 66 |
+ "${FILESDIR}"/${P}-meson-0.61-build.patch |
| 67 |
+) |
| 68 |
+ |
| 69 |
src_configure() { |
| 70 |
local emesonargs=( |
| 71 |
-Dconvert-icon=disabled |
Archives