[arch-commits] Commit in guake/trunk (5 files)
Balló György
bgyorgy at archlinux.org
Sun Oct 5 19:43:44 UTC 2014
Date: Sunday, October 5, 2014 @ 21:43:44
Author: bgyorgy
Revision: 120180
upgpkg: guake 0.5.0-1
Update to version 0.5.0
Added:
guake/trunk/fix-crasher.patch
guake/trunk/fix-hotkey.patch
Modified:
guake/trunk/PKGBUILD
Deleted:
guake/trunk/fix-compiositing.patch
guake/trunk/guake-fix-notification.patch
------------------------------+
PKGBUILD | 31 +++++------
fix-compiositing.patch | 110 -----------------------------------------
fix-crasher.patch | 13 ++++
fix-hotkey.patch | 14 +++++
guake-fix-notification.patch | 42 ---------------
5 files changed, 41 insertions(+), 169 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-10-05 18:53:05 UTC (rev 120179)
+++ PKGBUILD 2014-10-05 19:43:44 UTC (rev 120180)
@@ -4,8 +4,8 @@
# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x at linuxmail.org>
pkgname=guake
-pkgver=0.4.4
-pkgrel=4
+pkgver=0.5.0
+pkgrel=1
pkgdesc='Drop-down terminal for GNOME'
arch=('i686' 'x86_64')
url="http://guake.org/"
@@ -14,29 +14,26 @@
makedepends=('intltool' 'gnome-common')
install=$pkgname.install
source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz
- guake-fix-notification.patch
- fix-compiositing.patch)
-md5sums=('06b424ae32c7e63a8256922f1e8c51b6'
- '0b57227e6869dd84dd4fb0794ed0d082'
- '742729d81a9e22b59bd4ec0af64804d3')
+ fix-crasher.patch
+ fix-hotkey.patch)
+md5sums=('4383b7fcf85a355b4b69dd5cf66ff78f'
+ '12933c13aa1e7beb9431e3367cfaabd0'
+ '77050aeecb837d8c8109ab272f7277e2')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
+ # Fix crasher - https://github.com/Guake/guake/issues/373
+ patch -Np1 -i ../fix-crasher.patch
+
+ # Fix frozen hotkey - https://github.com/Guake/guake/issues/378
+ patch -Np1 -i ../fix-hotkey.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}
-
- # Runtime fix when no notification server available
- patch -Np1 -i ../guake-fix-notification.patch
-
- # Handle enabling/disabling compositing while Guake is running
- patch -Np1 -i ../fix-compiositing.patch
-
- # Fix build
- sed -i '/AM_INIT_AUTOMAKE/ s/-Werror//' configure.ac
+ sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake-prefs,prefs.py}
}
build() {
Deleted: fix-compiositing.patch
===================================================================
--- fix-compiositing.patch 2014-10-05 18:53:05 UTC (rev 120179)
+++ fix-compiositing.patch 2014-10-05 19:43:44 UTC (rev 120180)
@@ -1,110 +0,0 @@
-From b0e3e2b0544967d2ac3f9df299867142b4b4dec8 Mon Sep 17 00:00:00 2001
-From: Alexander Mezin <mezin.alexander at gmail.com>
-Date: Sun, 3 Mar 2013 02:48:01 +0700
-Subject: [PATCH] Handle enabling/disabling compositing while Guake is running
-
-Currently Guake checks if compositing is enabled only at startup.
-This causes problems in XFCE: Guake window is opaque when it's
-started automatically on login. I have to restart it to enable
-transparency. Also, it is generally better to react to changes
-without restart.
----
- src/guake | 64 ++++++++++++++++++++++++++++++++++++++-------------------------
- 1 file changed, 39 insertions(+), 25 deletions(-)
-
-diff --git a/src/guake b/src/guake
-index 1b321fc..50e1a91 100644
---- a/src/guake
-+++ b/src/guake
-@@ -301,33 +301,14 @@ class GConfHandler(object):
- will set the transparent flag to false if an image is set in
- all terminals open.
- """
-- image = entry.value.get_string()
-- for i in self.guake.term_list:
-- if image and os.path.exists(image):
-- i.set_background_image_file(image)
-- i.set_background_transparent(False)
-- else:
-- """We need to clear the image if it's not set but there is
-- a bug in vte python bidnings which doesn't allow None to be
-- passed to set_background_image (C GTK function expects NULL).
-- The user will need to restart Guake after clearing the image.
-- i.set_background_image(None)
-- """
-- if self.guake.has_argb:
-- i.set_background_transparent(False)
-- else:
-- i.set_background_transparent(True)
-+ self.guake.set_background_image(entry.value.get_string())
-
- def bgtransparency_changed(self, client, connection_id, entry, data):
- """If the gconf var style/background/transparency be changed, this
- method will be called and will set the saturation and transparency
- properties in all terminals open.
- """
-- transparency = entry.value.get_int()
-- for i in self.guake.term_list:
-- i.set_background_saturation(transparency / 100.0)
-- if self.guake.has_argb:
-- i.set_opacity(int((100 - transparency) / 100.0 * 65535))
-+ self.guake.set_background_transparency(entry.value.get_int())
-
- def backspace_changed(self, client, connection_id, entry, data):
- """If the gconf var compat_backspace be changed, this method
-@@ -560,11 +541,21 @@ class Guake(SimpleGladeApp):
- # check and set ARGB for real transparency
- screen = self.window.get_screen()
- colormap = screen.get_rgba_colormap()
-- if colormap != None and screen.is_composited():
-- self.window.set_colormap(colormap)
-- self.has_argb = True
-- else:
-+ if colormap == None:
- self.has_argb = False
-+ else:
-+ self.window.set_colormap(colormap)
-+ self.has_argb = self.window.get_screen().is_composited()
-+
-+ def composited_changed(screen):
-+ self.has_argb = screen.is_composited()
-+ self.set_background_transparency(
-+ self.client.get_int(KEY('/style/background/transparency')))
-+ self.set_background_image(
-+ self.client.get_string(KEY('/style/background/image')))
-+
-+ self.window.get_screen().connect("composited-changed",
-+ composited_changed);
-
- # List of vte.Terminal widgets, it will be useful when needed
- # to get a widget by the current page in self.notebook
-@@ -659,6 +650,29 @@ class Guake(SimpleGladeApp):
- 'press <b>%s</b> to use it.') % label, filename)
- notification.show()
-
-+ def set_background_transparency(self, transparency):
-+ for i in self.term_list:
-+ i.set_background_saturation(transparency / 100.0)
-+ if self.has_argb:
-+ i.set_opacity(int((100 - transparency) / 100.0 * 65535))
-+
-+ def set_background_image(self, image):
-+ for i in self.term_list:
-+ if image and os.path.exists(image):
-+ i.set_background_image_file(image)
-+ i.set_background_transparent(False)
-+ else:
-+ """We need to clear the image if it's not set but there is
-+ a bug in vte python bidnings which doesn't allow None to be
-+ passed to set_background_image (C GTK function expects NULL).
-+ The user will need to restart Guake after clearing the image.
-+ i.set_background_image(None)
-+ """
-+ if self.has_argb:
-+ i.set_background_transparent(False)
-+ else:
-+ i.set_background_transparent(True)
-+
- def execute_command(self, command, tab=None):
- """Execute the `command' in the `tab'. If tab is None, the
- command will be executed in the currently selected
Added: fix-crasher.patch
===================================================================
--- fix-crasher.patch (rev 0)
+++ fix-crasher.patch 2014-10-05 19:43:44 UTC (rev 120180)
@@ -0,0 +1,13 @@
+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:
Added: fix-hotkey.patch
===================================================================
--- fix-hotkey.patch (rev 0)
+++ fix-hotkey.patch 2014-10-05 19:43:44 UTC (rev 120180)
@@ -0,0 +1,14 @@
+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'):
+ 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()):
+- self.window.window.focus()
+ else:
+ self.hide()
+
Deleted: guake-fix-notification.patch
===================================================================
--- guake-fix-notification.patch 2014-10-05 18:53:05 UTC (rev 120179)
+++ guake-fix-notification.patch 2014-10-05 19:43:44 UTC (rev 120180)
@@ -1,42 +0,0 @@
---- a/src/guake 2011-02-09 20:00:35.000000000 +0100
-+++ b/src/guake 2012-02-25 00:55:28.513075769 +0100
-@@ -46,7 +46,10 @@
- TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \
- ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER
-
--pynotify.init('Guake!')
-+popup_works = True
-+if not pynotify.init('Guake!') or pynotify.get_server_info() == None :
-+ popup_works = False
-+ print "WARNING: could not use popup notification"
-
- GNOME_FONT_PATH = '/desktop/gnome/interface/monospace_font_name'
-
-@@ -637,7 +640,12 @@
- 'Please use Guake Preferences dialog to choose another '
- 'key (The trayicon was enabled)') % label, filename)
- self.client.set_bool(KEY('/general/use_trayicon'), True)
-- notification.show()
-+ if popup_works :
-+ notification.show()
-+ else :
-+ print _('A problem happened when binding <b>%s</b> key.\n'
-+ 'Please use Guake Preferences dialog to choose another '
-+ 'key (The trayicon was enabled)') % label
-
- elif self.client.get_bool(KEY('/general/use_popup')):
- # Pop-up that shows that guake is working properly (if not
-@@ -646,7 +654,11 @@
- _('Guake!'),
- _('Guake is now running,\n'
- 'press <b>%s</b> to use it.') % label, filename)
-- notification.show()
-+ if popup_works :
-+ notification.show()
-+ else :
-+ print _('Guake is now running,\n'
-+ 'press <b>%s</b> to use it.') % label
-
- def execute_command(self, command, tab=None):
- """Execute the `command' in the `tab'. If tab is None, the
-
More information about the arch-commits
mailing list