From a8137c0d834f8224d0d271f0e7fb6bbdf407c74a Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Thu, 6 Apr 2017 12:07:45 -0600 Subject: [PATCH 1/3] evolution-data-server: update to 3.24.0 --- common/shlibs | 5 ++- .../evolution-data-server/patches/cmake.patch | 13 +++++++ .../patches/iconv_10646.patch | 14 -------- srcpkgs/evolution-data-server/template | 34 ++++++++++--------- 4 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 srcpkgs/evolution-data-server/patches/cmake.patch delete mode 100644 srcpkgs/evolution-data-server/patches/iconv_10646.patch diff --git a/common/shlibs b/common/shlibs index b36807f6dd..6710e11940 100644 --- a/common/shlibs +++ b/common/shlibs @@ -565,15 +565,14 @@ libical_cxx.so.2 libical-2.0.0_1 libicalss.so.2 libical-2.0.0_1 libicalss_cxx.so.2 libical-2.0.0_1 libicalvcal.so.2 libical-2.0.0_1 -libcamel-1.2.so.59 evolution-data-server-3.22.0_1 libedataserver-1.2.so.22 evolution-data-server-3.22.0_1 -libcamel-1.2.so.59 evolution-data-server-3.22.0_1 +libcamel-1.2.so.60 evolution-data-server-3.24.0_1 libedataserver-1.2.so.22 evolution-data-server-3.22.0_1 libebackend-1.2.so.10 evolution-data-server-3.17.90_1 libedataserverui-1.2.so.1 evolution-data-server-3.8.0_1 libebook-contacts-1.2.so.2 evolution-data-server-3.17.90_1 libedata-book-1.2.so.25 evolution-data-server-3.8.0_1 -libebook-1.2.so.16 evolution-data-server-3.8.0_1 +libebook-1.2.so.19 evolution-data-server-3.24.0_1 libecal-1.2.so.19 evolution-data-server-3.18.0_1 libedata-cal-1.2.so.28 evolution-data-server-3.18.0_1 libgdata.so.19 libgdata-0.15.0_1 diff --git a/srcpkgs/evolution-data-server/patches/cmake.patch b/srcpkgs/evolution-data-server/patches/cmake.patch new file mode 100644 index 0000000000..b97690d7e2 --- /dev/null +++ b/srcpkgs/evolution-data-server/patches/cmake.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt 2017-03-20 02:47:25.000000000 -0600 ++++ CMakeLists.txt 2017-04-05 18:02:54.871910269 -0600 +@@ -524,10 +524,6 @@ + CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + unset(CMAKE_REQUIRED_LIBRARIES) + +-if(NOT _correct_iconv) +- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") +-endif(NOT _correct_iconv) +- + # ****************************** + # Backtraces for debugging + # ****************************** diff --git a/srcpkgs/evolution-data-server/patches/iconv_10646.patch b/srcpkgs/evolution-data-server/patches/iconv_10646.patch deleted file mode 100644 index 1f42bdf5f3..0000000000 --- a/srcpkgs/evolution-data-server/patches/iconv_10646.patch +++ /dev/null @@ -1,14 +0,0 @@ -Add a definition for ICONV_10646 in case it's missing - ---- camel/camel-iconv.h 2014-03-24 10:07:52.000000000 +0100 -+++ camel/camel-iconv.h 2015-06-01 08:41:44.271620227 +0200 -@@ -28,6 +28,9 @@ - #include - #include - #include -+#ifndef ICONV_10646 -+#define ICONV_10646 "iso-10646" -+#endif - - G_BEGIN_DECLS - diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index b692bba127..1c3b6a11d9 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,13 +1,9 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.22.6 -revision=2 -build_style=gnu-configure -configure_args="--with-openldap --disable-uoa - --with-krb5=${XBPS_CROSS_BASE}/usr - --with-nspr-includes=${XBPS_CROSS_BASE}/usr/include/nspr - --with-nss-includes=${XBPS_CROSS_BASE}/usr/include/nss - --disable-google-auth $(vopt_enable gir vala-bindings)" +version=3.24.0 +revision=1 +build_style=cmake +configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF" hostmakedepends="pkg-config intltool flex glib-devel gperf $(vopt_if gir gobject-introspection)" makedepends="db-devel sqlite-devel mit-krb5-devel nss-devel libical-devel libsecret-devel libsoup-gnome-devel gcr-devel libldap-devel @@ -16,9 +12,10 @@ depends="libsoup-gnome>=2.46 libgweather>=3.12" short_desc="Centralized access to appointments and contacts" maintainer="Juan RP " license="GPL-2" -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=0a69b9d2c03f7a6f68abbd7c7f8c76d333aca9e6102e796d88daed3284e91ca6 +checksum=41ddb60b08ee287e82be52ebbe49b5a336984e52584a5fd34c82d45493f8031b +nocross=yes case "$XBPS_TARGET_MACHINE" in aarch64*) broken="webkit2gtk broken for now";; @@ -29,14 +26,19 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi +if [ ! -z "$build_option_gir" ]; then + configure_args+=" -DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON" +fi + pre_configure() { - if [ "$CROSS_BUILD" ]; then - # Create iconv-detect.h for cross builds - echo '/* This is an auto-generated header, DO NOT EDIT! */' > iconv-detect.h - echo >>iconv-detect.h - echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >>iconv-detect.h - echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h + if [ ! -d "build" ]; then + mkdir build fi + echo '/* This is an auto-generated header, DO NOT EDIT! */' > build/iconv-detect.h + echo >> build/iconv-detect.h + echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >> build/iconv-detect.h + echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >> build/iconv-detect.h + echo '#define ICONV_10646 "iso-10646"' >> build/iconv-detect.h } post_install() { # Fix broken pkg-config From c439e80ad6496bc60c2894d4783f5e62f4d5ce56 Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Thu, 6 Apr 2017 12:11:31 -0600 Subject: [PATCH 2/3] folks: soname rebuild --- srcpkgs/folks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 87290a4714..2c72af51c3 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,7 +1,7 @@ # Template file for 'folks' pkgname=folks version=0.11.3 -revision=1 +revision=2 build_style=gnu-configure build_options="gir" configure_args=" From eabdc43dcb1013179d26531b1f0c49b5db7c217b Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Thu, 6 Apr 2017 14:23:16 -0600 Subject: [PATCH 3/3] evolution: update to 3.24.0 --- srcpkgs/evolution/patches/cmake.patch | 13 +++++++++++++ srcpkgs/evolution/template | 14 ++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/evolution/patches/cmake.patch diff --git a/srcpkgs/evolution/patches/cmake.patch b/srcpkgs/evolution/patches/cmake.patch new file mode 100644 index 0000000000..dfb7711178 --- /dev/null +++ b/srcpkgs/evolution/patches/cmake.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt 2017-03-20 03:14:35.000000000 -0600 ++++ CMakeLists.txt 2017-04-06 15:05:22.473504016 -0600 +@@ -350,10 +350,6 @@ + CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + unset(CMAKE_REQUIRED_LIBRARIES) + +-if(NOT _correct_iconv) +- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") +-endif(NOT _correct_iconv) +- + # ****************************** + # Timezone checks + # ****************************** diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 169fb4091c..88b11b051a 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,11 +1,10 @@ # Template file for 'evolution' pkgname=evolution -version=3.22.6 +version=3.24.0 revision=1 -build_style=gnu-configure -configure_args="--disable-pst-import --with-openldap --disable-bogofilter - --with-krb5=/usr --disable-schemas-compile --disable-static --disable-spamassassin - --disable-text-highlight --disable-gtkspell --disable-autoar --disable-libcryptui" +build_style=cmake +configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF + -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends=" libgdata-devel webkit2gtk-devel evolution-data-server-devel @@ -17,9 +16,9 @@ depends="gtkhtml>=4.6 gnome-keyring gnome-icon-theme hicolor-icon-theme desktop- short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Juan RP " license="GPL-2" -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=9f4be4a1d5ee4d5eb9b132cf751ba3afc833025aa6dc7baa1f9483489d8a943e +checksum=50813222ecf5593b526fedb7b88748df9d58f3417d6c999f59d6f420e80c8514 evolution-devel_package() { depends="GConf-devel gtkhtml-devel>=4.6.0 evolution-data-server-devel @@ -28,6 +27,5 @@ evolution-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc } }