CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

evolution-data-server: update

Browse Source 
- Add cairo dependency
- Allow to work with gtk3
- Add patch to avoid pulling in a found
  google-id. It fails and would probably also
  break reproducibility
- inherit mime-xdg

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 2024-09-21 18:23:24 +02:00 committed by Khem Raj
parent 066afa450f
commit 56601b7061
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
View File

@ -1,12 +1,12 @@
require ${BPN}.inc
DEPENDS = " \
${BPN}-native gperf-native \
glib-2.0 json-glib gtk4 libxml2 icu \
dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
${BPN}-native cairo gperf-native \
glib-2.0 json-glib gtk+3 gtk4 libxml2 icu \
dbus db virtual/libiconv zlib libsoup nspr libical nss libsecret \
"
inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala
inherit pkgconfig gsettings gobject-introspection mime-xdg features_check gtk-doc gettext perlnative vala
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
REQUIRED_DISTRO_FEATURES = "opengl"
@ -17,6 +17,7 @@ SRC_URI += " \
file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
file://0004-call-native-helpers.patch \
file://0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch \
file://iconv-detect.h \
"
@ -42,7 +43,7 @@ EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan
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[oauth] = "-DENABLE_OAUTH2_WEBKITGTK4=ON -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

4
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
View File

@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
GNOMEBASEBUILDCLASS = "cmake"
inherit gnomebase upstream-version-is-even
SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a"
PV = "3.50.1"
SRC_URI[archive.sha256sum] = "a54b47b977a97030f738a412f4f5d5b2efbef5e0ebe8929b7cce00ac54681084"
PV = "3.54.0"

39
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch Normal file
View File

@ -0,0 +1,39 @@
From 9b949bd47ed9e5596a9d37c60aa947def9c41db9 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sun, 15 Sep 2024 22:31:49 +0200
Subject: [PATCH] data/CMakeLists.txt: dont create automatic google login
Inappropriate for cross-compiling
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
data/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8fa642909..bb1b0c4da 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -29,7 +29,7 @@ add_icon_cache_files("${SHARE_INSTALL_PREFIX}" alarm_notify_icon)
# ********************************
set(OAUTH2_SCHEMES "x-scheme-handler/eds-oauth2;")
-if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+if(0)
set(CMAKE_REQUIRED_DEFINITIONS ${DATA_SERVER_CFLAGS})
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_BINARY_DIR} ${DATA_SERVER_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${DATA_SERVER_LDFLAGS})
@@ -50,7 +50,7 @@ if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
set(OAUTH2_SCHEMES "x-scheme-handler/${_google_oauth2_scheme};${OAUTH2_SCHEMES}")
endif(NOT _google_oauth2_scheme STREQUAL "")
unset(_google_oauth2_scheme)
-endif(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+endif(0)
configure_file(org.gnome.evolution-data-server.OAuth2-handler.desktop.in
org.gnome.evolution-data-server.OAuth2-handler.desktop.in
--
2.46.0