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

2011-08-28 Thread andyrtr
Date: Sunday, August 28, 2011 @ 13:24:10
  Author: andyrtr
Revision: 136384

upgpkg: claws-mail-extra-plugins 3.7.10-1

upstream update 3.7.10; add new gdata plugin

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

--+
 PKGBUILD |   20 ++--
 claws-mail-notification-0.26-libnotify-0.7.patch |   25 -
 2 files changed, 8 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-28 15:19:35 UTC (rev 136383)
+++ PKGBUILD2011-08-28 17:24:10 UTC (rev 136384)
@@ -3,16 +3,16 @@
 # Contributor: Mildred mildred593 at online dot fr
 
 pkgname=claws-mail-extra-plugins
-pkgver=3.7.9
-pkgrel=4
+pkgver=3.7.10
+pkgrel=1
 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')
+depends=('claws-mail=3.7.10')
 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.3.13'
- 'pygtk=2.16.0' 'libsoup-gnome' 'libcanberra')
+ 'pygtk=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
 optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
 'perl: for perl plugin'
 'libnotify: for notification plugin'
@@ -24,17 +24,16 @@
 'libytnef: for tnef_parse plugin'
 'libwebkit: for the fancy webkit html plugin'
 'libsoup-gnome: for the fancy webkit html plugin'
-'python2: for python plugin')
+'python2: for python plugin'
+   'libgdata: for gdata plugin')
 conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
 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'
- 'a02be84594ebd28b18811ccc358509be')
+source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
+md5sums=('fe782b2d4762c9727e22c1bb7979f7d6')
 
 build() {
   cd $srcdir/claws-mail-extra-plugins-$pkgver
@@ -46,9 +45,6 @@
 [[ $dir != geolocation_plugin-* ]]  (
   cd $dir
 
-  [[ $dir == notification_plugin-* ]] 
-patch -Np2 -i 
$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch
-
   ./configure --prefix=/usr --disable-static
   make
 )

Deleted: claws-mail-notification-0.26-libnotify-0.7.patch
===
--- claws-mail-notification-0.26-libnotify-0.7.patch2011-08-28 15:19:35 UTC 
(rev 136383)
+++ claws-mail-notification-0.26-libnotify-0.7.patch2011-08-28 17:24:10 UTC 
(rev 136384)
@@ -1,25 +0,0 @@
-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.0 +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;
-   }
- 
--  ppopup-notification = notify_notification_new(summary, utf8_str, NULL, 
NULL);
-+  ppopup-notification = notify_notification_new(summary, utf8_str, NULL);
-   g_free(utf8_str);
-   if(ppopup-notification == NULL) {
- debug_print(Notification Plugin: Failed to create a new 
-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.0 +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);
- 
--  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);
- 
-   g_free(summary);
-   g_free(utf8_str);



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

2011-04-29 Thread andyrtr
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
===
--- PKGBUILD2011-04-29 06:45:30 UTC (rev 121173)
+++ PKGBUILD2011-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.patch2011-04-29 06:45:30 UTC 
(rev 121173)
+++ claws-mail-notification-0.26-libnotify-0.7.patch2011-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.0 +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.0 +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);



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

2011-03-06 Thread Jan Steffens
Date: Sunday, March 6, 2011 @ 17:47:24
  Author: heftig
Revision: 112792

upgpkg: claws-mail-extra-plugins 3.7.8-2
Remove buggy geolocation plugin, Add patch for libnotify 0.7, Cleanup PKGBUILD

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

--+
 PKGBUILD |   77 ++---
 claws-mail-notification-0.26-libnotify-0.7.patch |   50 +
 2 files changed, 88 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-06 21:31:20 UTC (rev 112791)
+++ PKGBUILD2011-03-06 22:47:24 UTC (rev 112792)
@@ -4,65 +4,64 @@
 
 pkgname=claws-mail-extra-plugins
 pkgver=3.7.8
-pkgrel=1
+pkgrel=2
 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.4.5' 'libxml2=2.7.6' 'curl=7.19.7' 'libytnef=1.5-2' 
'libwebkit=1.1.15.4-2' 'libchamplain=0.8.0' 'pygtk=2.16.0' 'libsoup-gnome' 
'libcanberra')
+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.1.15.4-2'
+ 'pygtk=2.16.0' 'libsoup-gnome' 'libcanberra')
 optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
 'perl: for perl plugin'
 'libnotify: for notification plugin'
-   'libcanberra: for notification plugin'
-   'dbus-core: for notification plugin'
+'libcanberra: for notification plugin'
+'dbus-core: for notification plugin'
 'libxml2: for gtkhtml2_viewer and rssyl plugins'
 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport 
plugins'
 'libarchive: for archive plugin'
 'libytnef: for tnef_parse plugin'
 'libwebkit: for the fancy webkit html plugin'
-   'libsoup-gnome: for the fancy webkit html plugin'
-'libchamplain: for geolocation plugin'
+'libsoup-gnome: for the fancy webkit html plugin'
 'python2: for python plugin')
-conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' 
'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' 
'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' 'claws-webkit-plugin-svn' 
'claws-mayflower-plugin-svn')
+conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
+   'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
+   'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
+   'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
-md5sums=('8a67a00598262f8ca07a4af5cd43361d')
+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=('8a67a00598262f8ca07a4af5cd43361d'
+ 'b76e1cdbff7af46d6594c34646c06fd0')
 
 build() {
-cd ${srcdir}/claws-mail-extra-plugins-$pkgver
-# hack for new libchamplain
-sed -i -e s/champlain-gtk-0.4/champlain-gtk-0.8/ 
${srcdir}/claws-mail-extra-plugins-$pkgver/geolocation*/configure
-# fix for python2
-export PYTHON=python2
-
-for dir in *; do
-# Continue if it is not a directory or the synce plugin
-[ ! -d $dir ]  continue
-echo $dir | grep synce /dev/null 2/dev/null  continue
- # Else, compile
-cd $dir
-[ -e $configured_file ] || \
-./configure --prefix=/usr --disable-static || return 1
-touch arch-configured
-make || return 1
-cd ..
- done
+  cd $srcdir/claws-mail-extra-plugins-$pkgver
+
+  # fix for python2
+  export PYTHON=/usr/bin/python2
+
+  for dir in */; do
+[[ $dir != geolocation_plugin-* ]]  (
+  cd $dir
+
+  [[ $dir == notification_plugin-* ]] 
+patch -Np0 -i 
$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch
+
+  ./configure --prefix=/usr --disable-static
+  make
+)
+  done
 }
 
 package() {
-cd ${srcdir}/claws-mail-extra-plugins-$pkgver
-for dir in *; do
-# Continue if it is not a directory or the synce plugin
-[ ! -d $dir ]  continue
-echo $dir | grep synce /dev/null 2/dev/null  continue
- # Else, install
-cd $dir
-make DESTDIR=$pkgdir install || return 1
-cd ..
- done
+  cd $srcdir/claws-mail-extra-plugins-$pkgver
+  for dir in */; do
+[[ $dir != geolocation_plugin-* ]]  
+  make -C $dir DESTDIR=$pkgdir install
+