From 06cb9e1e50a3bc2b5fd958ba8a88bb373fc3f8ca Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 31 Aug 2011 11:57:43 +0000 Subject: [PATCH] main/claws-mail: upgrade to 3.7.10 --- main/claws-mail/APKBUILD | 13 ++++++------- .../startup-notification-segfault.patch | 18 ------------------ 2 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 main/claws-mail/startup-notification-segfault.patch diff --git a/main/claws-mail/APKBUILD b/main/claws-mail/APKBUILD index ce1e0d34d43..7480590af64 100644 --- a/main/claws-mail/APKBUILD +++ b/main/claws-mail/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=claws-mail -pkgver=3.7.9 -pkgrel=2 +pkgver=3.7.10 +pkgrel=0 pkgdesc="A GTK+ based e-mail client." url="http://www.claws-mail.org" arch="all" @@ -13,7 +13,6 @@ depends= install= source="http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgname-$pkgver.tar.bz2 libc-version.patch - startup-notification-segfault.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -51,11 +50,11 @@ build() { package() { cd "$_builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install || return 1 + rm "$pkgdir"/usr/lib/claws-mail/plugins/*.la find tools -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i; do install -D -m755 ${i} "$pkgdir"/usr/lib/claws-mail/tools/${i} done } -md5sums="2f9d2dcabf84e312cfeb56efa799b5b3 claws-mail-3.7.9.tar.bz2 -f3416743b5d8ff97b5a3cc2f7efc2dc1 libc-version.patch -1f0773ab009c966dd8b587422890247e startup-notification-segfault.patch" +md5sums="fcf58dcff52f0908ff3bc368d820408b claws-mail-3.7.10.tar.bz2 +f3416743b5d8ff97b5a3cc2f7efc2dc1 libc-version.patch" diff --git a/main/claws-mail/startup-notification-segfault.patch b/main/claws-mail/startup-notification-segfault.patch deleted file mode 100644 index ef36e42fae6..00000000000 --- a/main/claws-mail/startup-notification-segfault.patch +++ /dev/null @@ -1,18 +0,0 @@ -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); -