[arch-commits] Commit in mail-notification/trunk (3 files)

[Ionut Biru]

    Date: Monday, March 7, 2011 @ 04:46:50
  Author: ibiru
Revision: 112858

upgpkg: mail-notification 5.4-7
libnotify 0.7 rebuild

Added:
  mail-notification/trunk/mail-notification-5.4-camel_headers.patch
Modified:
  mail-notification/trunk/PKGBUILD
  mail-notification/trunk/evolution-gtkhtml.patch

-------------------------------------------+
 PKGBUILD                                  |   15 +++++++----
 evolution-gtkhtml.patch                   |    2 -
 mail-notification-5.4-camel_headers.patch |   36 ++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-07 09:20:00 UTC (rev 112857)
+++ PKGBUILD	2011-03-07 09:46:50 UTC (rev 112858)
@@ -3,13 +3,13 @@
 
 pkgname=mail-notification
 pkgver=5.4
-pkgrel=6
+pkgrel=7
 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.4.10' 'libnotify>=0.4.5' 'gnome-keyring>=2.32.0' 'hicolor-icon-theme' 'notification-daemon' 'libgnomeui>=2.24.2')
-makedepends=('gob2' 'intltool' 'evolution>=2.28.0' 'gnome-doc-utils>=0.18.0')
+depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnomeui')
+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
@@ -18,14 +18,16 @@
         gmime-2.4.patch
         evolution-gtkhtml.patch
         evolution.patch
-        mail-notification-5.4-icons.patch)
+        mail-notification-5.4-icons.patch
+        mail-notification-5.4-camel_headers.patch)
 md5sums=('c8dc33a61251acb5474e56eab6b18f43'
          '6007bc30e789dab0a8282038e0335eb9'
          '9cadd61bbd9c324b2916ec980231e0f2'
          '447cc20f035b9cf1a391027684ce1297'
-         '0be19731decffc2e64602b2abebabca4'
+         '500b2e42fbc5078e61407923a07b6e94'
          '46568640b7f97ab9ab7b54d49bee7e8e'
-         '8f602891a694ceaa91f845d97ae51b39')
+         '8f602891a694ceaa91f845d97ae51b39'
+         'f79939f593b2e8659e302df72c2b54b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -36,6 +38,7 @@
   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-camel_headers.patch"
 
   ./jb configure prefix=/usr sysconfdir=/etc \
       localstatedir=/var destdir="${pkgdir}" \

Modified: evolution-gtkhtml.patch
===================================================================
--- evolution-gtkhtml.patch	2011-03-07 09:20:00 UTC (rev 112857)
+++ evolution-gtkhtml.patch	2011-03-07 09:46:50 UTC (rev 112858)
@@ -5,7 +5,7 @@
      minversion = "2.12";
  
 -  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
-+  packages = g_strdup_printf("evolution-plugin >= %s gtkhtml-editor", minversion);
++  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14 gtkhtml-editor-3.14", minversion);
    result = jb_check_packages("Evolution", "evolution-plugin", packages);
    g_free(packages);
  

Added: mail-notification-5.4-camel_headers.patch
===================================================================
--- mail-notification-5.4-camel_headers.patch	                        (rev 0)
+++ mail-notification-5.4-camel_headers.patch	2011-03-07 09:46:50 UTC (rev 112858)
@@ -0,0 +1,36 @@
+diff -Nrbu mail-notification-5.4/build/src/mn-evolution-message.c mail-notification-5.4-OK/build/src/mn-evolution-message.c
+--- mail-notification-5.4/build/src/mn-evolution-message.c	2008-05-22 19:47:51.000000000 +0400
++++ mail-notification-5.4-OK/build/src/mn-evolution-message.c	2010-05-04 18:13:31.000000000 +0400
+@@ -25,7 +25,7 @@
+ #line 24 "src/mn-evolution-message.gob"
+ 
+ #include <glib/gi18n.h>
+-#include <camel/camel-folder-summary.h>
++#include <camel/camel.h>
+ #include "mn-evolution-mailbox.h"
+ #include "mn-message-private.h"
+ #include "mn-evolution-client.h"
+diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
+--- mail-notification-5.4/build/src/mn-evolution-server.c	2010-05-04 18:12:56.000000000 +0400
++++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-05-04 18:13:39.000000000 +0400
+@@ -28,7 +28,7 @@
+ #include <libintl.h>
+ #include <gobject/gvaluecollector.h>
+ #include <libedataserver/eds-version.h>
+-#include <camel/camel-folder.h>
++#include <camel/camel.h>
+ #if EDS_CHECK_VERSION(2,29,0)
+ #include <shell/e-shell.h>
+ #include <mail/e-mail-browser.h>
+diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
+--- mail-notification-5.4/src/mn-evolution-plugin.c	2010-05-04 18:12:56.000000000 +0400
++++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-05-04 18:13:20.000000000 +0400
+@@ -24,7 +24,7 @@
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ #include <dbus/dbus-glib-bindings.h>
+-#include <camel/camel-folder.h>
++#include <camel/camel.h>
+ #include <mail/em-event.h>
+ #include <mail/mail-tools.h>
+ #include "mn-evolution.h"