[arch-commits] Commit in claws-mail/trunk (PKGBUILD claws-notify-crash.patch)

[Ionut Biru]

    Date: Wednesday, May 25, 2011 @ 04:15:13
  Author: ibiru
Revision: 124918

upgpkg: claws-mail 3.7.9-3
fix crasher when using startup-notification 0.12

Added:
  claws-mail/trunk/claws-notify-crash.patch
Modified:
  claws-mail/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   11 ++++++++---
 claws-notify-crash.patch |   18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-25 07:47:29 UTC (rev 124917)
+++ PKGBUILD	2011-05-25 08:15:13 UTC (rev 124918)
@@ -3,7 +3,7 @@
 
 pkgname=claws-mail
 pkgver=3.7.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -20,12 +20,17 @@
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
+        claws-notify-crash.patch)
+md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3'
+         '9a2903449f679344b5f5f51c91825b45')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -Np0 -i $srcdir/claws-notify-crash.patch
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+
   ./configure --prefix=/usr --disable-static \
     --enable-enchant \
     --enable-gnutls \

Added: claws-notify-crash.patch
===================================================================
--- claws-notify-crash.patch	                        (rev 0)
+++ claws-notify-crash.patch	2011-05-25 08:15:13 UTC (rev 124918)
@@ -0,0 +1,18 @@
+Index: src/main.c
+===================================================================
+RCS file: //claws/src/main.c,v
+retrieving revision 1.115.2.237
+retrieving revision 1.115.2.238
+diff -u -r1.115.2.237 -r1.115.2.238
+--- src/main.c	10 Apr 2011 17:19:04 -0000	1.115.2.237
++++ src/main.c	30 Apr 2011 19:27:15 -0000	1.115.2.238
+@@ -331,7 +331,7 @@
+ 		gtk_widget_show(hack);
+ 	}
+ 
+-	xdisplay = gdk_display_get_default();
++	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ 	sn_display = sn_display_new(xdisplay,
+ 				sn_error_trap_push,
+ 				sn_error_trap_pop);
+