aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2024-03-18 09:04:11 +0100
committerKhem Raj <raj.khem@gmail.com>2024-03-18 15:42:49 -0700
commitc6d3bed4981b54d68772ab5d28a55ef89d6b60ed (patch)
tree15fb20f7ea43bcf9c492a64bd2a0e73cf6a89918 /meta-gnome
parent621bffd4750a9a830db782e8db61bc8553fd7c41 (diff)
downloadmeta-openembedded-contrib-c6d3bed4981b54d68772ab5d28a55ef89d6b60ed.tar.gz
evolution-data-server: build with webkitgtk4
- enable goa by default Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb1
-rw-r--r--meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb8
2 files changed, 6 insertions, 3 deletions
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
index 28d4c2152b..f2f41276a6 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
@@ -23,3 +23,4 @@ do_install() {
install -d ${D}${bindir}
install -m 755 ${B}/* ${D}${bindir}
}
+
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 0c3cc53030..8b6a7b2a02 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,7 +2,7 @@ require ${BPN}.inc
DEPENDS = " \
${BPN}-native gperf-native \
- glib-2.0 gtk+3 gtk4 libxml2 icu \
+ glib-2.0 gtk4 libxml2 icu \
dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
"
@@ -29,15 +29,17 @@ EXTRA_OECMAKE = " \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
-D${LKSTRFTIME} \
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
+ -DENABLE_GTK=OFF \
+ -DENABLE_GTK4=ON \
"
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 ?= "goa oauth"
PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk3 json-glib"
+PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK4=ON -DENABLE_OAUTH2_WEBKITGTK=OFF,-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