[arch-commits] Commit in claws-mail-extra-plugins/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Friday, April 29, 2011 @ 02:49:28
  Author: andyrtr
Revision: 121174

upgpkg: claws-mail-extra-plugins 3.7.9-3
fix libnotify usage FS#23724

Modified:
  claws-mail-extra-plugins/trunk/PKGBUILD
  claws-mail-extra-plugins/trunk/claws-mail-notification-0.26-libnotify-0.7.patch

--------------------------------------------------+
 PKGBUILD                                         |    8 +--
 claws-mail-notification-0.26-libnotify-0.7.patch |   47 ++++-----------------
 2 files changed, 15 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-29 06:45:30 UTC (rev 121173)
+++ PKGBUILD	2011-04-29 06:49:28 UTC (rev 121174)
@@ -4,7 +4,7 @@
 
 pkgname=claws-mail-extra-plugins
 pkgver=3.7.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
@@ -30,11 +30,11 @@
            'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
            'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
-options=('!libtool')
+options=('!libtool' '!strip')
 source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
         claws-mail-notification-0.26-libnotify-0.7.patch)
 md5sums=('3d1ebc48f686ab10702380c776b5d5d0'
-         'b76e1cdbff7af46d6594c34646c06fd0')
+         'a02be84594ebd28b18811ccc358509be')
 
 build() {
   cd "$srcdir/claws-mail-extra-plugins-$pkgver"
@@ -47,7 +47,7 @@
       cd $dir
 
       [[ $dir == notification_plugin-* ]] &&
-        patch -Np0 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch"
+        patch -Np2 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch"
 
       ./configure --prefix=/usr --disable-static
       make

Modified: claws-mail-notification-0.26-libnotify-0.7.patch
===================================================================
--- claws-mail-notification-0.26-libnotify-0.7.patch	2011-04-29 06:45:30 UTC (rev 121173)
+++ claws-mail-notification-0.26-libnotify-0.7.patch	2011-04-29 06:49:28 UTC (rev 121174)
@@ -1,50 +1,25 @@
---- src/notification_popup.c
-+++ src/notification_popup.c
-@@ -339,7 +339,16 @@
+diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c
+--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c	2009-04-26 03:05:05.000000000 +0200
++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c	2010-11-12 13:39:02.363909583 +0100
+@@ -339,7 +339,7 @@
      break;
    }
  
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+-  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
 +  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
-+#else
-   ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+#endif
-+#else
-+  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+#endif
-+
    g_free(utf8_str);
    if(ppopup->notification == NULL) {
      debug_print("Notification Plugin: Failed to create a new "
---- src/notification_trayicon.c
-+++ src/notification_trayicon.c
-@@ -61,6 +61,10 @@
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- typedef struct {
-   gint count;
-   gint num_mail;
-@@ -601,8 +605,17 @@
+diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c
+--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c	2010-03-25 09:56:34.000000000 +0100
++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c	2010-11-12 13:38:30.809340907 +0100
+@@ -589,8 +589,7 @@
    summary  = notification_trayicon_popup_assemble_summary();
    utf8_str = notification_trayicon_popup_assemble_body(msginfo);
  
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+-  popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
+-  notify_notification_attach_to_status_icon(popup.notification, trayicon);
 +  popup.notification = notify_notification_new(summary, utf8_str, NULL);
-+#else
-   popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+#endif
-+
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+  /* notify_notification_attach_to_status_icon function was removed */
-+#else
-   notify_notification_attach_to_status_icon(popup.notification, trayicon);
-+#endif
  
    g_free(summary);
    g_free(utf8_str);