- build with libsoup-3.0
- use gtk4
Signed-off-by: Markus Volk <[email protected]>
---
.../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..6a631d20b 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 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 ?= ""
+
PACKAGECONFIG[canberra] =
"-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk
json-glib"
+# for builtin oauth authentification webkitgtk needs to be built with gtk4
also.
+PACKAGECONFIG[oauth] =
"-DENABLE_OAUTH2_WEBKITGTK4=ON,-DENABLE_OAUTH2_WEBKITGTK4=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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#99749):
https://lists.openembedded.org/g/openembedded-devel/message/99749
Mute This Topic: https://lists.openembedded.org/mt/95271469/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
