Signed-off-by: Markus Volk <f_l_k@...>
---
...se-the-appropriate-dependency-object.patch | 35 -------------------
...6.0.bb =3D> gnome-online-accounts_3.48.0.bb} | 12 +++----
2 files changed, 5 insertions(+), 42 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-=
online-accounts/0001-build-Use-the-appropriate-dependency-object.patch
rename meta-gnome/recipes-gnome/gnome-online-accounts/{gnome-online-acco=
unts_3.46.0.bb =3D> gnome-online-accounts_3.48.0.bb} (69%)

diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-=
accounts/0001-build-Use-the-appropriate-dependency-object.patch b/meta-gn=
ome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-=
Use-the-appropriate-dependency-object.patch
deleted file mode 100644
index 838ca1a7d..000000000
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-account=
s/0001-build-Use-the-appropriate-dependency-object.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 06240574626eb21af37cf7dde5bf81e892dff467 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@...>
-Date: Wed, 5 Oct 2022 22:15:37 +0100
-Subject: [PATCH] build: Use the appropriate dependency object
-
-Just using `link_with` will not ensure that the GOA web extension shared
-module is properly built against libgoa-backend and libgoa; the
-generated headers must be transitively available by the time we build
-the shared module.
-
-Fixes: #226
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-online-a=
ccounts/-/commit/fe86bfb0271735c8130367c46536b08dad5c20d8]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- src/goabackend/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/goabackend/meson.build b/src/goabackend/meson.build
-index f5382b3..865b2d2 100644
---- a/src/goabackend/meson.build
-+++ b/src/goabackend/meson.build
-@@ -157,9 +157,8 @@ libgoa_web_extension =3D shared_module(
- 'goawebextension',
- libgoawebextension_sources,
- include_directories: common_incs + [goa_inc],
-- dependencies: deps,
-+ dependencies: [deps, libgoa_backend_dep],
- c_args: cflags,
-- link_with: libgoa_backend,
- install: true,
- install_dir: join_paths(goa_pkglibdir, 'web-extensions')
- )
---=20
-2.39.0
-
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-=
accounts_3.46.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome=
-online-accounts_3.48.0.bb
similarity index 69%
rename from meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-a=
ccounts_3.46.0.bb
rename to meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-acc=
ounts_3.48.0.bb
index ce02a507d..ddc039ec8 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-account=
s_3.46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-account=
s_3.48.0.bb
@@ -6,22 +6,20 @@ GNOMEBASEBUILDCLASS =3D "meson"
=20
inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala fe=
atures_check
=20
-DEPENDS =3D "gtk+3 gtk+3-native gdk-pixbuf dbus json-glib libxml2 webkit=
gtk glib-2.0 rest libsecret"
+DEPENDS =3D "gdk-pixbuf dbus glib-2.0"
=20
-SRC_URI +=3D "file://0001-build-Use-the-appropriate-dependency-object.pa=
tch"
-SRC_URI[archive.sha256sum] =3D "5e7859ce4858a6b99d3995ed70527d66e297bb90=
bbf75ec8780fe9da22c1fcaa"
+SRC_URI[archive.sha256sum] =3D "418bb9fcffdbd72a98205ad365137617fc1e3551=
a54de74f6a98d45d266175bf"
=20
-PACKAGECONFIG_SOUP ?=3D "soup3"
-PACKAGECONFIG ?=3D "kerberos owncloud lastfm google windows_live ${PACKA=
GECONFIG_SOUP}"
+PACKAGECONFIG ?=3D "goabackend kerberos owncloud lastfm google windows_l=
ive"
=20
+# goabackend requires webkitgtk to be built with gtk+3 and gcr3
+PACKAGECONFIG[goabackend] =3D "-Dgoabackend=3Dtrue,-Dgoabackend=3Dfalse,=
gtk+3 gtk+3-native json-glib libxml2 libsoup rest libsecret webkitgtk-4"
PACKAGECONFIG[kerberos] =3D "-Dkerberos=3Dtrue, -Dkerberos=3Dfalse,krb5 =
gcr3"
PACKAGECONFIG[exchange] =3D "-Dexchange=3Dtrue, -Dexchange=3Dfalse"
PACKAGECONFIG[google] =3D "-Dgoogle=3Dtrue, -Dgoogle=3Dfalse"
PACKAGECONFIG[owncloud] =3D "-Downcloud=3Dtrue, -Downcloud=3Dfalse"
PACKAGECONFIG[windows_live] =3D "-Dwindows_live=3Dtrue, -Dwindows_live=3D=
false"
PACKAGECONFIG[lastfm] =3D "-Dlastfm=3Dtrue, -Dlastfm=3Dfalse"
-PACKAGECONFIG[soup2] =3D ",,libsoup-2.4,,,soup3"
-PACKAGECONFIG[soup3] =3D ",,libsoup-3.0,,,soup2"
=20
FILES:${PN} +=3D " \
${datadir}/dbus-1 \
--=20
2.34.1