pingou pushed to guake (f22). "Drop all un-used patches"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 19 10:17:32 UTC 2015
>From 09a32577127e3496e52d3ee4d73d139d56c6e5bc Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Sun, 19 Apr 2015 12:04:37 +0200
Subject: Drop all un-used patches
diff --git a/0001-Fix-notification.patch b/0001-Fix-notification.patch
deleted file mode 100644
index 1d7a11a..0000000
--- a/0001-Fix-notification.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 855be1063f201a0fcc8c37efe3c59bde17801a32 Mon Sep 17 00:00:00 2001
-From: Pierre-Yves Chibon <pingou at 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
-
diff --git a/0001-Fix-regex-to-include-the-port-number-when-there-is-o.patch b/0001-Fix-regex-to-include-the-port-number-when-there-is-o.patch
deleted file mode 100644
index 1a96d6e..0000000
--- a/0001-Fix-regex-to-include-the-port-number-when-there-is-o.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7e0bb91a11dcc211ca2f08c01b1339ddc1249284 Mon Sep 17 00:00:00 2001
-From: Pierre-Yves Chibon <pingou at 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
-
diff --git a/0001-Include-bpython-and-ipython-as-interpreters.patch b/0001-Include-bpython-and-ipython-as-interpreters.patch
deleted file mode 100644
index 18559ea..0000000
--- a/0001-Include-bpython-and-ipython-as-interpreters.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6d574c1ea4233bf514ee4fff68a70cefc9b034d7 Mon Sep 17 00:00:00 2001
-From: Ralph Bean <rbean at 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
-
diff --git a/0001-Let-allow-the-signal.SIGTERM-to-fail.patch b/0001-Let-allow-the-signal.SIGTERM-to-fail.patch
deleted file mode 100644
index 458c6f6..0000000
--- a/0001-Let-allow-the-signal.SIGTERM-to-fail.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d9c55e9192e8fbd5c84b6a7bfbf28ed88e119717 Mon Sep 17 00:00:00 2001
-From: Pierre-Yves Chibon <pingou at 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
-
diff --git a/fix_resize_mouse.patch b/fix_resize_mouse.patch
deleted file mode 100644
index d7ecd65..0000000
--- a/fix_resize_mouse.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 03df18a82b61c68bf5ffb23e7e8c02fa590d2656 Mon Sep 17 00:00:00 2001
-From: Gaetan Semet <gaetan at xeberon.net>
-Date: Tue, 23 Dec 2014 16:48:54 +0100
-Subject: [PATCH] #421 wasn't applied
-
----
- src/guake/guake_app.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/guake/guake_app.py b/src/guake/guake_app.py
-index 82c2c6f..6fc5eb0 100644
---- a/src/guake/guake_app.py
-+++ b/src/guake/guake_app.py
-@@ -373,7 +373,9 @@ def on_resizer_drag(self, widget, event):
- if percent < 1:
- percent = 1
-
-- self.client.set_int(KEY('/general/window_height'), int(percent))
-+ window_rect = self.window.get_size()
-+ self.window.resize(window_rect[0], y)
-+ # self.client.set_int(KEY('/general/window_height'), int(percent))
-
- def on_window_losefocus(self, window, event):
- """Hides terminal main window when it loses the focus and if
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/guake.git/commit/?h=f22&id=09a32577127e3496e52d3ee4d73d139d56c6e5bc
More information about the scm-commits
mailing list