evolution-data-server: update to 3.38.3, enable gir on cross

This commit is contained in:
Đoàn Trần Công Danh 2021-02-02 21:03:42 +07:00
parent 7691ee66ef
commit 034d95a5d4
4 changed files with 28 additions and 78 deletions

View File

@ -1,45 +0,0 @@
# This file was generated by CMake because it detected TRY_RUN() commands
# in crosscompiling mode. It will be overwritten by the next CMake run.
# Copy it to a safe location, set the variables to appropriate values
# and use it then to preset the CMake cache (using -C).
# _correct_iconv_EXITCODE
# indicates whether the executable would have been able to run on its
# target platform. If so, set _correct_iconv_EXITCODE to
# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
# The _correct_iconv_COMPILED variable holds the build result for this TRY_RUN().
#
# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c
# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_315ee-_correct_iconv_EXITCODE
# Run arguments :
# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake
# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt
set( _correct_iconv_EXITCODE
0
CACHE INTERNAL "Result from TRY_RUN" FORCE)
set(_correct_iconv_EXITCODE__TRYRUN_OUTPUT
0
CACHE INTERNAL "Result from TRY_RUN" FORCE)
# HAVE_LKSTRFTIME_EXITCODE
# indicates whether the executable would have been able to run on its
# target platform. If so, set HAVE_LKSTRFTIME_EXITCODE to
# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
# The HAVE_LKSTRFTIME_COMPILED variable holds the build result for this TRY_RUN().
#
# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c
# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_d2897-HAVE_LKSTRFTIME_EXITCODE
# Run arguments :
# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake
# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt
set( HAVE_LKSTRFTIME_EXITCODE
0
CACHE INTERNAL "Result from TRY_RUN" FORCE)
set( HAVE_LKSTRFTIME_EXITCODE__TRYRUN_OUTPUT
0
CACHE INTERNAL "Result from TRY_RUN" FORCE)

View File

@ -1,5 +0,0 @@
/* This is an auto-generated header, DO NOT EDIT! */
#define ICONV_ISO_D_FORMAT "iso-%d-%d"
#define ICONV_ISO_S_FORMAT "iso-%d-%s"
#define ICONV_10646 "iso-10646"

View File

@ -0,0 +1,11 @@
--- cmake/modules/GObjectIntrospection.cmake
+++ cmake/modules/GObjectIntrospection.cmake
@@ -122,7 +122,7 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
add_custom_command(
- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
+ COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'"
${INTROSPECTION_SCANNER_ENV}
${G_IR_SCANNER}
${INTROSPECTION_SCANNER_ARGS}

View File

@ -1,12 +1,14 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
version=3.38.0
version=3.38.3
revision=1
build_style=cmake
build_helper="gir qemu"
configure_args="-DENABLE_UOA=OFF
-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
$(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel"
hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
$(vopt_if gir vala)"
makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel
$(vopt_if gir vala-devel)"
@ -15,47 +17,34 @@ short_desc="Centralized access to appointments and contacts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-36/NEWS"
changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=13689a7b55765806c4d5f3b05ef6c24b0bf9957b9ed9240c2dd09a2cdb13b0af
checksum=9732f690b252aa7c0932c761740b5098a19705d1b6e4a5de2fad3a16e57e3ca7
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="gir"
fi
build_options_default="gir"
pre_build() {
# Only affect g-ir-scanner, which is fine
LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/camel"
LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libebackend"
LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libedataserver"
LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/private"
}
# problematic
do_check() {
:
}
# cmake perfomrms 2 checks using binary runtime, about iconv and sfrtime.
# musl (1.1.16) does not support "ISO-2022-JP" encoding (see its roadmap),
# although evolution-data-server is fine with musl.
# If crossbuild, cmake let disabling runtime checks via specific directives.
# test iconv-detect.c also generates iconv-detect.h that is required for build.
# So completly disable test from iconv-detect.c (cmake.patch file) and
# use a cmake cache file on crossbuild to disable sfrtime running test.
if [ "$CROSS_BUILD" ]; then
configure_args+=" -C disableRuntimeTests.cmake"
fi
pre_configure() {
mkdir -p build
cp ${FILESDIR}/iconv-detect.h ${wrksrc}/build/.
if [ "$CROSS_BUILD" ]; then
cp ${FILESDIR}/disableRuntimeTests.cmake ${wrksrc}/build/.
fi
}
post_install() {
rm -rf ${DESTDIR}/usr/lib/systemd
}
evolution-data-server-devel_package() {
depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel
libldap-devel libgdata-devel>=0.15 libsecret-devel libglib-devel
libsoup-devel gtk+3-devel libxml2-devel gnome-desktop-devel
libgdata-devel>=0.15 libsecret-devel libglib-devel
libsoup-devel gtk+3-devel libxml2-devel
${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {