From 219c716dcf0e31fa2eaef0d24fb13fc690f0be59 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Fri, 28 Jul 2023 14:25:26 +0200 Subject: geary: update 43.0 -> 44.0 - remove unneeded patches Signed-off-by: Khem Raj --- ...missing-type-arguments-for-interfaces-to-.patch | 59 -------- ...a-unit-Fix-non-null-build-with-newer-vala.patch | 156 --------------------- .../recipes-connectivity/geary/geary_43.0.bb | 63 --------- .../recipes-connectivity/geary/geary_44.0.bb | 61 ++++++++ 4 files changed, 61 insertions(+), 278 deletions(-) delete mode 100644 meta-gnome/recipes-connectivity/geary/geary/0001-client-Add-missing-type-arguments-for-interfaces-to-.patch delete mode 100644 meta-gnome/recipes-connectivity/geary/geary/0001-vala-unit-Fix-non-null-build-with-newer-vala.patch delete mode 100644 meta-gnome/recipes-connectivity/geary/geary_43.0.bb create mode 100644 meta-gnome/recipes-connectivity/geary/geary_44.0.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-client-Add-missing-type-arguments-for-interfaces-to-.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-client-Add-missing-type-arguments-for-interfaces-to-.patch deleted file mode 100644 index e5f0cb434d..0000000000 --- a/meta-gnome/recipes-connectivity/geary/geary/0001-client-Add-missing-type-arguments-for-interfaces-to-.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 19dddc4b8acaeefc505e1b45f53048901839aede Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Sat, 8 Apr 2023 13:06:50 +0200 -Subject: [PATCH] client: Add missing type-arguments for interfaces to fix build with newer vala - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c] -Signed-off-by: Khem Raj ---- - src/client/accounts/accounts-editor-row.vala | 2 +- - src/client/accounts/accounts-editor-servers-pane.vala | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/client/accounts/accounts-editor-row.vala b/src/client/accounts/accounts-editor-row.vala -index 6e7ac2ab..70223d71 100644 ---- a/src/client/accounts/accounts-editor-row.vala -+++ b/src/client/accounts/accounts-editor-row.vala -@@ -386,7 +386,7 @@ private abstract class Accounts.ServiceRow : AccountRow - - - /** Interface for rows that use a validator for editable values. */ --internal interface Accounts.ValidatingRow : EditorRow { -+internal interface Accounts.ValidatingRow : EditorRow { - - - /** The row's validator */ -diff --git a/src/client/accounts/accounts-editor-servers-pane.vala b/src/client/accounts/accounts-editor-servers-pane.vala -index 8bd9bde1..982acd5c 100644 ---- a/src/client/accounts/accounts-editor-servers-pane.vala -+++ b/src/client/accounts/accounts-editor-servers-pane.vala -@@ -694,7 +694,7 @@ private class Accounts.SaveSentRow : - - - private class Accounts.ServiceHostRow : -- ServiceRow, ValidatingRow { -+ ServiceRow, ValidatingRow { - - - public Components.Validator validator { -@@ -848,7 +848,7 @@ private class Accounts.ServiceSecurityRow : - - - private class Accounts.ServiceLoginRow : -- ServiceRow, ValidatingRow { -+ ServiceRow, ValidatingRow { - - - public Components.Validator validator { -@@ -972,7 +972,7 @@ private class Accounts.ServiceLoginRow : - - - private class Accounts.ServicePasswordRow : -- ServiceRow, ValidatingRow { -+ ServiceRow, ValidatingRow { - - - public Components.Validator validator { --- -2.41.0 - diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-vala-unit-Fix-non-null-build-with-newer-vala.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-vala-unit-Fix-non-null-build-with-newer-vala.patch deleted file mode 100644 index 11ed6ae3a5..0000000000 --- a/meta-gnome/recipes-connectivity/geary/geary/0001-vala-unit-Fix-non-null-build-with-newer-vala.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 116aead44e01e046f83931574980991df66f69c3 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Fri, 14 Apr 2023 09:42:23 +0200 -Subject: [PATCH] vala-unit: Fix non-null build with newer vala - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/10f9c133a2ad515127d65f3bba13a0d91b75f4af] -Signed-off-by: Khem Raj ---- - .../vala-unit/src/collection-assertions.vala | 12 ++++++------ - subprojects/vala-unit/src/mock-object.vala | 6 +++--- - subprojects/vala-unit/src/test-assertions.vala | 18 +++++++++--------- - 3 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/subprojects/vala-unit/src/collection-assertions.vala b/subprojects/vala-unit/src/collection-assertions.vala -index 3b34acda..29223a0d 100644 ---- a/subprojects/vala-unit/src/collection-assertions.vala -+++ b/subprojects/vala-unit/src/collection-assertions.vala -@@ -256,7 +256,7 @@ internal class ValaUnit.ArrayCollectionAssertion : GLib.Object, - - public CollectionAssertions contains(E expected) - throws GLib.Error { -- E boxed_expected = box_value(expected); -+ E? boxed_expected = box_value(expected); - bool found = false; - for (int i = 0; i < this.actual.length; i++) { - try { -@@ -281,7 +281,7 @@ internal class ValaUnit.ArrayCollectionAssertion : GLib.Object, - - public CollectionAssertions not_contains(E expected) - throws GLib.Error { -- E boxed_expected = box_value(expected); -+ E? boxed_expected = box_value(expected); - for (int i = 0; i < this.actual.length; i++) { - try { - assert_equal(box_value(this.actual[i]), boxed_expected); -@@ -312,8 +312,8 @@ internal class ValaUnit.ArrayCollectionAssertion : GLib.Object, - this.context - ); - } -- E boxed_actual = box_value(this.actual[index]); -- E boxed_expected = box_value(expected); -+ E? boxed_actual = box_value(this.actual[index]); -+ E? boxed_expected = box_value(expected); - try { - assert_equal(boxed_actual, boxed_expected); - } catch (TestError.FAILED err) { -@@ -453,8 +453,8 @@ internal class ValaUnit.GeeCollectionAssertion : - for (int i = 0; i <= index; i++) { - iterator.next(); - } -- E boxed_actual = box_value(iterator.get()); -- E boxed_expected = box_value(expected); -+ E? boxed_actual = box_value(iterator.get()); -+ E? boxed_expected = box_value(expected); - try { - assert_equal(boxed_actual, boxed_expected); - } catch (TestError.FAILED err) { -diff --git a/subprojects/vala-unit/src/mock-object.vala b/subprojects/vala-unit/src/mock-object.vala -index 766777a4..eb086e10 100644 ---- a/subprojects/vala-unit/src/mock-object.vala -+++ b/subprojects/vala-unit/src/mock-object.vala -@@ -138,7 +138,7 @@ public interface ValaUnit.MockObject : GLib.Object, TestAssertions { - throws GLib.Error { - assert_false(this.expected.is_empty, "Unexpected call: %s".printf(name)); - -- ExpectedCall expected = this.expected.poll(); -+ ExpectedCall expected = (!) this.expected.poll(); - assert_equal(name, expected.name, "Unexpected call"); - if (expected.expected_args != null) { - assert_args(args, expected.expected_args, "Call %s".printf(name)); -@@ -229,7 +229,7 @@ public interface ValaUnit.MockObject : GLib.Object, TestAssertions { - R default_return) - throws GLib.Error { - check_for_exception(expected); -- R? return_object = default_return; -+ R return_object = default_return; - if (expected.return_object != null) { - return_object = (R) expected.return_object; - } -@@ -243,7 +243,7 @@ public interface ValaUnit.MockObject : GLib.Object, TestAssertions { - if (expected.return_object == null) { - throw default_error; - } -- return expected.return_object; -+ return (!) expected.return_object; - } - - private inline void check_for_exception(ExpectedCall expected) -diff --git a/subprojects/vala-unit/src/test-assertions.vala b/subprojects/vala-unit/src/test-assertions.vala -index 784dd9fd..e61fdf82 100644 ---- a/subprojects/vala-unit/src/test-assertions.vala -+++ b/subprojects/vala-unit/src/test-assertions.vala -@@ -21,8 +21,8 @@ namespace ValaUnit { - - } - -- internal inline void assert_equal(T actual, -- T expected, -+ internal inline void assert_equal(T? actual, -+ T? expected, - string? context = null) - throws TestError { - if ((actual == null && expected != null) || -@@ -107,9 +107,9 @@ namespace ValaUnit { - * - * This will only work when the values are not already boxed. - */ -- internal T box_value(T value) { -+ internal T? box_value(T value) { - var type = typeof(T); -- T boxed = value; -+ T? boxed = value; - - if (type == typeof(int) || type.is_enum()) { - int actual = (int) value; -@@ -133,7 +133,7 @@ namespace ValaUnit { - return boxed; - } - -- internal string to_display_string(T value) { -+ internal string to_display_string(T? value) { - var type = typeof(T); - var display = ""; - -@@ -191,8 +191,8 @@ namespace ValaUnit { - ); - } - -- private void assert_equal_enum(T actual, -- T expected, -+ private void assert_equal_enum(T? actual, -+ T? expected, - string? context) - throws TestError { - int actual_val = (int) ((int?) actual); -@@ -342,7 +342,7 @@ public interface ValaUnit.TestAssertions : GLib.Object { - - - /** Asserts a value is null */ -- public void assert_non_null(T actual, string? context = null) -+ public void assert_non_null(T? actual, string? context = null) - throws TestError { - if (actual == null) { - ValaUnit.assert( -@@ -353,7 +353,7 @@ public interface ValaUnit.TestAssertions : GLib.Object { - } - - /** Asserts a value is null */ -- public void assert_is_null(T actual, string? context = null) -+ public void assert_is_null(T? actual, string? context = null) - throws TestError { - if (actual != null) { - ValaUnit.assert( --- -2.41.0 - diff --git a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb deleted file mode 100644 index bab4f909e0..0000000000 --- a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop." -SECTION = "network" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2" - -DEPENDS = " \ - appstream-glib \ - cairo \ - desktop-file-utils-native \ - enchant2 \ - evolution-data-server \ - folks \ - gcr3 \ - gmime \ - gnome-online-accounts \ - gsound \ - gspell \ - gtk+3 \ - icu \ - iso-codes \ - json-glib \ - libhandy \ - libical \ - libpeas \ - libsecret \ - libstemmer \ - libxml2 \ - sqlite3 \ - webkitgtk3 \ -" - -RDEPENDS:${PN} = "gnome-keyring" - -inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check - -SRC_URI = " \ - git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ - file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ - file://0001-client-Add-missing-type-arguments-for-interfaces-to-.patch \ - file://0001-vala-unit-Fix-non-null-build-with-newer-vala.patch \ -" - -S = "${WORKDIR}/git" -SRCREV = "94d6bec861daffb27efea85a296f347db7a5af6d" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" - -GIR_MESON_OPTION = "" -EXTRA_OEMESON = "-Dprofile=release" - -PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" -PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" -PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" - -PACKAGECONFIG ??= "" -# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] -#| return NULL; -#| ^~~~ -CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" - -FILES:${PN} += "${datadir}" - diff --git a/meta-gnome/recipes-connectivity/geary/geary_44.0.bb b/meta-gnome/recipes-connectivity/geary/geary_44.0.bb new file mode 100644 index 0000000000..a585929092 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary_44.0.bb @@ -0,0 +1,61 @@ +SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop." +SECTION = "network" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2" + +DEPENDS = " \ + appstream-glib \ + cairo \ + desktop-file-utils-native \ + enchant2 \ + evolution-data-server \ + folks \ + gcr3 \ + gmime \ + gnome-online-accounts \ + gsound \ + gspell \ + gtk+3 \ + icu \ + iso-codes \ + json-glib \ + libhandy \ + libical \ + libpeas \ + libsecret \ + libstemmer \ + libxml2 \ + sqlite3 \ + webkitgtk3 \ +" + +RDEPENDS:${PN} = "gnome-keyring" + +inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check + +SRC_URI = " \ + git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ + file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "b72db2a5e87f2269e6359af434a4fc02fca9e9df" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" + +GIR_MESON_OPTION = "" +EXTRA_OEMESON = "-Dprofile=release" + +PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" +PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" +PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" + +PACKAGECONFIG ??= "" +# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] +#| return NULL; +#| ^~~~ +CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" + +FILES:${PN} += "${datadir}" + -- cgit v1.2.3-54-g00ecf