Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=ca7b9a14c8dc0500ba0b7815a04c78abe2fa3556

commit ca7b9a14c8dc0500ba0b7815a04c78abe2fa3556
Author: kikadf <[email protected]>
Date:   Tue Feb 25 11:08:55 2014 +0100

tilda-0.9.6-7arcturus1-x86_64

* Fix #4777 in BTS

diff --git a/source/xapps-extra/tilda/FrugalBuild 
b/source/xapps-extra/tilda/FrugalBuild
index bf65750..4342630 100644
--- a/source/xapps-extra/tilda/FrugalBuild
+++ b/source/xapps-extra/tilda/FrugalBuild
@@ -1,9 +1,12 @@
# Compiling Time: 0.04 SBU
+# Maintainer: kikadf  <[email protected]>
# Maintainer: Priyank Gosalia <[email protected]>

+options+=('asneeded')
+
pkgname=tilda
pkgver=0.9.6
-pkgrel=6
+pkgrel=7arcturus1
pkgdesc="Linux terminal based on classic terminals from first person shooter 
games"
depends=('vte>=0.24.0-2' 'confuse' 'libglade>=2.6.4-2')
makedepends=('gawk')
@@ -11,7 +14,9 @@ groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
Finclude sourceforge
-url="http://tilda.sourceforge.net/";
-sha1sums=('bb16b78d1622311bf6de9f91db32ea5dc2019ca6')
+source+=(tilda-conf-sigsegv.patch tilda-fix.patch)
+sha1sums=('bb16b78d1622311bf6de9f91db32ea5dc2019ca6' \
+          'a144ca84e831ef8fda784d51fba3d5c528d9c0a0' \
+          '4e8653689ebef5ec35f7983ba288fbe20c972818')

# optimization OK
diff --git a/source/xapps-extra/tilda/tilda-conf-sigsegv.patch 
b/source/xapps-extra/tilda/tilda-conf-sigsegv.patch
new file mode 100644
index 0000000..07f902b
--- /dev/null
+++ b/source/xapps-extra/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/source/xapps-extra/tilda/tilda-fix.patch 
b/source/xapps-extra/tilda/tilda-fix.patch
new file mode 100644
index 0000000..a6d273c
--- /dev/null
+++ b/source/xapps-extra/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;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to