1 |
commit: 6d4df77edc2de627a3a85e4b6df79886c30519cb |
2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
3 |
AuthorDate: Sun Feb 20 18:04:26 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 20 21:12:39 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4df77e |
7 |
|
8 |
app-office/gnome-todo: fix build with meson 0.61 |
9 |
|
10 |
Let's fix the build problem so we at least have the |
11 |
option to unmask meson-0.61 without needing a more |
12 |
recent gnome-todo [1] |
13 |
|
14 |
Also scrubbed the existing patch. |
15 |
|
16 |
[1] https://bugs.gentoo.org/833804#c1 |
17 |
|
18 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
19 |
Closes: https://bugs.gentoo.org/832136 |
20 |
Closes: https://github.com/gentoo/gentoo/pull/24287 |
21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
22 |
|
23 |
.../files/fix-build-with-meson-0.61.patch | 29 ++++++++++++++++++++++ |
24 |
.../files/gnome-todo-eds-libecal-2.0.patch | 10 -------- |
25 |
app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild | 3 ++- |
26 |
3 files changed, 31 insertions(+), 11 deletions(-) |
27 |
|
28 |
diff --git a/app-office/gnome-todo/files/fix-build-with-meson-0.61.patch b/app-office/gnome-todo/files/fix-build-with-meson-0.61.patch |
29 |
new file mode 100644 |
30 |
index 000000000000..5dabf1b9dddc |
31 |
--- /dev/null |
32 |
+++ b/app-office/gnome-todo/files/fix-build-with-meson-0.61.patch |
33 |
@@ -0,0 +1,29 @@ |
34 |
+https://bugs.gentoo.org/832136 |
35 |
+--- a/data/appdata/meson.build |
36 |
++++ b/data/appdata/meson.build |
37 |
+@@ -1,7 +1,6 @@ |
38 |
+ appdata = 'org.gnome.Todo.appdata.xml' |
39 |
+ |
40 |
+ i18n.merge_file( |
41 |
+- appdata, |
42 |
+ input: appdata + '.in', |
43 |
+ output: appdata, |
44 |
+ po_dir: po_dir, |
45 |
+--- a/data/meson.build |
46 |
++++ b/data/meson.build |
47 |
+@@ -1,7 +1,6 @@ |
48 |
+ desktop = 'org.gnome.Todo.desktop' |
49 |
+ |
50 |
+ i18n.merge_file( |
51 |
+- desktop, |
52 |
+ type: 'desktop', |
53 |
+ input: desktop + '.in', |
54 |
+ output: desktop, |
55 |
+@@ -13,7 +12,6 @@ i18n.merge_file( |
56 |
+ autostart = 'org.gnome.Todo.Autostart.desktop' |
57 |
+ |
58 |
+ i18n.merge_file( |
59 |
+- autostart, |
60 |
+ type: 'desktop', |
61 |
+ input: autostart + '.in', |
62 |
+ output: autostart, |
63 |
|
64 |
diff --git a/app-office/gnome-todo/files/gnome-todo-eds-libecal-2.0.patch b/app-office/gnome-todo/files/gnome-todo-eds-libecal-2.0.patch |
65 |
index df4151b8fc3e..ddf35636352c 100644 |
66 |
--- a/app-office/gnome-todo/files/gnome-todo-eds-libecal-2.0.patch |
67 |
+++ b/app-office/gnome-todo/files/gnome-todo-eds-libecal-2.0.patch |
68 |
@@ -1,8 +1,6 @@ |
69 |
Taken from Fedora from |
70 |
https://src.fedoraproject.org/rpms/gnome-todo/raw/master/f/gnome-todo-eds-libecal-2.0.patch |
71 |
|
72 |
-diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h |
73 |
-index eb9b011..78bd944 100644 |
74 |
--- a/plugins/eds/gtd-eds-autoptr.h |
75 |
+++ b/plugins/eds/gtd-eds-autoptr.h |
76 |
@@ -23,6 +23,5 @@ |
77 |
@@ -13,8 +11,6 @@ index eb9b011..78bd944 100644 |
78 |
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free); |
79 |
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref); |
80 |
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref); |
81 |
-diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c |
82 |
-index a403226..def4235 100644 |
83 |
--- a/plugins/eds/gtd-provider-eds.c |
84 |
+++ b/plugins/eds/gtd-provider-eds.c |
85 |
@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider, |
86 |
@@ -46,8 +42,6 @@ index a403226..def4235 100644 |
87 |
NULL, |
88 |
(GAsyncReadyCallback) on_task_removed_cb, |
89 |
provider); |
90 |
-diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c |
91 |
-index 2c8cd8e..bd8f7ac 100644 |
92 |
--- a/plugins/eds/gtd-task-eds.c |
93 |
+++ b/plugins/eds/gtd-task-eds.c |
94 |
@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS]; |
95 |
@@ -484,8 +478,6 @@ index 2c8cd8e..bd8f7ac 100644 |
96 |
} |
97 |
|
98 |
|
99 |
-diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c |
100 |
-index eb48a73..5b71718 100644 |
101 |
--- a/plugins/eds/gtd-task-list-eds.c |
102 |
+++ b/plugins/eds/gtd-task-list-eds.c |
103 |
@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self, |
104 |
@@ -552,8 +544,6 @@ index eb48a73..5b71718 100644 |
105 |
|
106 |
if (!task) |
107 |
continue; |
108 |
-diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build |
109 |
-index ea84426..b37f0c6 100644 |
110 |
--- a/plugins/eds/meson.build |
111 |
+++ b/plugins/eds/meson.build |
112 |
@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types'] |
113 |
|
114 |
diff --git a/app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild b/app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild |
115 |
index 7a8b9d674579..038776ea1954 100644 |
116 |
--- a/app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild |
117 |
+++ b/app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild |
118 |
@@ -1,4 +1,4 @@ |
119 |
-# Copyright 1999-2020 Gentoo Authors |
120 |
+# Copyright 1999-2022 Gentoo Authors |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
|
123 |
EAPI=6 |
124 |
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND} |
125 |
|
126 |
PATCHES=( |
127 |
"${FILESDIR}"/gnome-todo-eds-libecal-2.0.patch |
128 |
+ "${FILESDIR}"/fix-build-with-meson-0.61.patch |
129 |
) |
130 |
|
131 |
src_configure() { |