diff --git a/srcpkgs/evolution/files/disableRuntimeTests.cmake b/srcpkgs/evolution/files/disableRuntimeTests.cmake deleted file mode 100644 index 8be55b42070..00000000000 --- a/srcpkgs/evolution/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/files/iconv-detect.h b/srcpkgs/evolution/files/iconv-detect.h deleted file mode 100644 index 46f476d5bc9..00000000000 --- a/srcpkgs/evolution/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/template b/srcpkgs/evolution/template index 560ed93da02..aa3fa34bc4c 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,54 +1,33 @@ # Template file for 'evolution' pkgname=evolution -version=3.36.1 +version=3.38.0 revision=1 build_style=cmake +build_helper="gir qemu" configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF - -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF - -DENABLE_WEATHER=$(vopt_if gir ON OFF)" + -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON" hostmakedepends="gnome-doc-utils gobject-introspection intltool itstool - pkg-config" + pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel gtkhtml-devel libcanberra-devel - $(vopt_if gir libgweather-devel) libnotify-devel webkit2gtk-devel ytnef-devel + libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel gnome-desktop-devel" depends="gnome-keyring" short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " 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-36/NEWS" +changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=873acf1dbec38e67e169064645ac3a9b9a944bd2b633161df6e5f05700e36cb8 +checksum=f81cc40f54aa2d059da4f3a94eb09362e81513306c974a41ca7895b9c8957c5d 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" -else - hostmakedepends+=" glib-devel" fi -# 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 -} - evolution-devel_package() { depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel gtkhtml-devel ${sourcepkg}>=${version}_${revision}"