mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 14:59:55 +00:00
Code Issues Projects Releases Wiki Activity

evolution-data-server: update 3.44.2 -> 3.46.1

Browse Source 
- 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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
2022-11-27 13:28:35 +01:00
committed by Khem Raj
parent 35c2157221
commit 87f09f66fc
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+10 -9
View File
@@ -2,8 +2,8 @@ require ${BPN}.inc
DEPENDS = " \ DEPENDS = " \
${BPN}-native intltool-native gperf-native \ ${BPN}-native intltool-native gperf-native \
glib-2.0 gtk+3 libgdata libxml2 icu \ glib-2.0 gtk+3 gtk4 libgdata libxml2 icu \
dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
" "
inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala 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 = " \ EXTRA_OECMAKE = " \
-DSYSCONF_INSTALL_DIR=${sysconfdir} \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \
-DWITH_KRB5=OFF \
-DENABLE_GOA=OFF \
-DENABLE_GOOGLE_AUTH=OFF \
-DENABLE_WEATHER=OFF \
-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \ -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
-D${LKSTRFTIME} \ -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_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper"
EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper"
PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" PACKAGECONFIG ?= "oauth"
PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
# 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 # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
# searching for openldap-libs # searching for openldap-libs
PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather4"
# -ldb needs this on some platforms # -ldb needs this on some platforms
LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+2 -2
View File
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
inherit gnomebase upstream-version-is-even inherit gnomebase upstream-version-is-even
SRC_URI[archive.sha256sum] = "2ed72afe4d6bb170f8728faea0907fee10212dfde7a9fab82fbcc83d0f22f028" SRC_URI[archive.sha256sum] = "c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb"
PV = "3.44.2" PV = "3.46.1"