CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-online-accounts: update 3.46.0 -> 3.48.0

Browse Source 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk 2023-03-25 09:02:38 +01:00 committed by Khem Raj
parent 11b63d454b
commit bba29b70e9
2 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-build-Use-the-appropriate-dependency-object.patch
View File

@ -1,35 +0,0 @@
From 06240574626eb21af37cf7dde5bf81e892dff467 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
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 <raj.khem@gmail.com>
---
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

12
meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb → meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb
View File

@ -6,22 +6,20 @@ 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"
DEPENDS = "gdk-pixbuf dbus glib-2.0"
SRC_URI += "file://0001-build-Use-the-appropriate-dependency-object.patch"
SRC_URI[archive.sha256sum] = "5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa"
SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf"
PACKAGECONFIG_SOUP ?= "soup3"
PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}"
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"
PACKAGECONFIG[soup2] = ",,libsoup-2.4,,,soup3"
PACKAGECONFIG[soup3] = ",,libsoup-3.0,,,soup2"
FILES:${PN} += " \
${datadir}/dbus-1 \