diff mbox series

[meta-gnome] gnome-online-accounts: upgrade 3.46.0 -> 3.48.0

Message ID 1679886322-20954-5-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-gnome] gnome-online-accounts: upgrade 3.46.0 -> 3.48.0 | expand

Commit Message

Mingyu Wang (Fujitsu) March 27, 2023, 3:05 a.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

0001-build-Use-the-appropriate-dependency-object.patch
removed since it's included in 3.48.0.

Changelog:
==========
* Build fixes [#226]
* Expired Kerberos tickets not re-acquired on resume from suspend [#160]
* Update CalDAV/CardDAV OwnCloud endpoints [#67]
* Attempt to cope with multiple credential caches per identity [#79]
* Error in solving Nextcloud account address [#243]
* Translation updates

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...se-the-appropriate-dependency-object.patch | 35 -------------------
 ...6.0.bb => gnome-online-accounts_3.48.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 37 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-accounts_3.46.0.bb => gnome-online-accounts_3.48.0.bb} (92%)

Comments

Khem Raj March 27, 2023, 3:19 a.m. UTC | #1
please rebase on master-next and see if its still needed then resend.

On Sun, Mar 26, 2023 at 8:05 PM wangmy <wangmy@fujitsu.com> wrote:
>
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-build-Use-the-appropriate-dependency-object.patch
> removed since it's included in 3.48.0.
>
> Changelog:
> ==========
> * Build fixes [#226]
> * Expired Kerberos tickets not re-acquired on resume from suspend [#160]
> * Update CalDAV/CardDAV OwnCloud endpoints [#67]
> * Attempt to cope with multiple credential caches per identity [#79]
> * Error in solving Nextcloud account address [#243]
> * Translation updates
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...se-the-appropriate-dependency-object.patch | 35 -------------------
>  ...6.0.bb => gnome-online-accounts_3.48.0.bb} |  3 +-
>  2 files changed, 1 insertion(+), 37 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-accounts_3.46.0.bb => gnome-online-accounts_3.48.0.bb} (92%)
>
> 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 838ca1a7d..000000000
> --- 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 <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
> -
> 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 92%
> rename from meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb
> rename to meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb
> index ce02a507d..e059500ab 100644
> --- 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
> @@ -8,8 +8,7 @@ inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_c
>
>  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"
> +SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf"
>
>  PACKAGECONFIG_SOUP ?= "soup3"
>  PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101763): https://lists.openembedded.org/g/openembedded-devel/message/101763
> Mute This Topic: https://lists.openembedded.org/mt/97874735/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 838ca1a7d..000000000
--- 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 <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
-
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 92%
rename from meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb
rename to meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb
index ce02a507d..e059500ab 100644
--- 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
@@ -8,8 +8,7 @@  inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_c
 
 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"
+SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf"
 
 PACKAGECONFIG_SOUP ?= "soup3"
 PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}"