diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/evolution-data-server')
6 files changed, 65 insertions, 33 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 681a61c33a..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 @@ -1,10 +1,12 @@ require ${BPN}.inc -inherit native +inherit_defer native DEPENDS = "glib-2.0-native" # build native helpers +do_configure[noexec] = "1" + do_compile() { cd ${S}/src/camel sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c @@ -21,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 571d4301ec..fc19253142 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 @@ -1,16 +1,18 @@ require ${BPN}.inc DEPENDS = " \ - ${BPN}-native intltool-native gperf-native \ - glib-2.0 gtk+3 libgdata \ - dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ + ${BPN}-native gperf-native \ + glib-2.0 json-glib gtk4 libxml2 icu \ + dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \ " -inherit gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative +inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI += " \ + file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ @@ -21,44 +23,44 @@ SRC_URI += " \ LKSTRFTIME = "HAVE_LKSTRFTIME=ON" LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF" -# For arm qemu-arm runs at 100% CPU load and never returns - so disable introspection for now -GI_DATA_ENABLED="False" - EXTRA_OECMAKE = " \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \ - -DWITH_KRB5=OFF \ - -DENABLE_GOA=OFF \ - -DENABLE_UOA=OFF \ - -DENABLE_GOOGLE_AUTH=OFF \ - -DENABLE_WEATHER=OFF \ - -DENABLE_INTROSPECTION=${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'ON', 'OFF', d)} \ + -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} \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DENABLE_GTK=OFF \ + -DENABLE_GTK4=ON \ + -DENABLE_INSTALLED_TESTS=OFF \ + -DENABLE_EXAMPLES=OFF \ + -DENABLE_MAINTAINER_MODE=OFF \ " -PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" -PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib" +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 ?= "goa oauth" +PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" +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 # 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" -do_configure:append () { - cp ${WORKDIR}/iconv-detect.h ${S}/src - - # fix native perl shebang - sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard +# invokes libraries from build host +GI_DATA_ENABLED:libc-musl="False" - # fix abs path for g-ir-scanner-wrapper - sed -i ${B}/build.ninja \ - -e 's: ${bindir}/g-ir-scanner-wrapper: ${STAGING_BINDIR}/g-ir-scanner-wrapper:g' -} - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" +do_configure:append () { + cp ${UNPACKDIR}/iconv-detect.h ${S}/src + # avoid writing perl-native path into csv2vcard shebang + sed -i "s|@PERL@|${bindir}/perl|" ${S}/src/tools/addressbook-export/csv2vcard.in } FILES:${PN} =+ " \ 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 86c7dea443..33190c461c 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 @@ -2,12 +2,13 @@ SUMMARY = "Evolution database backend server" HOMEPAGE = "http://www.gnome.org/projects/evolution/" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2 & LGPLv2+" +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543" +GNOMEBASEBUILDCLASS = "cmake" inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "ec82951639f32a5cece80a8b0b9aa3f66b7d318e3ee2c1c35234f2e2bde8a418" -PV = "3.40.2" +SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a" +PV = "3.50.1" diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch new file mode 100644 index 0000000000..118d93a72a --- /dev/null +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch @@ -0,0 +1,25 @@ +Use G_IR_SCANNER without passing additional environment + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/cmake/modules/GObjectIntrospection.cmake ++++ b/cmake/modules/GObjectIntrospection.cmake +@@ -122,9 +122,7 @@ macro(gir_add_introspection gir) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}") + + add_custom_command( +- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS= +- ${INTROSPECTION_SCANNER_ENV} +- ${G_IR_SCANNER} ++ COMMAND ${G_IR_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} + --namespace=${_gir_namespace} + --nsversion=${_gir_version} +@@ -240,7 +238,6 @@ macro(gir_add_introspection_simple gir_l + ${_gir_identifies_prefixes} + ${_gir_deps} + --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0 +- --library-path=${LIB_INSTALL_DIR} + ${_extra_library_path} + --pkg-export ${pkg_export_prefix}-${gir_library_version} + --c-include=${c_include} diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch index 23c3a96d43..51eaf7cfef 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit * TRY_RUN: does not work for OE * HAVE_LKSTRFTIME is set by recipe as configure option +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- CMakeLists.txt | 23 ----------------------- diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch index e320f6342d..82f6972501 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Inappropriate[oe-specific] +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- |