mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 19:47:17 +00:00
gnome-online-accounts: update 3.48.0 -> 3.50.0
- gnome-online-accounts was ported to gtk4/gcr4 - drop patches that have been included - lastfm support was dropped - add missing mime-xdg class - use gtk4 for gtk-icon-cache 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:
-104
@@ -1,104 +0,0 @@
|
|||||||
From c4a2951f8a75c4151f009e42b26639e4f456d5a2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sat, 27 May 2023 14:41:28 -0700
|
|
||||||
Subject: [PATCH] Replace filename with basename
|
|
||||||
|
|
||||||
This avoids emitting absolute paths into generated sourcecode, it
|
|
||||||
improves reproducibility. See [1]
|
|
||||||
|
|
||||||
[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/125]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
src/goa/goaenumtypes.c.template | 2 +-
|
|
||||||
src/goa/goaenumtypes.h.template | 2 +-
|
|
||||||
src/goabackend/goabackendenumtypes.c.template | 2 +-
|
|
||||||
src/goabackend/goabackendenumtypes.h.template | 2 +-
|
|
||||||
src/goaidentity/goaidentityenumtypes.c.in | 4 ++--
|
|
||||||
src/goaidentity/goaidentityenumtypes.h.in | 2 +-
|
|
||||||
6 files changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/goa/goaenumtypes.c.template b/src/goa/goaenumtypes.c.template
|
|
||||||
index 3150fa71..c2bc4b0a 100644
|
|
||||||
--- a/src/goa/goaenumtypes.c.template
|
|
||||||
+++ b/src/goa/goaenumtypes.c.template
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
/*** END file-header ***/
|
|
||||||
|
|
||||||
/*** BEGIN file-production ***/
|
|
||||||
-/* enumerations from "@filename@" */
|
|
||||||
+/* enumerations from "@basename@" */
|
|
||||||
/*** END file-production ***/
|
|
||||||
|
|
||||||
/*** BEGIN value-header ***/
|
|
||||||
diff --git a/src/goa/goaenumtypes.h.template b/src/goa/goaenumtypes.h.template
|
|
||||||
index 040428c3..14548cb4 100644
|
|
||||||
--- a/src/goa/goaenumtypes.h.template
|
|
||||||
+++ b/src/goa/goaenumtypes.h.template
|
|
||||||
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
|
|
||||||
|
|
||||||
/*** BEGIN file-production ***/
|
|
||||||
|
|
||||||
-/* enumerations from "@filename@" */
|
|
||||||
+/* enumerations from "@basename@" */
|
|
||||||
/*** END file-production ***/
|
|
||||||
|
|
||||||
/*** BEGIN value-header ***/
|
|
||||||
diff --git a/src/goabackend/goabackendenumtypes.c.template b/src/goabackend/goabackendenumtypes.c.template
|
|
||||||
index 6d2651da..05156bdd 100644
|
|
||||||
--- a/src/goabackend/goabackendenumtypes.c.template
|
|
||||||
+++ b/src/goabackend/goabackendenumtypes.c.template
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
/*** END file-header ***/
|
|
||||||
|
|
||||||
/*** BEGIN file-production ***/
|
|
||||||
-/* enumerations from "@filename@" */
|
|
||||||
+/* enumerations from "@basename@" */
|
|
||||||
/*** END file-production ***/
|
|
||||||
|
|
||||||
/*** BEGIN value-header ***/
|
|
||||||
diff --git a/src/goabackend/goabackendenumtypes.h.template b/src/goabackend/goabackendenumtypes.h.template
|
|
||||||
index 7321076e..51ce84bd 100644
|
|
||||||
--- a/src/goabackend/goabackendenumtypes.h.template
|
|
||||||
+++ b/src/goabackend/goabackendenumtypes.h.template
|
|
||||||
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
|
|
||||||
|
|
||||||
/*** BEGIN file-production ***/
|
|
||||||
|
|
||||||
-/* enumerations from "@filename@" */
|
|
||||||
+/* enumerations from "@basename@" */
|
|
||||||
/*** END file-production ***/
|
|
||||||
|
|
||||||
/*** BEGIN value-header ***/
|
|
||||||
diff --git a/src/goaidentity/goaidentityenumtypes.c.in b/src/goaidentity/goaidentityenumtypes.c.in
|
|
||||||
index c0286907..8aad7ae4 100644
|
|
||||||
--- a/src/goaidentity/goaidentityenumtypes.c.in
|
|
||||||
+++ b/src/goaidentity/goaidentityenumtypes.c.in
|
|
||||||
@@ -5,8 +5,8 @@
|
|
||||||
/*** END file-header ***/
|
|
||||||
|
|
||||||
/*** BEGIN file-production ***/
|
|
||||||
-#include "@filename@"
|
|
||||||
-/* enumerations from "@filename@" */
|
|
||||||
+#include "@basename@"
|
|
||||||
+/* enumerations from "@basename@" */
|
|
||||||
/*** END file-production ***/
|
|
||||||
|
|
||||||
/*** BEGIN value-header ***/
|
|
||||||
diff --git a/src/goaidentity/goaidentityenumtypes.h.in b/src/goaidentity/goaidentityenumtypes.h.in
|
|
||||||
index 35d4d5c5..8719282a 100644
|
|
||||||
--- a/src/goaidentity/goaidentityenumtypes.h.in
|
|
||||||
+++ b/src/goaidentity/goaidentityenumtypes.h.in
|
|
||||||
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
|
|
||||||
|
|
||||||
/*** BEGIN file-production ***/
|
|
||||||
|
|
||||||
-/* enumerations from "@filename@" */
|
|
||||||
+/* enumerations from "@basename@" */
|
|
||||||
/*** END file-production ***/
|
|
||||||
|
|
||||||
/*** BEGIN value-header ***/
|
|
||||||
--
|
|
||||||
2.40.1
|
|
||||||
|
|
||||||
-28
@@ -1,28 +0,0 @@
|
|||||||
From a2867ebcf184695eed00aab4e7b47c1d4a53b2b2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
|
|
||||||
Date: Fri, 24 Nov 2023 16:19:47 +0100
|
|
||||||
Subject: [PATCH] goabackend: Fix build with libxml2 2.12
|
|
||||||
|
|
||||||
libxml/xmlIO.h no longer includes libxml/parser.h.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://github.com/GNOME/gnome-online-accounts/commit/b9638e2418408be4906752297e700506766dcf20]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
src/goabackend/goaewsclient.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/goabackend/goaewsclient.c b/src/goabackend/goaewsclient.c
|
|
||||||
index 4cb2358..01a52d1 100644
|
|
||||||
--- a/src/goabackend/goaewsclient.c
|
|
||||||
+++ b/src/goabackend/goaewsclient.c
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
#include <glib/gi18n-lib.h>
|
|
||||||
|
|
||||||
#include <libsoup/soup.h>
|
|
||||||
+#include <libxml/parser.h>
|
|
||||||
#include <libxml/xmlIO.h>
|
|
||||||
|
|
||||||
#include "goaewsclient.h"
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
||||||
+7
-11
@@ -2,25 +2,21 @@ SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME"
|
|||||||
LICENSE = "LGPL-2.0-or-later"
|
LICENSE = "LGPL-2.0-or-later"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36"
|
||||||
|
|
||||||
|
GTKIC_VERSION = "4"
|
||||||
|
inherit gnomebase gsettings gobject-introspection gtk-icon-cache mime-xdg vala features_check
|
||||||
|
|
||||||
inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_check
|
DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr"
|
||||||
|
|
||||||
DEPENDS = "gdk-pixbuf dbus glib-2.0"
|
SRC_URI[archive.sha256sum] = "b0f64f0dcfbb8885a3a759e1c9de7fb204adb3ce6bd32c30bcf52d5533c06d4e"
|
||||||
|
|
||||||
SRC_URI += "file://0001-Replace-filename-with-basename.patch \
|
PACKAGECONFIG ?= "goabackend kerberos owncloud google windows_live"
|
||||||
file://0001-goabackend-Fix-build-with-libxml2-2.12.patch"
|
|
||||||
SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf"
|
|
||||||
|
|
||||||
PACKAGECONFIG ?= "goabackend kerberos owncloud lastfm google windows_live"
|
PACKAGECONFIG[goabackend] = "-Dgoabackend=true,-Dgoabackend=false,gtk4 libadwaita json-glib libxml2 libsoup rest libsecret webkitgtk"
|
||||||
|
PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5"
|
||||||
# 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 webkitgtk3"
|
|
||||||
PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr3"
|
|
||||||
PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false"
|
PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false"
|
||||||
PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false"
|
PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false"
|
||||||
PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false"
|
PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false"
|
||||||
PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false"
|
PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false"
|
||||||
PACKAGECONFIG[lastfm] = "-Dlastfm=true, -Dlastfm=false"
|
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
${datadir}/dbus-1 \
|
${datadir}/dbus-1 \
|
||||||
Reference in New Issue
Block a user