diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
commit | 36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch) | |
tree | 397141926cac78871a3e9d53cd8fb824bc1b9cd3 /extra/evolution | |
parent | 0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff) | |
parent | 5827948456201df72a1bd73e87977c569129fb27 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/percona-server/PKGBUILD
community/xmlrpc-c/PKGBUILD
core/util-linux/PKGBUILD
extra/colord/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/gcr/PKGBUILD
extra/gdm/PKGBUILD
extra/gnome-color-manager/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-dictionary/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-search-tool/PKGBUILD
extra/gnome-system-log/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gvfs/PKGBUILD
extra/json-glib/PKGBUILD
extra/libgnome-keyring/PKGBUILD
extra/nautilus-open-terminal/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/seahorse/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-xinit/PKGBUILD
extra/yelp/PKGBUILD
Diffstat (limited to 'extra/evolution')
-rw-r--r-- | extra/evolution/PKGBUILD | 22 | ||||
-rw-r--r-- | extra/evolution/evolution.install | 13 |
2 files changed, 12 insertions, 23 deletions
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 7af0121ec..4408865ef 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165232 2012-08-13 21:29:21Z jgc $ +# $Id: PKGBUILD 169868 2012-10-30 22:25:13Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.4.4 -pkgrel=1.1 +pkgver=3.6.1 +pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') +depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') +makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager') optdepends=('bogofilter: possible junk filter plugin' 'spamassassin: possible junk filter plugin') groups=('gnome-extra') @@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a') +sha256sums=('7aa0730d6815cc44dbde75b4464697dd9d51584f48e9e03e86c2e5ca5a97a521') build() { cd $pkgname-$pkgver @@ -29,20 +29,14 @@ build() { --with-openldap=yes \ --enable-smime=yes \ --with-krb5=/usr \ - --disable-image-inline + --disable-schemas-compile 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 - make -C plugins/tnef-attachments } package() { cd $pkgname-$pkgver - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - make -C plugins/tnef-attachments DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas + make DESTDIR="$pkgdir" install } diff --git a/extra/evolution/evolution.install b/extra/evolution/evolution.install index 500c5e2da..67eca41f0 100644 --- a/extra/evolution/evolution.install +++ b/extra/evolution/evolution.install @@ -1,24 +1,19 @@ post_install() { glib-compile-schemas /usr/share/glib-2.0/schemas - gconfpkg --install evolution update-desktop-database -q gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { - pre_remove + if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then + gconfpkg --uninstall evolution + fi } post_upgrade() { post_install } -pre_remove() { - gconfpkg --uninstall evolution -} - post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + post_install } |