[arch-commits] Commit in mail-notification/repos (4 files)

Giovanni Scafora giovanni at archlinux.org
Mon Oct 12 18:33:43 EDT 2009


    Date: Monday, October 12, 2009 @ 18:33:42
  Author: giovanni
Revision: 55458

Merged revisions 55455 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mail-notification/trunk

........
  r55455 | jgc | 2009-10-12 14:23:07 -0700 (lun, 12 ott 2009) | 2 lines
  
  upgpkg: mail-notification 5.4-3
      Update for gmime update, fix build with new evolution
........

Added:
  mail-notification/repos/extra-i686/evolution-gtkhtml.patch
    (from rev 55455, mail-notification/trunk/evolution-gtkhtml.patch)
  mail-notification/repos/extra-i686/gmime-2.4.patch
    (from rev 55455, mail-notification/trunk/gmime-2.4.patch)
Modified:
  mail-notification/repos/extra-i686/	(properties)
  mail-notification/repos/extra-i686/PKGBUILD

-------------------------+
 PKGBUILD                |   24 ++++++++++-------
 evolution-gtkhtml.patch |   11 ++++++++
 gmime-2.4.patch         |   63 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 9 deletions(-)


Property changes on: mail-notification/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mail-notification/trunk:1-36283
   + /mail-notification/trunk:1-55457

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-12 21:40:13 UTC (rev 55457)
+++ extra-i686/PKGBUILD	2009-10-12 22:33:42 UTC (rev 55458)
@@ -3,33 +3,39 @@
 
 pkgname=mail-notification
 pkgver=5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Tray icon application that informs you if you have new mail"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/mailnotify/"
 license=('GPL3' 'FDL')
-depends=('cyrus-sasl-plugins' 'gmime>=2.2.21' 'libnotify>=0.4.5' 'gnome-keyring>=2.26.1' 'hicolor-icon-theme' 'notification-daemon' 'libgnomeui>=2.24.1')
-makedepends=('gob2' 'intltool' 'evolution>=2.26.1.1' 'gnome-doc-utils>=0.16.0')
+depends=('cyrus-sasl-plugins' 'gmime>=2.4.10' 'libnotify>=0.4.5' 'gnome-keyring>=2.28.0' 'hicolor-icon-theme' 'notification-daemon' 'libgnomeui>=2.24.2')
+makedepends=('gob2' 'intltool' 'evolution>=2.28.0' 'gnome-doc-utils>=0.18.0')
 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)
+        remove-ubuntu-special-case.patch
+        gmime-2.4.patch
+        evolution-gtkhtml.patch)
 md5sums=('c8dc33a61251acb5474e56eab6b18f43'
          '6007bc30e789dab0a8282038e0335eb9'
-         '9cadd61bbd9c324b2916ec980231e0f2')
+         '9cadd61bbd9c324b2916ec980231e0f2'
+         '447cc20f035b9cf1a391027684ce1297'
+         '0be19731decffc2e64602b2abebabca4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np0 -i "${srcdir}/dont-update-cache.patch" || return 1
   patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch" || return 1
+  patch -Np1 -i "${srcdir}/gmime-2.4.patch" || return 1
+  patch -Np1 -i "${srcdir}/evolution-gtkhtml.patch" || return 1
 
   ./jb configure prefix=/usr sysconfdir=/etc \
-              localstatedir=/var destdir="${pkgdir}" \
-              gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=yes \
-              cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
-              library-mode=0755 || return 1
+      localstatedir=/var destdir="${pkgdir}" \
+      gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=yes \
+      cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
+      library-mode=0755 || return 1
   ./jb build || return 1
   GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./jb install || return 1
 

Copied: mail-notification/repos/extra-i686/evolution-gtkhtml.patch (from rev 55455, mail-notification/trunk/evolution-gtkhtml.patch)
===================================================================
--- extra-i686/evolution-gtkhtml.patch	                        (rev 0)
+++ extra-i686/evolution-gtkhtml.patch	2009-10-12 22:33:42 UTC (rev 55458)
@@ -0,0 +1,11 @@
+--- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c.orig	2009-10-12 23:15:03.000000000 +0200
++++ mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-10-12 23:17:26.000000000 +0200
+@@ -41,7 +41,7 @@
+   if (! minversion)
+     minversion = "2.12";
+ 
+-  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
++  packages = g_strdup_printf("evolution-plugin >= %s gtkhtml-editor", minversion);
+   result = jb_check_packages("Evolution", "evolution-plugin", packages);
+   g_free(packages);
+ 

Copied: mail-notification/repos/extra-i686/gmime-2.4.patch (from rev 55455, mail-notification/trunk/gmime-2.4.patch)
===================================================================
--- extra-i686/gmime-2.4.patch	                        (rev 0)
+++ extra-i686/gmime-2.4.patch	2009-10-12 22:33:42 UTC (rev 55458)
@@ -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.4",
+ 				"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'))



More information about the arch-commits mailing list