commit: 6d4df77edc2de627a3a85e4b6df79886c30519cb Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Sun Feb 20 18:04:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 20 21:12:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4df77e
app-office/gnome-todo: fix build with meson 0.61 Let's fix the build problem so we at least have the option to unmask meson-0.61 without needing a more recent gnome-todo [1] Also scrubbed the existing patch. [1] https://bugs.gentoo.org/833804#c1 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Closes: https://bugs.gentoo.org/832136 Closes: https://github.com/gentoo/gentoo/pull/24287 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/fix-build-with-meson-0.61.patch | 29 ++++++++++++++++++++++ .../files/gnome-todo-eds-libecal-2.0.patch | 10 -------- app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild | 3 ++- 3 files changed, 31 insertions(+), 11 deletions(-) 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 new file mode 100644 index 000000000000..5dabf1b9dddc --- /dev/null +++ b/app-office/gnome-todo/files/fix-build-with-meson-0.61.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/832136 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata = 'org.gnome.Todo.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + desktop = 'org.gnome.Todo.desktop' + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -13,7 +12,6 @@ i18n.merge_file( + autostart = 'org.gnome.Todo.Autostart.desktop' + + i18n.merge_file( +- autostart, + type: 'desktop', + input: autostart + '.in', + output: autostart, 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 index df4151b8fc3e..ddf35636352c 100644 --- 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 @@ -1,8 +1,6 @@ Taken from Fedora from https://src.fedoraproject.org/rpms/gnome-todo/raw/master/f/gnome-todo-eds-libecal-2.0.patch -diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h -index eb9b011..78bd944 100644 --- a/plugins/eds/gtd-eds-autoptr.h +++ b/plugins/eds/gtd-eds-autoptr.h @@ -23,6 +23,5 @@ @@ -13,8 +11,6 @@ index eb9b011..78bd944 100644 +G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free); G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref); -G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref); -diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c -index a403226..def4235 100644 --- a/plugins/eds/gtd-provider-eds.c +++ b/plugins/eds/gtd-provider-eds.c @@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider, @@ -46,8 +42,6 @@ index a403226..def4235 100644 NULL, (GAsyncReadyCallback) on_task_removed_cb, provider); -diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c -index 2c8cd8e..bd8f7ac 100644 --- a/plugins/eds/gtd-task-eds.c +++ b/plugins/eds/gtd-task-eds.c @@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS]; @@ -484,8 +478,6 @@ index 2c8cd8e..bd8f7ac 100644 } -diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c -index eb48a73..5b71718 100644 --- a/plugins/eds/gtd-task-list-eds.c +++ b/plugins/eds/gtd-task-list-eds.c @@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self, @@ -552,8 +544,6 @@ index eb48a73..5b71718 100644 if (!task) continue; -diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build -index ea84426..b37f0c6 100644 --- a/plugins/eds/meson.build +++ b/plugins/eds/meson.build @@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types'] 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 index 7a8b9d674579..038776ea1954 100644 --- a/app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild +++ b/app-office/gnome-todo/gnome-todo-3.28.1-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 @@ -34,6 +34,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/gnome-todo-eds-libecal-2.0.patch + "${FILESDIR}"/fix-build-with-meson-0.61.patch ) src_configure() {
