[arch-commits] Commit in evolution/repos (8 files)

Antonio Rojas arojas at archlinux.org
Mon Jan 11 21:42:23 UTC 2016


    Date: Monday, January 11, 2016 @ 22:42:22
  Author: arojas
Revision: 257954

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  evolution/repos/staging-i686/
  evolution/repos/staging-i686/PKGBUILD
    (from rev 257953, evolution/trunk/PKGBUILD)
  evolution/repos/staging-i686/df0e8e.patch
    (from rev 257953, evolution/trunk/df0e8e.patch)
  evolution/repos/staging-i686/evolution.install
    (from rev 257953, evolution/trunk/evolution.install)
  evolution/repos/staging-x86_64/
  evolution/repos/staging-x86_64/PKGBUILD
    (from rev 257953, evolution/trunk/PKGBUILD)
  evolution/repos/staging-x86_64/df0e8e.patch
    (from rev 257953, evolution/trunk/df0e8e.patch)
  evolution/repos/staging-x86_64/evolution.install
    (from rev 257953, evolution/trunk/evolution.install)

----------------------------------+
 staging-i686/PKGBUILD            |   73 +++++++++++++++++++++++++++++++++++++
 staging-i686/df0e8e.patch        |   22 +++++++++++
 staging-i686/evolution.install   |   19 +++++++++
 staging-x86_64/PKGBUILD          |   73 +++++++++++++++++++++++++++++++++++++
 staging-x86_64/df0e8e.patch      |   22 +++++++++++
 staging-x86_64/evolution.install |   19 +++++++++
 6 files changed, 228 insertions(+)

