diff options
author | Markus Volk <f_l_k@t-online.de> | 2024-03-18 09:04:11 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-18 15:42:49 -0700 |
commit | c6d3bed4981b54d68772ab5d28a55ef89d6b60ed (patch) | |
tree | 15fb20f7ea43bcf9c492a64bd2a0e73cf6a89918 | |
parent | 621bffd4750a9a830db782e8db61bc8553fd7c41 (diff) | |
download | meta-openembedded-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>
-rw-r--r-- | meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb | 1 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb | 8 |
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 28d4c2152..f2f41276a 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() { | |||
23 | install -d ${D}${bindir} | 23 | install -d ${D}${bindir} |
24 | install -m 755 ${B}/* ${D}${bindir} | 24 | install -m 755 ${B}/* ${D}${bindir} |
25 | } | 25 | } |
26 | |||
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 0c3cc5303..8b6a7b2a0 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 | |||
2 | 2 | ||
3 | DEPENDS = " \ | 3 | DEPENDS = " \ |
4 | ${BPN}-native gperf-native \ | 4 | ${BPN}-native gperf-native \ |
5 | glib-2.0 gtk+3 gtk4 libxml2 icu \ | 5 | glib-2.0 gtk4 libxml2 icu \ |
6 | dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \ | 6 | dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \ |
7 | " | 7 | " |
8 | 8 | ||
@@ -29,15 +29,17 @@ EXTRA_OECMAKE = " \ | |||
29 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ | 29 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ |
30 | -D${LKSTRFTIME} \ | 30 | -D${LKSTRFTIME} \ |
31 | -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ | 31 | -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ |
32 | -DENABLE_GTK=OFF \ | ||
33 | -DENABLE_GTK4=ON \ | ||
32 | " | 34 | " |
33 | 35 | ||
34 | EXTRA_OECMAKE:append:class-target = " -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" | 36 | EXTRA_OECMAKE:append:class-target = " -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" |
35 | EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" | 37 | EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" |
36 | 38 | ||
37 | PACKAGECONFIG ?= "oauth" | 39 | PACKAGECONFIG ?= "goa oauth" |
38 | 40 | ||
39 | PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" | 41 | PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" |
40 | PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk3 json-glib" | 42 | PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK4=ON -DENABLE_OAUTH2_WEBKITGTK=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib" |
41 | PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" | 43 | PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" |
42 | PACKAGECONFIG[kerberos] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" | 44 | PACKAGECONFIG[kerberos] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" |
43 | # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when | 45 | # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when |