diff options
Diffstat (limited to 'meta-openembedded/meta-gnome')
11 files changed, 9 insertions, 250 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-client-Add-missing-type-arguments-for-interfaces-to-.patch b/meta-openembedded/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-openembedded/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 <ricotz@ubuntu.com> -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 <raj.khem@gmail.com> ---- - 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<PaneType,V> : AccountRow<PaneType,V> - - - /** Interface for rows that use a validator for editable values. */ --internal interface Accounts.ValidatingRow : EditorRow { -+internal interface Accounts.ValidatingRow<PaneType> : EditorRow<PaneType> { - - - /** 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<EditorServersPane,Gtk.Entry>, ValidatingRow { -+ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> { - - - public Components.Validator validator { -@@ -848,7 +848,7 @@ private class Accounts.ServiceSecurityRow : - - - private class Accounts.ServiceLoginRow : -- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow { -+ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> { - - - public Components.Validator validator { -@@ -972,7 +972,7 @@ private class Accounts.ServiceLoginRow : - - - private class Accounts.ServicePasswordRow : -- ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow { -+ ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> { - - - public Components.Validator validator { --- -2.41.0 - diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-vala-unit-Fix-non-null-build-with-newer-vala.patch b/meta-openembedded/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-openembedded/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 <ricotz@ubuntu.com> -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 <raj.khem@gmail.com> ---- - .../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<E> : GLib.Object, - - public CollectionAssertions<E> 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<E> : GLib.Object, - - public CollectionAssertions<E> 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<E> : 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<E> : - 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>(T actual, -- T expected, -+ internal inline void assert_equal<T>(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>(T value) { -+ internal T? box_value<T>(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>(T value) { -+ internal string to_display_string<T>(T? value) { - var type = typeof(T); - var display = ""; - -@@ -191,8 +191,8 @@ namespace ValaUnit { - ); - } - -- private void assert_equal_enum<T>(T actual, -- T expected, -+ private void assert_equal_enum<T>(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>(T actual, string? context = null) -+ public void assert_non_null<T>(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>(T actual, string? context = null) -+ public void assert_is_null<T>(T? actual, string? context = null) - throws TestError { - if (actual != null) { - ValaUnit.assert( --- -2.41.0 - diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_43.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_44.0.bb index 6085d94fdc..a585929092 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_43.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_44.0.bb @@ -26,7 +26,7 @@ DEPENDS = " \ libstemmer \ libxml2 \ sqlite3 \ - webkitgtk \ + webkitgtk3 \ " RDEPENDS:${PN} = "gnome-keyring" @@ -36,12 +36,10 @@ inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala featu 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" +SRCREV = "b72db2a5e87f2269e6359af434a4fc02fca9e9df" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 43717a84cd..edbe30ff87 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -37,7 +37,7 @@ EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan PACKAGECONFIG ?= "oauth" PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" -PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib" +PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk3 json-glib" PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" PACKAGECONFIG[kerberos] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb index 8c4b79160a..6aa28fc00f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb @@ -17,7 +17,7 @@ GNOMEBASEBUILDCLASS = "meson" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' -SRC_URI[archive.sha256sum] = "d80ac70b99a7059c8f28ca0bf37305f09daeaecfceb1528d68a435ace9e8ec5d" +SRC_URI[archive.sha256sum] = "3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3" PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" PACKAGECONFIG[exiv2] = "-Dexiv2=enabled,-Dexiv2=disabled,exiv2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb index ca78fa0119..cd14b48508 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb @@ -14,7 +14,7 @@ SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a PACKAGECONFIG ?= "goabackend kerberos owncloud lastfm google windows_live" # goabackend requires webkitgtk to be built with gtk+3 and gcr3 -PACKAGECONFIG[goabackend] = "-Dgoabackend=true,-Dgoabackend=false,gtk+3 gtk+3-native json-glib libxml2 libsoup rest libsecret webkitgtk" +PACKAGECONFIG[goabackend] = "-Dgoabackend=true,-Dgoabackend=false,gtk+3 gtk+3-native json-glib libxml2 libsoup rest libsecret webkitgtk3" PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr3" PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false" PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_44.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_44.4.bb index a7807c34b1..ac3571685f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_44.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_44.4.bb @@ -29,7 +29,7 @@ RDEPENDS:${PN} = "iso-codes" EXTRA_OEMESON += "-Dtests=false -Dsoup2=false" -SRC_URI[archive.sha256sum] = "325abb722cab20b6aa67f158ea2ff2ea899830ca0a883e24594d9def85fd1622" +SRC_URI[archive.sha256sum] = "8b53767ef6cc54a2db588ef1c5926838b0d67b8d9b21173de5139cd0fbd28095" PACKAGECONFIG ?= "flatpak" PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.12.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.12.2.bb index 6b65af3bb4..389f2fd48c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.12.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.12.2.bb @@ -7,4 +7,4 @@ DEPENDS = "gtk+3 iso-codes enchant2" inherit gnomebase gettext gobject-introspection vala -SRC_URI[archive.sha256sum] = "8ec44f32052e896fcdd4926eb814a326e39a5047e251eec7b9056fbd9444b0f1" +SRC_URI[archive.sha256sum] = "b4e993bd827e4ceb6a770b1b5e8950fce3be9c8b2b0cbeb22fdf992808dd2139" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.3.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.3.3.bb deleted file mode 100644 index c0eff35e4e..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.3.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Building blocks for modern GNOME applications" -LICENSE="LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - gtk4 \ -" - -inherit gnomebase gobject-introspection gtk-doc vala features_check - -SRC_URI[archive.sha256sum] = "3fb9f6f8f570e543ab2dafb8b4b94d8b376c59ad565efadfede44557e3f3a9e1" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = 'gtk_doc' - -PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" - -FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index 200ed0f709..51d51ee0ab 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb @@ -19,7 +19,7 @@ DEPENDS += " \ libxslt \ sqlite3 \ libhandy \ - webkitgtk \ + webkitgtk3 \ yelp-xsl \ " PACKAGECONFIG_SOUP ?= "soup3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.44.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.44.0.bb index 8ea24ca49b..3548cc5bbe 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.44.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.44.0.bb @@ -20,7 +20,7 @@ SRC_URI[archive.sha256sum] = "c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279 SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch" PACKAGECONFIG ?= "webkitgtk" -PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" +PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk3" PACKAGES =+ "${PN}-gdialog" FILES:${PN}-gdialog = "${bindir}/gdialog" |