diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-17 10:33:17 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-17 10:59:05 +0000 |
| commit | 731d5b74ea37819053d82f52a95c8966de27df60 (patch) | |
| tree | b46610c9ba7b3963ada87f77c6fe656288edf5a9 | |
| parent | cbcc826544bb181d3d1ccbe5f7f3c45db569a4fb (diff) | |
| download | aports-731d5b74ea37819053d82f52a95c8966de27df60.tar.bz2 aports-731d5b74ea37819053d82f52a95c8966de27df60.tar.xz | |
testing/evolution-data-server: upgrade to 3.24.1
| -rw-r--r-- | testing/evolution-data-server/APKBUILD | 33 | ||||
| -rw-r--r-- | testing/evolution-data-server/iconv-10646.patch | 13 |
2 files changed, 16 insertions, 30 deletions
diff --git a/testing/evolution-data-server/APKBUILD b/testing/evolution-data-server/APKBUILD index c58893915a..09f76dee10 100644 --- a/testing/evolution-data-server/APKBUILD +++ b/testing/evolution-data-server/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=evolution-data-server -pkgver=3.22.4 -pkgrel=1 +pkgver=3.24.1 +pkgrel=0 pkgdesc="data server for evolution" url="http://projects.gnome.org/evolution" arch="all" @@ -11,34 +11,33 @@ depends= options="suid" depends_dev="libgdata-dev db-dev gcr-dev libical-dev icu-dev" makedepends="$depends_dev gperf flex bison glib-dev gtk+3.0-dev libsecret-dev - libsoup-dev libxml2-dev nss-dev sqlite-dev" + libsoup-dev libxml2-dev nss-dev sqlite-dev krb5-dev gnu-libiconv-dev + openldap-dev libgdata-dev json-glib-dev webkit2gtk-dev libgweather-dev" install="" subpackages="$pkgname-dev $pkgname-lang" source="http://download.gnome.org/sources/evolution-data-server/${pkgver%.*}/evolution-data-server-${pkgver}.tar.xz - iconv-10646.patch " builddir="${srcdir}/${pkgname}-${pkgver}" build() { - cd "$builddir" - DATADIRNAME=share \ - ac_cv_libiconv_utf8=yes \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-goa \ - --disable-uoa \ - --disable-weather \ - --disable-google-auth \ + mkdir -p "$builddir"/build + cd "$builddir"/build + CFLAGS="$CFLAGS -I/usr/include/gnu-libiconv" \ + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_GOA=OFF \ + -DENABLE_UOA=OFF \ + .. \ || return 1 make || return 1 } package() { - cd "$builddir" + cd "$builddir"/build make DESTDIR="$pkgdir" install || return 1 } -sha512sums="38773c4ac65e69b02fd6d5abb0db843f038c383391e1c1006e54bda518f89741b6637f480d70e3cd79b31a812190d55ceec5c8b187d62d9ce582b0d6c362850c evolution-data-server-3.22.4.tar.xz -d27f89cd27e17cada8fde114a675de8e883e0e77a368ac10051e238d2962234797bfaedc20d5480fd3729099c677cb73e36f45e40e1707c0135ec0323d37da96 iconv-10646.patch" +sha512sums="87162639b37f1b343e9917a2ffb6ee6f54bbe92ed54974f83318070b24c590aa840f989195c00b0289f322ab1925a7b6ac07b303227adab14d3fb74ff96d86ac evolution-data-server-3.24.1.tar.xz" diff --git a/testing/evolution-data-server/iconv-10646.patch b/testing/evolution-data-server/iconv-10646.patch deleted file mode 100644 index d3fee764f2..0000000000 --- a/testing/evolution-data-server/iconv-10646.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./camel/camel-iconv.c.orig -+++ ./camel/camel-iconv.c -@@ -38,6 +38,10 @@ - #include "camel-iconv.h" - #include "iconv-detect.h" - -+#ifndef ICONV_10646 -+#define ICONV_10646 "iso-10646" -+#endif /*ICONV_10646*/ -+ - #define cd(x) - - G_LOCK_DEFINE_STATIC (iconv); |