Copied: evolution/repos/staging-i686/PKGBUILD (from rev 257953, evolution/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2016-01-11 21:42:22 UTC (rev 257954)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=evolution
+pkgname=('evolution' 'evolution-bogofilter' 'evolution-spamassassin')
+pkgver=3.18.3
+pkgrel=2
+pkgdesc="Manage your email, contacts and schedule"
+arch=(i686 x86_64)
+license=(GPL)
+makedepends=(intltool itstool docbook-xsl networkmanager bogofilter spamassassin highlight gnome-desktop evolution-data-server libcanberra libpst libytnef desktop-file-utils dconf gtkspell3 webkitgtk libcryptui gnome-common gtk-doc)
+options=('!emptydirs')
+url=https://wiki.gnome.org/Apps/Evolution
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz df0e8e.patch)
+sha256sums=('f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9'
+            'df14c084468834cd4389313a22444fe3c906eadc3379c5b3a17fd99f1fba8bcc')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build with libical 2.0 https://bugzilla.gnome.org/show_bug.cgi?id=760365
+  patch -p1 -i ../df0e8e.patch
+}
+
+build() {
+  cd $pkgbase-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib \
+      --enable-nss=yes \
+      --with-openldap=yes \
+      --enable-smime=yes \
+      --disable-schemas-compile \
+      --disable-autoar \
+      --enable-gtk-doc
+  
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package_evolution() {
+  depends=(gnome-desktop evolution-data-server libcanberra libpst libytnef
+           desktop-file-utils dconf gtkspell3 libcryptui webkitgtk)
+  install=evolution.install
+  optdepends=('highlight: text highlight plugin'
+              'evolution-spamassassin: Spamassassin spam check plugin'
+              'evolution-bogofilter: Bogofilter spam check plugin')
+  groups=('gnome-extra')
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  mkdir ../plugins
+  mv "$pkgdir/usr/lib/evolution/modules/module-bogofilter.so" ../plugins/
+  mv "$pkgdir/usr/lib/evolution/modules/module-spamassassin.so" ../plugins/
+  mv "$pkgdir/usr/share/appdata/evolution-bogofilter.metainfo.xml" ../plugins/
+  mv "$pkgdir/usr/share/appdata/evolution-spamassassin.metainfo.xml" ../plugins/
+}
+
+
+package_evolution-bogofilter() {
+  depends=("evolution=$pkgver" 'bogofilter')
+  install -Dm755 plugins/module-bogofilter.so "$pkgdir/usr/lib/evolution/modules/module-bogofilter.so"
+  install -Dm644 plugins/evolution-bogofilter.metainfo.xml "$pkgdir/usr/share/appdata/evolution-bogofilter.metainfo.xml"
+}
+
+package_evolution-spamassassin() {
+  depends=("evolution=$pkgver" 'spamassassin')
+  install -Dm755 plugins/module-spamassassin.so "$pkgdir/usr/lib/evolution/modules/module-spamassassin.so"
+  install -Dm644 plugins/evolution-spamassassin.metainfo.xml "$pkgdir/usr/share/appdata/evolution-spamassassin.metainfo.xml"
+}

Copied: evolution/repos/staging-i686/df0e8e.patch (from rev 257953, evolution/trunk/df0e8e.patch)
===================================================================
--- staging-i686/df0e8e.patch	                        (rev 0)
+++ staging-i686/df0e8e.patch	2016-01-11 21:42:22 UTC (rev 257954)
@@ -0,0 +1,22 @@
+From df0e8e5fc9b95ee5c60b4734066c7c541377bbf4 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas at archlinux.org>
+Date: Mon, 11 Jan 2016 22:08:39 +0100
+Subject: [PATCH] Bug 760365 - [Calendar] Include libical/vcc.h directly
+
+This fixes a build break when using libical 2.0.
+---
+ calendar/importers/icalendar-importer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
+index 14f75a8..c255315 100644
+--- a/calendar/importers/icalendar-importer.c
++++ b/calendar/importers/icalendar-importer.c
+@@ -36,6 +36,7 @@
+ 
+ #include <libecal/libecal.h>
+ #include <libical/icalvcal.h>
++#include <libical/vcc.h>
+ 
+ #include "shell/e-shell.h"
+ 

Copied: evolution/repos/staging-i686/evolution.install (from rev 257953, evolution/trunk/evolution.install)
===================================================================
--- staging-i686/evolution.install	                        (rev 0)
+++ staging-i686/evolution.install	2016-01-11 21:42:22 UTC (rev 257954)
@@ -0,0 +1,19 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then
+    gconfpkg --uninstall evolution
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Copied: evolution/repos/staging-x86_64/PKGBUILD (from rev 257953, evolution/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2016-01-11 21:42:22 UTC (rev 257954)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=evolution
+pkgname=('evolution' 'evolution-bogofilter' 'evolution-spamassassin')
+pkgver=3.18.3
+pkgrel=2
+pkgdesc="Manage your email, contacts and schedule"
+arch=(i686 x86_64)
+license=(GPL)
+makedepends=(intltool itstool docbook-xsl networkmanager bogofilter spamassassin highlight gnome-desktop evolution-data-server libcanberra libpst libytnef desktop-file-utils dconf gtkspell3 webkitgtk libcryptui gnome-common gtk-doc)
+options=('!emptydirs')
+url=https://wiki.gnome.org/Apps/Evolution
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz df0e8e.patch)
+sha256sums=('f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9'
+            'df14c084468834cd4389313a22444fe3c906eadc3379c5b3a17fd99f1fba8bcc')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build with libical 2.0 https://bugzilla.gnome.org/show_bug.cgi?id=760365
+  patch -p1 -i ../df0e8e.patch
+}
+
+build() {
+  cd $pkgbase-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib \
+      --enable-nss=yes \
+      --with-openldap=yes \
+      --enable-smime=yes \
+      --disable-schemas-compile \
+      --disable-autoar \
+      --enable-gtk-doc
+  
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package_evolution() {
+  depends=(gnome-desktop evolution-data-server libcanberra libpst libytnef
+           desktop-file-utils dconf gtkspell3 libcryptui webkitgtk)
+  install=evolution.install
+  optdepends=('highlight: text highlight plugin'
+              'evolution-spamassassin: Spamassassin spam check plugin'
+              'evolution-bogofilter: Bogofilter spam check plugin')
+  groups=('gnome-extra')
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  mkdir ../plugins
+  mv "$pkgdir/usr/lib/evolution/modules/module-bogofilter.so" ../plugins/
+  mv "$pkgdir/usr/lib/evolution/modules/module-spamassassin.so" ../plugins/
+  mv "$pkgdir/usr/share/appdata/evolution-bogofilter.metainfo.xml" ../plugins/
+  mv "$pkgdir/usr/share/appdata/evolution-spamassassin.metainfo.xml" ../plugins/
+}
+
+
+package_evolution-bogofilter() {
+  depends=("evolution=$pkgver" 'bogofilter')
+  install -Dm755 plugins/module-bogofilter.so "$pkgdir/usr/lib/evolution/modules/module-bogofilter.so"
+  install -Dm644 plugins/evolution-bogofilter.metainfo.xml "$pkgdir/usr/share/appdata/evolution-bogofilter.metainfo.xml"
+}
+
+package_evolution-spamassassin() {
+  depends=("evolution=$pkgver" 'spamassassin')
+  install -Dm755 plugins/module-spamassassin.so "$pkgdir/usr/lib/evolution/modules/module-spamassassin.so"
+  install -Dm644 plugins/evolution-spamassassin.metainfo.xml "$pkgdir/usr/share/appdata/evolution-spamassassin.metainfo.xml"
+}

Copied: evolution/repos/staging-x86_64/df0e8e.patch (from rev 257953, evolution/trunk/df0e8e.patch)
===================================================================
--- staging-x86_64/df0e8e.patch	                        (rev 0)
+++ staging-x86_64/df0e8e.patch	2016-01-11 21:42:22 UTC (rev 257954)
@@ -0,0 +1,22 @@
+From df0e8e5fc9b95ee5c60b4734066c7c541377bbf4 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas at archlinux.org>
+Date: Mon, 11 Jan 2016 22:08:39 +0100
+Subject: [PATCH] Bug 760365 - [Calendar] Include libical/vcc.h directly
+
+This fixes a build break when using libical 2.0.
+---
+ calendar/importers/icalendar-importer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
+index 14f75a8..c255315 100644
+--- a/calendar/importers/icalendar-importer.c
++++ b/calendar/importers/icalendar-importer.c
+@@ -36,6 +36,7 @@
+ 
+ #include <libecal/libecal.h>
+ #include <libical/icalvcal.h>
++#include <libical/vcc.h>
+ 
+ #include "shell/e-shell.h"
+ 

Copied: evolution/repos/staging-x86_64/evolution.install (from rev 257953, evolution/trunk/evolution.install)
===================================================================
--- staging-x86_64/evolution.install	                        (rev 0)
+++ staging-x86_64/evolution.install	2016-01-11 21:42:22 UTC (rev 257954)
@@ -0,0 +1,19 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then
+    gconfpkg --uninstall evolution
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}



More information about the arch-commits mailing list