[arch-commits] Commit in tilda/trunk (5 files)

[Jaroslav Lichtblau]

    Date: Thursday, August 8, 2013 @ 21:28:15
  Author: jlichtblau
Revision: 95281

upgpkg: tilda 1.1.7-1

Modified:
  tilda/trunk/PKGBUILD
  tilda/trunk/tilda.changelog
Deleted:
  tilda/trunk/tilda-conf-sigsegv.patch
  tilda/trunk/tilda-fix.patch
  tilda/trunk/tilda-glib2.patch

--------------------------+
 PKGBUILD                 |   33 ++++++++++-----------------------
 tilda-conf-sigsegv.patch |   11 -----------
 tilda-fix.patch          |   24 ------------------------
 tilda-glib2.patch        |   11 -----------
 tilda.changelog          |    8 +++-----
 5 files changed, 13 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-08 19:16:53 UTC (rev 95280)
+++ PKGBUILD	2013-08-08 19:28:15 UTC (rev 95281)
@@ -4,39 +4,26 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=tilda
-pkgver=0.9.6
-pkgrel=6
-pkgdesc="Linux terminal based on classic terminals from first person shooter games"
+pkgver=1.1.7
+pkgrel=1
+pkgdesc="A Gtk based drop down terminal for Linux and Unix"
 arch=('i686' 'x86_64')
-url="http://tilda.sourceforge.net"
+url="https://github.com/lanoxx/tilda"
 license=('GPL')
-depends=('vte' 'confuse' 'libglade')
-makedepends=('gawk')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-        tilda-fix.patch tilda-glib2.patch tilda-conf-sigsegv.patch)
-sha256sums=('b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411'
-            'ceac38bb33a0e8141f7b6cbc55807c999729319f2fdfaa3c375aa1a541d29729'
-            'c71cdd8cdc1fdd76c919605c6b7a1b89e4929d20630db17145e6c2b584c8aaf9'
-            'e28c731c0ca94210d5e4f4b7dd0eee9952405593f1d06e4ab2d87ee299e3e533')
+depends=('vte3' 'confuse' 'gtk3')
+source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz)
+sha256sums=('ed96ae2cf0ceb2a5b2f4a62948c5c0d28d1d54f89ade5153b2e67515cf4dc5e7')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgname-$pkgver
 
-# 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
-
+  ./autogen.sh
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
 }

Deleted: tilda-conf-sigsegv.patch
===================================================================
--- tilda-conf-sigsegv.patch	2013-08-08 19:16:53 UTC (rev 95280)
+++ tilda-conf-sigsegv.patch	2013-08-08 19:28:15 UTC (rev 95281)
@@ -1,11 +0,0 @@
---- 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);

Deleted: tilda-fix.patch
===================================================================
--- tilda-fix.patch	2013-08-08 19:16:53 UTC (rev 95280)
+++ tilda-fix.patch	2013-08-08 19:28:15 UTC (rev 95281)
@@ -1,24 +0,0 @@
---- 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;

Deleted: tilda-glib2.patch
===================================================================
--- tilda-glib2.patch	2013-08-08 19:16:53 UTC (rev 95280)
+++ tilda-glib2.patch	2013-08-08 19:28:15 UTC (rev 95281)
@@ -1,11 +0,0 @@
---- 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
- 

Modified: tilda.changelog
===================================================================
--- tilda.changelog	2013-08-08 19:16:53 UTC (rev 95280)
+++ tilda.changelog	2013-08-08 19:28:15 UTC (rev 95281)
@@ -1,20 +1,18 @@
+2013-08-08  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* tilda 1.1.7-1
+
 2012-06-02  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-
 	* FS#29754 fixed
 
 2011-08-28  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-
 	* FS#25762 fixed
 
 2008-04-29  Mateusz Herych <heniekk at gmail.com>
-
 	* Updated for x86_64 - 0.9.6
 
 2008-04-28  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
 	* Updated for i686 - 0.9.6
 
 2007-12-30  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
 	* Updated to newer version - 0.9.5