From bba29b70e9a986ba6dc8e1e09b4c94077b5ebfd4 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sat, 25 Mar 2023 09:02:38 +0100 Subject: gnome-online-accounts: update 3.46.0 -> 3.48.0 Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- ...ild-Use-the-appropriate-dependency-object.patch | 35 ---------------------- .../gnome-online-accounts_3.46.0.bb | 32 -------------------- .../gnome-online-accounts_3.48.0.bb | 30 +++++++++++++++++++ 3 files changed, 30 insertions(+), 67 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-Use-the-appropriate-dependency-object.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-Use-the-appropriate-dependency-object.patch b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-Use-the-appropriate-dependency-object.patch deleted file mode 100644 index 838ca1a7d4..0000000000 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/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 -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-accounts/-/commit/fe86bfb0271735c8130367c46536b08dad5c20d8] -Signed-off-by: Khem Raj ---- - 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 = 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') - ) --- -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.46.0.bb deleted file mode 100644 index ce02a507da..0000000000 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" -LICENSE = "LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_check - -DEPENDS = "gtk+3 gtk+3-native gdk-pixbuf dbus json-glib libxml2 webkitgtk glib-2.0 rest libsecret" - -SRC_URI += "file://0001-build-Use-the-appropriate-dependency-object.patch" -SRC_URI[archive.sha256sum] = "5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa" - -PACKAGECONFIG_SOUP ?= "soup3" -PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}" - -PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr3" -PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false" -PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false" -PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false" -PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false" -PACKAGECONFIG[lastfm] = "-Dlastfm=true, -Dlastfm=false" -PACKAGECONFIG[soup2] = ",,libsoup-2.4,,,soup3" -PACKAGECONFIG[soup3] = ",,libsoup-3.0,,,soup2" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/goa-1.0/web-extensions/*.so \ -" - -# looked into pkg-config file: it is not a bug - they mean it -FILES:${PN}-dev += "${libdir}/goa-1.0/include" diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb new file mode 100644 index 0000000000..948a738881 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_check + +DEPENDS = "gdk-pixbuf dbus glib-2.0" + +SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf" + +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[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr3" +PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false" +PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false" +PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false" +PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false" +PACKAGECONFIG[lastfm] = "-Dlastfm=true, -Dlastfm=false" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/goa-1.0/web-extensions/*.so \ +" + +# looked into pkg-config file: it is not a bug - they mean it +FILES:${PN}-dev += "${libdir}/goa-1.0/include" -- cgit v1.2.3-54-g00ecf