Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/clementine/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/redis/PKGBUILD
	community/uzbl/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gdl/PKGBUILD
	extra/glade/PKGBUILD
	extra/glibmm/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-nettool/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/redland/PKGBUILD
	extra/vte/PKGBUILD
	extra/xarchiver/PKGBUILD
	extra/yelp/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/mesa/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD

1 files changed, 42 insertions, 14 deletions

diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD
index 5852c3de7..f4a978457 100644
--- a/extra/mail-notification/PKGBUILD
+++ b/extra/mail-notification/PKGBUILD
@@ -1,53 +1,81 @@
-# $Id: PKGBUILD 112858 2011-03-07 09:46:50Z ibiru $
+# $Id: PKGBUILD 119734 2011-04-14 10:44:43Z jgc $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=mail-notification
 pkgver=5.4
-pkgrel=7
+pkgrel=8
 pkgdesc="Tray icon application that informs you if you have new mail"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/mailnotify/"
 license=('GPL3' 'FDL')
-depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnomeui')
+depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
 makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=mail-notification.install
 source=(http://savannah.nongnu.org/download/mailnotify/${pkgname}-${pkgver}.tar.bz2
         dont-update-cache.patch
         remove-ubuntu-special-case.patch
+        mail-notification-5.4-evolution.patch
         gmime-2.4.patch
-        evolution-gtkhtml.patch
-        evolution.patch
+        mail-notification-5.4-sasl_encode64.patch
+        mail-notification-5.4-evolution-gtkhtml.patch
+        mail-notification-5.4-camel_headers.patch
         mail-notification-5.4-icons.patch
-        mail-notification-5.4-camel_headers.patch)
+        mail-notification-5.4-weak.patch
+        mail-notification-5.4-popup-attach.patch
+        mail-notification-5.4-kde-trayicon.patch
+        mail-notification-5.4-evolution-3-0-support.patch
+        mail-notification-5.4-gtk3-support.patch
+        mail-notification-5.4-add-fallback-icon.patch)
 md5sums=('c8dc33a61251acb5474e56eab6b18f43'
          '6007bc30e789dab0a8282038e0335eb9'
          '9cadd61bbd9c324b2916ec980231e0f2'
+         'aa6f80820899f904c25988772f70ade9'
          '447cc20f035b9cf1a391027684ce1297'
-         '500b2e42fbc5078e61407923a07b6e94'
-         '46568640b7f97ab9ab7b54d49bee7e8e'
-         '8f602891a694ceaa91f845d97ae51b39'
-         'f79939f593b2e8659e302df72c2b54b1')
+         '125513ed059f62469377eb0ab794dbed'
+         'c595a3962ab13a65be24a941e28faa9c'
+         'f79939f593b2e8659e302df72c2b54b1'
+         '244b7ef2aec7656e8df390be87c10e2b'
+         '31bde95dfd39449959d8b3316f91429c'
+         'cdead6a88d1779f69a5f40dc75d5cb84'
+         'c7991b831834724eddc1c6802c3e06a6'
+         '49fe910f68393b0f6a1f1bcb7a8bdcd3'
+         '55ed1aeb56ca053cc1a0a6062761c2b4'
+         '09df61b4dc29c676ac81ff9054e840ac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np0 -i "${srcdir}/dont-update-cache.patch"
   patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution.patch"
   patch -Np1 -i "${srcdir}/gmime-2.4.patch"
-  patch -Np1 -i "${srcdir}/evolution-gtkhtml.patch"
-  patch -Np0 -i "${srcdir}/evolution.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-icons.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-sasl_encode64.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution-gtkhtml.patch"
   patch -Np1 -i "${srcdir}/mail-notification-5.4-camel_headers.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-icons.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-weak.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-popup-attach.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-kde-trayicon.patch"
+  patch -Np0 -i "${srcdir}/mail-notification-5.4-evolution-3-0-support.patch"
+  patch -Np0 -i "${srcdir}/mail-notification-5.4-gtk3-support.patch"
+  patch -Np0 -i "${srcdir}/mail-notification-5.4-add-fallback-icon.patch"
+
+  gtk-builder-convert ui/mailbox-properties-dialog.glade ui/mailbox-properties-dialog.ui
+  gtk-builder-convert ui/properties-dialog.glade ui/properties-dialog.ui
 
   ./jb configure prefix=/usr sysconfdir=/etc \
       localstatedir=/var destdir="${pkgdir}" \
-      gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=yes \
+      gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=no \
       cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
       library-mode=0755
   ./jb build
   GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./jb install
 
+  rm -f "${pkgdir}/usr/share/mail-notification/"*.glade
+  install -m644 ui/mailbox-properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
+  install -m644 ui/properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
+
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain mail-notification ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas