gentoo resync : 20.03.2022

4 files changed, 34 insertions, 13 deletions

diff --git a/app-office/gnome-todo/Manifest b/app-office/gnome-todo/Manifest
index 7290f3359dc4..5248fa1de81d 100644
--- a/app-office/gnome-todo/Manifest
+++ b/app-office/gnome-todo/Manifest
@@ -1,4 +1,5 @@
-AUX gnome-todo-eds-libecal-2.0.patch 19127 BLAKE2B 4f3ce175fafdbef502415fc713fc916ccbb1b08b11cb2b3055d8e3f056c511fe21fee0c4885b5333086496b996647473a1e27500bc0da91928d0e0a1d0e654cf SHA512 d1d106b685afb379577deaf618519507c4dece6335326e744ee448ff1bf2201016107408dfd7c994d3b4c92eaddd5f0385bff08342474c75b1eca6d60a6a5701
+AUX fix-build-with-meson-0.61.patch 632 BLAKE2B 03d85c1ff1c5d6eaa180f9e299423c43bdb397d6eef14aab5ce14af825f0e2e7c037c7288ff6cd864c49db2142f964f02b605d7ef8be9c14a3f8c08fe8fc2597 SHA512 f956cbe4b26219f5c2860b4085797ae2b090a916cd9450eeb6d18be7f78434fd8bdbccdf923a4ef133d73ae0003faf6709c8f759347247ab71d23005f5be4b01
+AUX gnome-todo-eds-libecal-2.0.patch 18614 BLAKE2B 7754300bfe27317ddb5242b35f394a50a57f6d0b019dbcc7de35614f05d8a5be272f93d40b9b990bdcf912c34160caed05e99a7faa15818bffaaacebbd628ab5 SHA512 f04a34472ba2f38734086bb31a12d8493ec6ddd2bb2bc0ef2c1e9274fefa8faec51014f478d8d09bbf4bb5cafbdc1d170393b7a50ecfa22e26d5bed497a6183b
 DIST gnome-todo-3.28.1.tar.xz 751448 BLAKE2B 55c4909d35e65a763bd283e55b85dc3a6dc0190c39f3f97c33bde7c071abd8e7a88479ed72733e66bd550133bb683ed9cafb9dff36f41b4f7d6bcb9f889f2a39 SHA512 26371dd2a460656b5b7d323420cfdc3f26c548cabe0bf6a01081a017d68e062fb54164f6d0c5cf5054b59f30be65681dedde450d9b98b88f73c07131cd01f57a
-EBUILD gnome-todo-3.28.1-r1.ebuild 1612 BLAKE2B ed0721f8df08cf2dbfbaaec3210369b77b018fe9ccad74a99515bccbbd4b8fc1849c699c4438a297903f215e805afa15011552ebeb0be48fa3e0a4650fddd12f SHA512 cd357e5e6f281bbbcb0b06a14e8d860f9cc989c1b70df078a56e18d62eea248938594a0ceaa20be7f5bec7f21f5e2a7d4a3fec0fa7e33339e93dcfcb6fe940b9
+EBUILD gnome-todo-3.28.1-r1.ebuild 1659 BLAKE2B 9be551988d966133dc1f6768871517c994a90d36432ab41f9d6897b53475ca2284ec97d29f1a5c1a5a64552c032db999aa8f2c966f84e9444efb5e12a76722fd SHA512 39097c89666f616e550bdbf6dc271d0476eb45e4336d615123c040ce8e627abc952b0603bd0a751aff2f03a5ed3eb379c637b40b4271d59a8e3c07e6ecdf64fd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
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() {