[arch-commits] Commit in guake/trunk (PKGBUILD fix-hotkey.patch fix-version.patch)

[Balló György]

    Date: Sunday, November 23, 2014 @ 18:40:16
  Author: bgyorgy
Revision: 123004

upgpkg: guake 0.5.2-1

Update to version 0.5.2

Modified:
  guake/trunk/PKGBUILD
Deleted:
  guake/trunk/fix-hotkey.patch
  guake/trunk/fix-version.patch

-------------------+
 PKGBUILD          |   23 +++++------------------
 fix-hotkey.patch  |   18 ------------------
 fix-version.patch |   24 ------------------------
 3 files changed, 5 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-23 17:04:56 UTC (rev 123003)
+++ PKGBUILD	2014-11-23 17:40:16 UTC (rev 123004)
@@ -5,36 +5,23 @@
 # Contributor: Attila Bukor <r1pp3rj4ck at w4it.eu>
 
 pkgname=guake
-pkgver=0.5.1
+pkgver=0.5.2
 pkgrel=1
 pkgdesc='Drop-down terminal for GNOME'
 arch=('i686' 'x86_64')
 url="https://github.com/Guake/guake/"
 license=('GPL')
-depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg')
+depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'libutempter')
 makedepends=('intltool' 'gnome-common')
 install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz
-        fix-hotkey.patch
-        fix-version.patch)
-md5sums=('17aad750ee7cac3fd6332b00a8404be8'
-         '3f7b7457254aea962b07ae284aa3e3af'
-         'd4d9855dfe502fb75e307a2db2b3fe67')
+source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz)
+md5sums=('a9f5b27540b0d38e2c6dd88c7018f6f3')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix frozen hotkey - https://github.com/Guake/guake/issues/378
-  patch -Np1 -i ../fix-hotkey.patch
-
-  # Fix version number
-  patch -Np1 -i ../fix-version.patch
-
-  # Fix GConf schema dir
-  sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.am
-
   # Python2 fix
-  sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/prefs.py
+  sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/guake/prefs.py
 }
 
 build() {

Deleted: fix-hotkey.patch
===================================================================
--- fix-hotkey.patch	2014-11-23 17:04:56 UTC (rev 123003)
+++ fix-hotkey.patch	2014-11-23 17:40:16 UTC (rev 123004)
@@ -1,18 +0,0 @@
-diff -Naur guake-0.5.1.orig/src/guake.py guake-0.5.1/src/guake.py
---- guake-0.5.1.orig/src/guake.py	2014-11-13 00:07:02.000000000 +0100
-+++ guake-0.5.1/src/guake.py	2014-11-20 16:28:19.583666637 +0100
-@@ -1121,14 +1121,6 @@
-             print "DBG: Showing the terminal"
-             self.show()
-             self.set_terminal_focus()
--        elif (self.client.get_bool(KEY('/general/focus_if_open')) and
--                self.window.window and
--                (int(self.window.window.get_state()) & GDK_WINDOW_STATE_STICKY or
--                 int(self.window.window.get_state()) & GDK_WINDOW_STATE_WITHDRAWN
--                 )):
--            print "DBG: Restoring the focus to the terminal"
--            self.window.window.focus()
--            self.set_terminal_focus()
-         else:
-             print "DBG: hiding the terminal"
-             self.hide()

Deleted: fix-version.patch
===================================================================
--- fix-version.patch	2014-11-23 17:04:56 UTC (rev 123003)
+++ fix-version.patch	2014-11-23 17:40:16 UTC (rev 123004)
@@ -1,24 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,7 @@
- # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- # Boston, MA 02111-1307, USA.
- 
--AC_INIT([guake], [0.5.0], [http://guake.org/])
-+AC_INIT([guake], [0.5.1], [http://guake.org/])
- 
- AC_CONFIG_HEADERS([config.h])
- 
-diff --git a/doc/source/conf.py b/doc/source/conf.py
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -50,7 +50,7 @@
- # The short X.Y version.
- version = '0.5'
- # The full version, including alpha/beta/rc tags.
--release = '0.5.0'
-+release = '0.5.1'
- 
- # The language for content autogenerated by Sphinx. Refer to documentation
- # for a list of supported languages.