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

Conflicts:
	community/gnash/PKGBUILD
	community/libopenraw/PKGBUILD
	community/smalltalk/PKGBUILD
	core/coreutils/PKGBUILD
	core/libarchive/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gmime/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/lirc/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/sdl_net/PKGBUILD
	extra/sdl_ttf/PKGBUILD
	extra/spamassassin/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/tumbler/PKGBUILD
	extra/vim/PKGBUILD
	extra/wipe/PKGBUILD
	extra/xfce4-netload-plugin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kde-np.pam
	kde-unstable/kdebase-workspace/kde.pam
	multilib/binutils-multilib/PKGBUILD
	multilib/chuck/PKGBUILD
	multilib/dev86/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-glibc/lib32-glibc.conf
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/lib32-sdl_ttf/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD
	multilib/q4wine/PKGBUILD
	multilib/wine/PKGBUILD
	staging/php/PKGBUILD
	staging/php/php-fpm.conf.in.patch
	staging/php/php.ini.patch

3 files changed, 87 insertions, 8 deletions

diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD
index 2ee30ffae..4d68c6f0e 100644
--- a/extra/mail-notification/PKGBUILD
+++ b/extra/mail-notification/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 139560 2011-10-03 13:09:05Z jgc $
+# $Id: PKGBUILD 146721 2012-01-16 19:51:02Z dreisner $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=mail-notification
 pkgver=5.4
-pkgrel=9
+pkgrel=10
 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=('gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
+depends=('gmime' 'libnotify' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
 makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2')
 options=('!libtool' '!emptydirs')
 install=mail-notification.install
@@ -16,7 +16,6 @@ source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}
         dont-update-cache.patch
         remove-ubuntu-special-case.patch
         mail-notification-5.4-evolution.patch
-        gmime-2.4.patch
         mail-notification-5.4-sasl_encode64.patch
         mail-notification-5.4-evolution-gtkhtml.patch
         mail-notification-5.4-camel_headers.patch
@@ -26,12 +25,13 @@ source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}
         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)
+        mail-notification-5.4-add-fallback-icon.patch
+        mail-notification-5.4-gmime.patch
+        mail-notification-5.4-libx11.patch)
 md5sums=('c8dc33a61251acb5474e56eab6b18f43'
          '6007bc30e789dab0a8282038e0335eb9'
          '9cadd61bbd9c324b2916ec980231e0f2'
          'aa6f80820899f904c25988772f70ade9'
-         '447cc20f035b9cf1a391027684ce1297'
          '125513ed059f62469377eb0ab794dbed'
          'c595a3962ab13a65be24a941e28faa9c'
          'f79939f593b2e8659e302df72c2b54b1'
@@ -41,7 +41,9 @@ md5sums=('c8dc33a61251acb5474e56eab6b18f43'
          'c7991b831834724eddc1c6802c3e06a6'
          'b370b1085ebb2814bd5d345a6d2b45ea'
          '1ba948759110787dd57097cff157b75a'
-         '09df61b4dc29c676ac81ff9054e840ac')
+         '09df61b4dc29c676ac81ff9054e840ac'
+         '0944695e9b9b30f39028f85c83c6a7e2'
+         'c3f643ef16aab3b4fe9ff5b333bff41a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -49,7 +51,6 @@ build() {
   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}/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"
@@ -60,6 +61,8 @@ build() {
   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"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-gmime.patch"
+  patch -Np1 -i "${srcdir}/mail-notification-5.4-libx11.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
diff --git a/extra/mail-notification/mail-notification-5.4-gmime.patch b/extra/mail-notification/mail-notification-5.4-gmime.patch
new file mode 100644
index 000000000..5f516a46b
--- /dev/null
+++ b/extra/mail-notification/mail-notification-5.4-gmime.patch
@@ -0,0 +1,63 @@
+diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c
+--- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
++++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:28.000000000 +0300
+@@ -265,7 +265,7 @@
+ 	    mime_message = g_mime_parser_construct_message(parser);
+ 	    if (mime_message)
+ 	      {
+-		if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
++		if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
+ 		  {
+ #if WITH_MOZILLA
+ 		    type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;
+diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c
+--- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
++++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:46:47.000000000 +0300
+@@ -167,7 +167,7 @@
+ 	
+     const char *header;
+ 
+-    header = g_mime_message_get_header(mime_message, header_name);
++    header = g_mime_object_get_header(mime_message, header_name);
+     if (header && mn_str_ishex(header))
+       return strtol(header, NULL, 16);
+     else
+diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c
+--- mail-notification-5.4/jbsrc/jb.c	2008-05-22 19:47:04.000000000 +0400
++++ mail-notification-5.4-OK/jbsrc/jb.c	2008-12-23 14:43:09.000000000 +0300
+@@ -166,7 +166,7 @@
+   jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
+   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
+ 
+-  jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
++  jb_check_packages_for_options("GMime", "gmime", "gmime-2.6",
+ 				"hotmail",
+ 				"imap",
+ 				"maildir",
+diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c
+--- mail-notification-5.4/src/mn-message-mime.c	2008-05-22 19:45:35.000000000 +0400
++++ mail-notification-5.4-OK/src/mn-message-mime.c	2008-12-23 14:46:35.000000000 +0300
+@@ -33,12 +33,12 @@
+   g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
+ 
+   /* SpamAssassin */
+-  spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
++  spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
+   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
+     return TRUE;
+ 
+   /* bogofilter */
+-  spam = g_mime_message_get_header(mime_message, "X-Bogosity");
++  spam = g_mime_object_get_header(mime_message, "X-Bogosity");
+   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
+     return TRUE;
+ 
+@@ -89,7 +89,7 @@
+     {
+       const char *status;
+ 
+-      status = g_mime_message_get_header(mime_message, "Status");
++      status = g_mime_object_get_header(mime_message, "Status");
+       if (status && strchr(status, 'R'))
+ 	return NULL;		/* the message was read */
+       else if (status && strchr(status, 'O'))
diff --git a/extra/mail-notification/mail-notification-5.4-libx11.patch b/extra/mail-notification/mail-notification-5.4-libx11.patch
new file mode 100644
index 000000000..bb3574fda
--- /dev/null
+++ b/extra/mail-notification/mail-notification-5.4-libx11.patch
@@ -0,0 +1,13 @@
+Link with libX11 explicitly.
+
+--- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c
++++ mail-notification-5.4.dfsg.1/jbsrc/jb.c
+@@ -445,6 +445,8 @@
+ 
+   jb_compile_options_add_libs(object->compile_options, "-lm");
+ 
++  jb_compile_options_add_libs(object->compile_options, "-lX11");
++
+   jb_compile_options_add_package(object->compile_options, "gettext");
+   jb_compile_options_add_package(object->compile_options, "gnome");
+   jb_compile_options_add_package(object->compile_options, "dbus");