From: Markus Volk <f_l_k@t-online.de>
To: openembedded-devel@lists.openembedded.org
Cc: Markus Volk <f_l_k@t-online.de>
Subject: [meta-gnome][PATCHv2 03/14] evolution-data-server: update 3.44.2 -> 3.46.1
Date: Sun, 27 Nov 2022 00:03:40 +0100 [thread overview]
Message-ID: <20221126230351.1431843-3-f_l_k@t-online.de> (raw)
In-Reply-To: <20221126230351.1431843-1-f_l_k@t-online.de>
- build with libsoup-3.0
- dont add gtk4 exclusively, because some projects still stick to gcr3
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
.../evolution-data-server.bb | 17 +++++++++--------
.../evolution-data-server.inc | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 64774b0fe..681ff677a 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -2,8 +2,8 @@ require ${BPN}.inc
DEPENDS = " \
${BPN}-native intltool-native gperf-native \
- glib-2.0 gtk+3 libgdata libxml2 icu \
- dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
+ glib-2.0 gtk+3 gtk4 libgdata libxml2 icu \
+ dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
"
inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala
@@ -24,10 +24,6 @@ LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF"
EXTRA_OECMAKE = " \
-DSYSCONF_INSTALL_DIR=${sysconfdir} \
- -DWITH_KRB5=OFF \
- -DENABLE_GOA=OFF \
- -DENABLE_GOOGLE_AUTH=OFF \
- -DENABLE_WEATHER=OFF \
-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
-D${LKSTRFTIME} \
@@ -37,13 +33,18 @@ EXTRA_OECMAKE = " \
EXTRA_OECMAKE:append:class-target = " -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper"
EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper"
+PACKAGECONFIG ?= "oauth"
+
PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
+# ENABLE_OAUTH2_WEBKITGTK4 would require webkit to be built with gtk4
+PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib"
PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
-
+PACKAGECONFIG[kerberos] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5"
# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
# searching for openldap-libs
PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
+PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather4"
+
# -ldb needs this on some platforms
LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
index 78efee004..e3c09f211 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
inherit gnomebase upstream-version-is-even
-SRC_URI[archive.sha256sum] = "2ed72afe4d6bb170f8728faea0907fee10212dfde7a9fab82fbcc83d0f22f028"
-PV = "3.44.2"
+SRC_URI[archive.sha256sum] = "c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb"
+PV = "3.46.1"
--
2.34.1
next prev parent reply other threads:[~2022-11-26 23:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-26 23:03 [meta-gnome][PATCHv2 01/14] libgweather: update 4.0.0 -> 4.2.0 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 02/14] geocode-glib: build with libsoup-3.0 Markus Volk
2022-11-26 23:03 ` Markus Volk [this message]
2022-11-26 23:03 ` [meta-gnome][PATCHv2 04/14] gjs: update 1.72.2 -> 1.75.1 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 05/14] libgdata: use gcr3 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 06/14] mutter: update 42.0 -> 43.1 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 07/14] gnome-shell: " Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 08/14] gnome-settings-daemon: update 42.1 -> 43.0 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 09/14] mozjs: update 98 -> 102 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 10/14] polkit: add recipe for v122 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 11/14] gnome-online-accounts: use gcr3 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 12/14] gnome-keyring: " Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 13/14] libnma: update 1.8.38 -> 1.10.4 Markus Volk
2022-11-26 23:03 ` [meta-gnome][PATCHv2 14/14] geary: build with gcr3 Markus Volk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221126230351.1431843-3-f_l_k@t-online.de \
--to=f_l_k@t-online.de \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.