1 |
commit: 38229adac7d9e6b52828f83a5cc3ac6761c9a93e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 25 01:58:55 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 01:58:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38229ada |
7 |
|
8 |
app-misc/bijiben: fix build with meson 0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831929 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
app-misc/bijiben/bijiben-40.1.ebuild | 6 +++- |
14 |
.../bijiben/files/bijiben-40.1-meson-0.61.patch | 38 ++++++++++++++++++++++ |
15 |
2 files changed, 43 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1.ebuild |
18 |
index d0fada65c229..261b6eea5d78 100644 |
19 |
--- a/app-misc/bijiben/bijiben-40.1.ebuild |
20 |
+++ b/app-misc/bijiben/bijiben-40.1.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2021 Gentoo Authors |
23 |
+# Copyright 1999-2022 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=7 |
27 |
@@ -36,6 +36,10 @@ BDEPEND=" |
28 |
virtual/pkgconfig |
29 |
" |
30 |
|
31 |
+PATCHES=( |
32 |
+ "${FILESDIR}"/${PN}-40.1-meson-0.61.patch |
33 |
+) |
34 |
+ |
35 |
src_configure() { |
36 |
local emesonargs=( |
37 |
-Dupdate_mimedb=false |
38 |
|
39 |
diff --git a/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch |
40 |
new file mode 100644 |
41 |
index 000000000000..63584fc81464 |
42 |
--- /dev/null |
43 |
+++ b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch |
44 |
@@ -0,0 +1,38 @@ |
45 |
+https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/158.patch |
46 |
+https://bugs.gentoo.org/831929 |
47 |
+ |
48 |
+From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001 |
49 |
+From: Michal Vasilek <michal@×××××××.cz> |
50 |
+Date: Sat, 22 Jan 2022 23:16:37 +0100 |
51 |
+Subject: [PATCH] meson: fix build with meson 0.61 |
52 |
+ |
53 |
+i18n.merge_file doesn't accept positional arguments |
54 |
+--- a/data/appdata/meson.build |
55 |
++++ b/data/appdata/meson.build |
56 |
+@@ -1,7 +1,6 @@ |
57 |
+ info = 'org.gnome.Notes.appdata.xml' |
58 |
+ |
59 |
+ i18n.merge_file( |
60 |
+- info, |
61 |
+ input: info + '.in', |
62 |
+ output: info, |
63 |
+ po_dir: po_dir, |
64 |
+--- a/data/meson.build |
65 |
++++ b/data/meson.build |
66 |
+@@ -4,7 +4,6 @@ subdir('appdata') |
67 |
+ mime = 'org.gnome.Notes.xml' |
68 |
+ |
69 |
+ i18n.merge_file( |
70 |
+- mime, |
71 |
+ input: mime + '.in', |
72 |
+ output: mime, |
73 |
+ po_dir: po_dir, |
74 |
+@@ -18,7 +17,6 @@ desktop_conf = configuration_data() |
75 |
+ desktop_conf.set ('icon', application_id) |
76 |
+ |
77 |
+ i18n.merge_file( |
78 |
+- desktop, |
79 |
+ type: 'desktop', |
80 |
+ input: configure_file( |
81 |
+ input: files (desktop + '.in'), |
82 |
+GitLab |