guake 0.4.4-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8096 ec354946-7b23-47d6-9f5a-488ba84defc7

g/guake/0001-Fix-focus-issue-on-gnome-shell.patch

@@ -0,0 +1,28 @@
+From cf5dbda6749e8d0c47b44269b92e58d266ec830b Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou@pingoured.fr>
+Date: Tue, 26 Jun 2012 09:23:20 +0200
+Subject: [PATCH] Fix focus issue on gnome-shell
+
+This fixes issue #436 from guake's trac.
+Problem was that after hiding guake's window the window below doesn't get the focus back.
+
+However, this fix seems to not work on ubuntu (something with unity?)
+---
+ src/guake |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/guake b/src/guake
+index 33ad7fd..acabb45 100644
+--- a/src/guake
++++ b/src/guake
+@@ -809,6 +809,7 @@ class Guake(SimpleGladeApp):
+         """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_rect(self):
+-- 
+1.7.10.2
+

g/guake/0001-Fix-notification.patch

@@ -0,0 +1,59 @@
+From 855be1063f201a0fcc8c37efe3c59bde17801a32 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou@pingoured.fr>
+Date: Fri, 27 Jul 2012 09:40:03 +0200
+Subject: [PATCH] Fix notification
+
+With this commit we prevent guake from using the pynotify module
+if this one does not work or is not properly installed.
+---
+ src/guake |   20 +++++++++++++++++---
+ 1 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/guake b/src/guake
+index 6d8f9c5..9da941c 100644
+--- a/src/guake
++++ b/src/guake
+@@ -54,7 +54,10 @@ from guake.globals import NAME, VERSION, LOCALE_DIR, KEY, GCONF_PATH, \
+     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'
+ 
+@@ -648,7 +651,13 @@ class Guake(SimpleGladeApp):
+                   '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
+@@ -657,7 +666,12 @@ class Guake(SimpleGladeApp):
+                 _('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
+-- 
+1.7.7.6
+

g/guake/0001-Fix-regex-to-include-the-port-number-when-there-is-o.patch

@@ -0,0 +1,25 @@
+From 7e0bb91a11dcc211ca2f08c01b1339ddc1249284 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou@pingoured.fr>
+Date: Fri, 2 Nov 2012 17:08:47 +0100
+Subject: [PATCH] Fix regex to include the port number when there is one
+
+---
+ src/globals.py.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/globals.py.in b/src/globals.py.in
+index 002e55a..894db6c 100644
+--- a/src/globals.py.in
++++ b/src/globals.py.in
+@@ -41,7 +41,7 @@ USERCHARS = "-[:alnum:]"
+ PASSCHARS = "-[:alnum:],?;.:/!%$^*&~\"#'"
+ HOSTCHARS = "-[:alnum:]"
+ HOST      = "[" + HOSTCHARS + "]+(\\.[" + HOSTCHARS + "]+)*"
+-PORT      = "(:[:digit:]{1,5})?"
++PORT      = "(:[[:digit:]]{1,5})?"
+ PATHCHARS =  "-[:alnum:]_$.+!*(),;:@&=?/~#%"
+ SCHEME    = "(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)"
+ USER      = "[" + USERCHARS + "]+(:[" + PASSCHARS + "]+)?"
+-- 
+1.7.11.7
+

g/guake/0001-Include-bpython-and-ipython-as-interpreters.patch

@@ -0,0 +1,27 @@
+From 6d574c1ea4233bf514ee4fff68a70cefc9b034d7 Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean@redhat.com>
+Date: Sun, 21 Apr 2013 08:44:23 -0400
+Subject: [PATCH] Include bpython and ipython as interpreters.
+
+---
+ src/prefs.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/prefs.py b/src/prefs.py
+index 6611635..cb32d5d 100644
+--- a/src/prefs.py
++++ b/src/prefs.py
+@@ -32,8 +32,8 @@ from guake.globals import NAME, LOCALE_DIR, GCONF_PATH, KEY, ALIGN_LEFT, ALIGN_R
+ from guake.common import *
+ 
+ # A regular expression to match possible python interpreters when
+-# filling interpreters combo in preferences
+-PYTHONS = re.compile('^python\d\.\d$')
++# filling interpreters combo in preferences (including bpython and ipython)
++PYTHONS = re.compile('^[a-z]python$|^python\d\.\d$')
+ 
+ # Path to the shells file, it will be used to start to populate
+ # interpreters combo, see the next variable, its important to fill the
+-- 
+1.8.1.4
+

g/guake/0001-Let-allow-the-signal.SIGTERM-to-fail.patch

@@ -0,0 +1,31 @@
+From d9c55e9192e8fbd5c84b6a7bfbf28ed88e119717 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou@pingoured.fr>
+Date: Wed, 1 Aug 2012 22:30:12 +0200
+Subject: [PATCH] Let allow the signal.SIGTERM to fail
+
+If os.kill(pid, signal.SIGTERM) fails, currently guake fails as well
+we should allow this command to fail withouth throwing an
+exception.
+---
+ src/guake |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/guake b/src/guake
+index 6d8f9c5..72ea56e 100644
+--- a/src/guake
++++ b/src/guake
+@@ -1259,7 +1259,10 @@ class Guake(SimpleGladeApp):
+         call this in another thread. This doesn't change any thing in
+         UI, so you can use python's start_new_thread.
+         """
+-        os.kill(pid, signal.SIGTERM)
++        try:
++            os.kill(pid, signal.SIGTERM)
++        except OSError:
++            pass
+         num_tries = 30
+ 
+         while num_tries > 0:
+-- 
+1.7.7.6
+

g/guake/guake-vl.spec

@@ -4,11 +4,15 @@ Summary:	Drop-down terminal for GNOME Desktop Environment
 Summary(ja): 	GNOME 用のドロップダウン式の端末エミュレータ
 Name:		guake
 Version:	0.4.4
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 #Source1:	guake-0.4.1-ja.po
 Patch0:         0001-Fix-focus-issue-on-gnome-shell.patch
 Patch1:         0001-Fix-notification.patch
+Patch2:         0001-Let-allow-the-signal.SIGTERM-to-fail.patch
+Patch3:         0001-Fix-regex-to-include-the-port-number-when-there-is-o.patch
+# Upstream patch at https://github.com/Guake/guake/pull/75
+Patch4:         0001-Include-bpython-and-ipython-as-interpreters.patch
 
 License:	GPLv2+
 Group:		Applications/Accessories
@@ -25,6 +29,8 @@ BuildRequires: desktop-file-utils
 BuildRequires: intltool, gettext
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
 Packager:	kazutaka
 
 %description
@@ -48,6 +54,9 @@ sed -i 's/Categories=GNOME;GTK;Utility;TerminalEmulator;/Categories=GNOME;GTK;Ut
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %configure --disable-static \
@@ -122,11 +131,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Dec 31 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 0.4.4-2
+- add some patches from Fedora guake-0.4.4-11.fc21
+ - 0001-Let-allow-the-signal.SIGTERM-to-fail.patch (Patch2)
+ - 0001-Fix-regex-to-include-the-port-number-when-there-is-o.patch (Patch3)
+ - 0001-Include-bpython-and-ipython-as-interpreters.patch (Patch4)
+- add Vendor and Distribution tags
+
 * Sat Jul 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.4-1
 - new upstream release
 - added Patch1 from Fedora
 - run gtk-update-icon-cache in %%post, %%posutn
 
+
 * Thu Jun 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.3-2
 - run desktop-file-validate in %%check