diff options
Diffstat (limited to 'extra/claws-mail-extra-plugins')
| -rw-r--r-- | extra/claws-mail-extra-plugins/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch | 47 |
2 files changed, 17 insertions, 42 deletions
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index 0ff70cbd2..1b6a58831 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 119025 2011-04-10 13:51:10Z andyrtr $ +# $Id: PKGBUILD 121174 2011-04-29 06:49:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Mildred <mildred593 at online dot fr> pkgname=claws-mail-extra-plugins pkgver=3.7.9 -pkgrel=1 +pkgrel=3 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') arch=('i686' 'x86_64') depends=('claws-mail>=3.7.8') makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' - 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.2' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13' 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra') optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' 'perl: for perl plugin' @@ -30,11 +30,11 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' '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 @@ build() { 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 diff --git a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch index 6159d139c..efc06a472 100644 --- a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch +++ b/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch @@ -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); |