[arch-commits] Commit in guake/trunk (5 files)
Balló György
bgyorgy at archlinux.org
Thu Nov 20 15:48:54 UTC 2014
Date: Thursday, November 20, 2014 @ 16:48:53
Author: bgyorgy
Revision: 122838
upgpkg: guake 0.5.1-1
Update to version 0.5.1
Added:
guake/trunk/fix-version.patch
Modified:
guake/trunk/PKGBUILD
guake/trunk/fix-hotkey.patch
Deleted:
guake/trunk/fix-crasher.patch
guake/trunk/fix-hiding.patch
-------------------+
PKGBUILD | 27 +++++++++++----------------
fix-crasher.patch | 13 -------------
fix-hiding.patch | 10 ----------
fix-hotkey.patch | 18 +++++++++++-------
fix-version.patch | 24 ++++++++++++++++++++++++
5 files changed, 46 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-11-20 15:24:33 UTC (rev 122837)
+++ PKGBUILD 2014-11-20 15:48:53 UTC (rev 122838)
@@ -5,8 +5,8 @@
# Contributor: Attila Bukor <r1pp3rj4ck at w4it.eu>
pkgname=guake
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.1
+pkgrel=1
pkgdesc='Drop-down terminal for GNOME'
arch=('i686' 'x86_64')
url="http://guake.org/"
@@ -15,31 +15,26 @@
makedepends=('intltool' 'gnome-common')
install=$pkgname.install
source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz
- fix-crasher.patch
- fix-hiding.patch
- fix-hotkey.patch)
-md5sums=('4383b7fcf85a355b4b69dd5cf66ff78f'
- '12933c13aa1e7beb9431e3367cfaabd0'
- '117f21da9744272d51d9e7d977382f27'
- '77050aeecb837d8c8109ab272f7277e2')
+ fix-hotkey.patch
+ fix-version.patch)
+md5sums=('17aad750ee7cac3fd6332b00a8404be8'
+ '3f7b7457254aea962b07ae284aa3e3af'
+ 'd4d9855dfe502fb75e307a2db2b3fe67')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # Fix crasher - https://github.com/Guake/guake/issues/373
- patch -Np1 -i ../fix-crasher.patch
-
- # Fix restoring focus - https://github.com/Guake/guake/issues/384
- patch -Np1 -i ../fix-hiding.patch
-
# 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/{guake-prefs,prefs.py}
+ sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/prefs.py
}
build() {
Deleted: fix-crasher.patch
===================================================================
--- fix-crasher.patch 2014-11-20 15:24:33 UTC (rev 122837)
+++ fix-crasher.patch 2014-11-20 15:48:53 UTC (rev 122838)
@@ -1,13 +0,0 @@
-diff -Naur guake-0.5.0.orig/src/guake guake-0.5.0/src/guake
---- guake-0.5.0.orig/src/guake 2014-10-05 17:49:44.240402904 +0000
-+++ guake-0.5.0/src/guake 2014-10-05 17:51:22.280038750 +0000
-@@ -634,6 +634,9 @@
- scale_factor = 2 ** (self.font_scale_index / 6)
- new_size = int(scale_factor * font.get_size())
-
-+ if new_size == 0:
-+ return
-+
- if font.get_size_is_absolute():
- font.set_absolute_size(new_size)
- else:
Deleted: fix-hiding.patch
===================================================================
--- fix-hiding.patch 2014-11-20 15:24:33 UTC (rev 122837)
+++ fix-hiding.patch 2014-11-20 15:48:53 UTC (rev 122838)
@@ -1,10 +0,0 @@
---- guake-0.5.0.orig/src/guake 2014-10-13 23:11:31.803523945 +0200
-+++ guake-0.5.0.orig/src/guake 2014-10-13 23:11:43.130502724 +0200
-@@ -1094,7 +1094,6 @@
- """Hides the main window of the terminal and sets the visible
- flag to False.
- """
-- self.window.set_keep_below(True)
- self.window.hide() # Don't use hide_all here!
-
- def get_final_window_monitor(self):
Modified: fix-hotkey.patch
===================================================================
--- fix-hotkey.patch 2014-11-20 15:24:33 UTC (rev 122837)
+++ fix-hotkey.patch 2014-11-20 15:48:53 UTC (rev 122838)
@@ -1,14 +1,18 @@
-diff -Naur guake-0.5.0.orig/src/guake guake-0.5.0/src/guake
---- guake-0.5.0.orig/src/guake 2014-10-05 18:48:34.680242628 +0000
-+++ guake-0.5.0/src/guake 2014-10-05 19:06:14.629370046 +0000
-@@ -1039,10 +1039,6 @@
- if not self.window.get_property('visible'):
+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
-- not self.window.window.get_state()):
+- (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()
-
Added: fix-version.patch
===================================================================
--- fix-version.patch (rev 0)
+++ fix-version.patch 2014-11-20 15:48:53 UTC (rev 122838)
@@ -0,0 +1,24 @@
+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.
More information about the arch-commits
mailing list