Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/multipath-tools/PKGBUILD
	community/perl-gnome2-wnck/PKGBUILD
	community/znc/PKGBUILD
	core/openldap/PKGBUILD
	extra/mod_perl/PKGBUILD
	extra/perl-digest-nilsimsa/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/vim/PKGBUILD
	extra/xcb-util-keysyms/PKGBUILD
	extra/xcb-util-wm/PKGBUILD
	extra/xournal/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-xcb-util/PKGBUILD

5 files changed, 67 insertions, 8 deletions

diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD
index 82a73f8c1..018ea0f39 100644
--- a/community/tilda/PKGBUILD
+++ b/community/tilda/PKGBUILD
@@ -1,33 +1,42 @@
-# $Id: PKGBUILD 67790 2012-03-14 12:36:28Z giovanni $
+# $Id: PKGBUILD 71879 2012-06-02 18:37:37Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=tilda
 pkgver=0.9.6
-pkgrel=5
+pkgrel=6
 pkgdesc="Linux terminal based on classic terminals from first person shooter games"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tilda.sourceforge.net"
 license=('GPL')
 depends=('vte' 'confuse' 'libglade')
 makedepends=('gawk')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \
-        fix.patch)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+        tilda-fix.patch tilda-glib2.patch tilda-conf-sigsegv.patch)
 sha256sums=('b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411'
-            '5f3aa2a58f52475e476b1871ea3f407c0cf4414670e861794888737b605c3caf')
+            'ceac38bb33a0e8141f7b6cbc55807c999729319f2fdfaa3c375aa1a541d29729'
+            'c71cdd8cdc1fdd76c919605c6b7a1b89e4929d20630db17145e6c2b584c8aaf9'
+            'e28c731c0ca94210d5e4f4b7dd0eee9952405593f1d06e4ab2d87ee299e3e533')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
-  patch -Np1 -i "${srcdir}/fix.patch"
+# gdk && desktop file fix FS#25762
+  patch -p0 -i ${srcdir}/$pkgname-fix.patch
+
+# glib2 fix
+  patch -p0 -i ${srcdir}/$pkgname-glib2.patch
+
+# fix segfaults on malformed config files FS#29754
+  patch -p0 -i ${srcdir}/$pkgname-conf-sigsegv.patch
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/tilda/tilda-conf-sigsegv.patch b/community/tilda/tilda-conf-sigsegv.patch
new file mode 100644
index 000000000..a48aad0a3
--- /dev/null
+++ b/community/tilda/tilda-conf-sigsegv.patch
@@ -0,0 +1,11 @@
+--- src/key_grabber.c	2008-04-08 00:12:31.000000000 +0200
++++ src/key_grabber.c	2012-05-17 19:43:25.227699421 +0200
+@@ -257,7 +257,7 @@
+ gboolean tilda_keygrabber_bind (const gchar *keystr, tilda_window *tw)
+ {
+     /* Empty strings are no good */
+-    if (strcmp ("", keystr) == 0)
++    if (!keystr || strcmp ("", keystr) == 0)
+         return FALSE;
+ 
+     return tomboy_keybinder_bind (keystr, onKeybindingPull, tw);
diff --git a/community/tilda/tilda-fix.patch b/community/tilda/tilda-fix.patch
new file mode 100644
index 000000000..a6d273c26
--- /dev/null
+++ b/community/tilda/tilda-fix.patch
@@ -0,0 +1,24 @@
+--- src/key_grabber.c	2008-04-08 01:12:31.000000000 +0300
++++ src/key_grabber.c	2009-10-16 17:39:16.399679408 +0300
+@@ -190,7 +190,7 @@
+          * Overriding the user time here seems to work a lot better than calling
+          * gtk_window_present_with_time() here, or at the end of the function. I have
+          * no idea why, they should do the same thing. */
+-        gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window,
++        gdk_x11_window_set_user_time (GTK_WIDGET(tw->window),
+                                       tomboy_keybinder_get_current_event_time());
+         gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos"));
+         gtk_widget_show (GTK_WIDGET(tw->window));
+
+--- tilda.desktop.in	2007-03-16 04:53:34.000000000 +0100
++++ tilda.desktop.in	2011-08-28 19:08:53.000000000 +0200
+@@ -2 +1,0 @@
+-Encoding=UTF-8
+@@ -4,2 +3,2 @@
+-Exec=@BINDIR@/tilda
+-Icon=@PIXMAPSDIR@/tilda.png
++Exec=tilda
++Icon=tilda
+@@ -8 +7 @@
+-Categories=GNOME;GTK;Application;Utility;TerminalEmulator;
++Categories=GNOME;GTK;Utility;TerminalEmulator;System;
diff --git a/community/tilda/tilda-glib2.patch b/community/tilda/tilda-glib2.patch
new file mode 100644
index 000000000..2d048e565
--- /dev/null
+++ b/community/tilda/tilda-glib2.patch
@@ -0,0 +1,11 @@
+--- src/tomboykeybinder.h	2007-07-15 04:31:19.000000000 +0200
++++ src/tomboykeybinder.h	2012-05-17 19:42:06.613150329 +0200
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++//#include <glib/gtypes.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/community/tilda/tilda.changelog b/community/tilda/tilda.changelog
index af3650071..4248e9a32 100644
--- a/community/tilda/tilda.changelog
+++ b/community/tilda/tilda.changelog
@@ -1,3 +1,7 @@
+2012-06-02  Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+	* FS#29754 fixed
+
 2011-08-28  Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 	* FS#25762 fixed