diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-02 07:36:54 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-02 07:36:54 +0000 |
| commit | da04f3558b6c5bfae6b82d20560fe61021fdc95b (patch) | |
| tree | d7360bf993c1f28a1d725672f25d1e59f3ed9668 /main | |
| parent | 3af18ee07143da9d51d4f970e027800fdab38b47 (diff) | |
| download | aports-da04f3558b6c5bfae6b82d20560fe61021fdc95b.tar.bz2 aports-da04f3558b6c5bfae6b82d20560fe61021fdc95b.tar.xz | |
main/claws-mail: fix segfault related startup-notification
Fix from upstream:
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2414
Diffstat (limited to 'main')
| -rw-r--r-- | main/claws-mail/APKBUILD | 30 | ||||
| -rw-r--r-- | main/claws-mail/startup-notification-segfault.patch | 18 |
2 files changed, 38 insertions, 10 deletions
diff --git a/main/claws-mail/APKBUILD b/main/claws-mail/APKBUILD index dd05d1e8b0..ce1e0d34d4 100644 --- a/main/claws-mail/APKBUILD +++ b/main/claws-mail/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=claws-mail pkgver=3.7.9 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+ based e-mail client." url="http://www.claws-mail.org" arch="all" @@ -10,31 +10,40 @@ subpackages="$pkgname-dev $pkgname-doc" makedepends="gtk+-dev openssl-dev startup-notification-dev enchant-dev libsm-dev gnutls-dev curl-dev dbus-glib-dev libetpan-dev openldap-dev" depends= -# gpgme-dev libetpan-dev -#pilot-link>=0.12.3-5 -install= #claws-mail.install +install= source="http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgname-$pkgver.tar.bz2 - libc-version.patch" + libc-version.patch + startup-notification-segfault.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 -i ../libc-version.patch || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;; + esac + done } build() { cd "$_builddir" - LIBS="-lubacktrace" ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --disable-static \ --enable-enchant \ --enable-gnutls \ --enable-ldap \ --disable-dillo-viewer-plugin \ - --enable-crash-dialog \ + --disable-crash-dialog \ --enable-pgpmime-plugin \ --enable-spamassassin-plugin \ --enable-bogofilter-plugin \ - --disable-jpilot + --disable-jpilot \ + || return 1 + + # force disabling of backtrace. the core dump was more useful + sed -i -e '/HAVE_BACKTRACE/d' config.h + make || return 1 cd tools make @@ -48,4 +57,5 @@ package() { done } md5sums="2f9d2dcabf84e312cfeb56efa799b5b3 claws-mail-3.7.9.tar.bz2 -f3416743b5d8ff97b5a3cc2f7efc2dc1 libc-version.patch" +f3416743b5d8ff97b5a3cc2f7efc2dc1 libc-version.patch +1f0773ab009c966dd8b587422890247e startup-notification-segfault.patch" diff --git a/main/claws-mail/startup-notification-segfault.patch b/main/claws-mail/startup-notification-segfault.patch new file mode 100644 index 0000000000..ef36e42fae --- /dev/null +++ b/main/claws-mail/startup-notification-segfault.patch @@ -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); + |