From e72091db7f2fc824bb4e112bb133616b1d3cb48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 21:03:42 +0700 Subject: [PATCH 1/4] evolution-data-server: update to 3.38.3, enable gir on cross --- .../files/disableRuntimeTests.cmake | 45 ------------------ .../files/iconv-detect.h | 5 -- .../evolution-data-server/patches/gir.patch | 11 +++++ srcpkgs/evolution-data-server/template | 46 +++++++------------ 4 files changed, 28 insertions(+), 79 deletions(-) delete mode 100644 srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake delete mode 100644 srcpkgs/evolution-data-server/files/iconv-detect.h create mode 100644 srcpkgs/evolution-data-server/patches/gir.patch diff --git a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake b/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake deleted file mode 100644 index 8be55b42070..00000000000 --- a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake +++ /dev/null @@ -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) - diff --git a/srcpkgs/evolution-data-server/files/iconv-detect.h b/srcpkgs/evolution-data-server/files/iconv-detect.h deleted file mode 100644 index 46f476d5bc9..00000000000 --- a/srcpkgs/evolution-data-server/files/iconv-detect.h +++ /dev/null @@ -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" diff --git a/srcpkgs/evolution-data-server/patches/gir.patch b/srcpkgs/evolution-data-server/patches/gir.patch new file mode 100644 index 00000000000..c6a5832e2a4 --- /dev/null +++ b/srcpkgs/evolution-data-server/patches/gir.patch @@ -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} diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 8ccf9cb6eb0..285f828994d 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,12 +1,13 @@ # 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 +configure_args="-DENABLE_UOA=OFF -DCMAKE_BUILD_TYPE=None $(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 +16,34 @@ short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " 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() { From 1ee7726dbd84a766c3424f3d8705a20763c8ab40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 21:22:21 +0700 Subject: [PATCH 2/4] evolution: update to 3.38.3. --- srcpkgs/evolution/template | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 103eaa8383a..92fba353238 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,12 +1,12 @@ # Template file for 'evolution' pkgname=evolution -version=3.38.0 -revision=2 +version=3.38.3 +revision=1 build_style=cmake -build_helper="gir qemu" +build_helper="qemu" configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON" -hostmakedepends="gobject-introspection intltool itstool pkg-config glib-devel" +hostmakedepends="intltool itstool pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel libcanberra-devel libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel @@ -18,15 +18,10 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f81cc40f54aa2d059da4f3a94eb09362e81513306c974a41ca7895b9c8957c5d +checksum=7fac6226c5626f290b4bdeebd85b1e2c822a250ede53998b4970ddb92585dacd shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so" -build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi - evolution-devel_package() { depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel ${sourcepkg}>=${version}_${revision}" From 896759b72a217c36d1b72606ef963ab28acf6d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 21:27:40 +0700 Subject: [PATCH 3/4] folks: enable gir on cross --- srcpkgs/folks/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index b076b94bea2..0a120ec6d11 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,7 +1,7 @@ # Template file for 'folks' pkgname=folks version=0.14.0 -revision=1 +revision=2 build_style=meson build_helper="gir qemu" configure_args="-Db_lto=false" @@ -19,9 +19,7 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=d6e778da637d3b33fd9a6b45115e8157d8868211dc08b943d1075b5eb7282bb9 build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi +build_options_default="gir" folks-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From ca64b93a662e7ade3233ddb1a0b87f2a117a3b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Feb 2021 21:34:13 +0700 Subject: [PATCH 4/4] gnome-online-miners: don't have gir --- srcpkgs/gnome-online-miners/template | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template index 43b21bf5b9c..f7c56319b20 100644 --- a/srcpkgs/gnome-online-miners/template +++ b/srcpkgs/gnome-online-miners/template @@ -1,12 +1,11 @@ # Template file for 'gnome-online-miners' pkgname=gnome-online-miners version=3.34.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel - $(vopt_if gir gobject-introspection)" +hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" makedepends="libzapojit-devel libgdata-devel grilo-devel tracker-devel gfbgraph-devel gnome-online-accounts-devel" depends="libzapojit>=0.0.3_3" @@ -16,8 +15,3 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8 - -build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi