pingou pushed to guake (f21). "Merge branch 'master' into f21"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 19 10:25:03 UTC 2015
>From cc790b8670de4d68f881fb82c7f97bc6cd7eaac5 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Thu, 29 Jan 2015 17:21:25 +0100
Subject: Adding a test file
diff --git a/test b/test
new file mode 100644
index 0000000..e69de29
--
cgit v0.10.2
>From 37f98cc7406ee401c65008891d142046e230a3ed Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Thu, 29 Jan 2015 18:16:22 +0100
Subject: Line 1
diff --git a/test b/test
index e69de29..d00491f 100644
--- a/test
+++ b/test
@@ -0,0 +1 @@
+1
--
cgit v0.10.2
>From 0a2c0d5342ad06a27886ff8c6e32749a0d9efc1c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Thu, 29 Jan 2015 18:16:27 +0100
Subject: Line 2
diff --git a/test b/test
index d00491f..1191247 100644
--- a/test
+++ b/test
@@ -1 +1,2 @@
1
+2
--
cgit v0.10.2
>From 86c9786d98759028d9e1d9680712ec58e4e77b75 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Thu, 29 Jan 2015 18:18:10 +0100
Subject: line 3
diff --git a/test b/test
index 1191247..01e79c3 100644
--- a/test
+++ b/test
@@ -1,2 +1,3 @@
1
2
+3
--
cgit v0.10.2
>From a4151bf0568e6d04a9f053129afbffa15ddaf4c3 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Thu, 29 Jan 2015 18:18:15 +0100
Subject: line 4
diff --git a/test b/test
index 01e79c3..94ebaf9 100644
--- a/test
+++ b/test
@@ -1,3 +1,4 @@
1
2
3
+4
--
cgit v0.10.2
>From 17e44a7d574658b83db3514d7dae925ec2be04ad Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Thu, 29 Jan 2015 18:19:33 +0100
Subject: Drop test file
diff --git a/sources b/sources
index ce8f327..196dda4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9f5b27540b0d38e2c6dd88c7018f6f3 guake-0.5.2.tar.gz
+b026aa8811cb73fbb8abb3649c79bde3 guake-0.5.0.tar.gz
diff --git a/test b/test
deleted file mode 100644
index 94ebaf9..0000000
--- a/test
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-2
-3
-4
--
cgit v0.10.2
>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
>From c5d43f12ae2b31daa473e9c054910a213edd1491 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Sun, 19 Apr 2015 12:04:50 +0200
Subject: Update to 0.6.0 with a new patch for the desktop files
diff --git a/.gitignore b/.gitignore
index fcd4642..2044c27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ guake-0.4.2.tar.gz
/guake-0.5.0.tar.gz
/guake-guake-0.5.0.tar.gz
/guake-0.5.2.tar.gz
+/guake-0.6.0.tar.gz
diff --git a/0001-Make-the-desktop-file-valid.patch b/0001-Make-the-desktop-file-valid.patch
new file mode 100644
index 0000000..a02d724
--- /dev/null
+++ b/0001-Make-the-desktop-file-valid.patch
@@ -0,0 +1,52 @@
+From 596da1850144379dae0e0ba2a28e9affaaeb8847 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou at pingoured.fr>
+Date: Sun, 19 Apr 2015 11:54:07 +0200
+Subject: [PATCH] Make the desktop file valid
+
+---
+ data/guake-prefs.desktop.in | 6 +++---
+ data/guake.desktop.in | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/data/guake-prefs.desktop.in b/data/guake-prefs.desktop.in
+index d1fb90f..bb61bfc 100644
+--- a/data/guake-prefs.desktop.in
++++ b/data/guake-prefs.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Guake Preferences
+-_Comment=Configure your Guake sessions
++Name=Guake Preferences
++Comment=Configure your Guake sessions
+ TryExec=guake-prefs
+ Exec=guake-prefs
+ Icon=guake-prefs
+@@ -10,4 +10,4 @@ Type=Application
+ StartupNotify=true
+ Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
+ X-Desktop-File-Install-Version=0.15
+-_Keywords=Terminal;Utility;
++Keywords=Terminal;Utility;
+diff --git a/data/guake.desktop.in b/data/guake.desktop.in
+index b8404fd..67011aa 100644
+--- a/data/guake.desktop.in
++++ b/data/guake.desktop.in
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Guake Terminal
+-_Comment=Use the command line in a Quake-like terminal
++Name=Guake Terminal
++Comment=Use the command line in a Quake-like terminal
+ TryExec=guake
+ Exec=guake
+ Icon=guake
+ Type=Application
+ Categories=GNOME;GTK;System;Utility;TerminalEmulator;
+ StartupNotify=true
+-_Keywords=Terminal;Utility;
++Keywords=Terminal;Utility;
+--
+2.1.0
+
diff --git a/guake.spec b/guake.spec
index 0ebbafb..6a8004d 100644
--- a/guake.spec
+++ b/guake.spec
@@ -1,15 +1,15 @@
Name: guake
-Version: 0.5.2
+Version: 0.6.0
Release: 1%{?dist}
Summary: Drop-down terminal for GNOME
Group: Applications/System
License: GPLv2+
URL: http://www.guake.org/
-#Source0: https://github.com/Guake/guake/archive/guake-%{version}.tar.gz
+#Source0: https://github.com/Guake/guake/archive/%{version}.tar.gz
Source0: guake-%{version}.tar.gz
Patch5: 0001-Remove-vte-check-in-the-configure.ac.patch
-Patch6: fix_resize_mouse.patch
+Patch7: 0001-Make-the-desktop-file-valid.patch
# Not used here -- official release --
#Source0: %{name}-%{version}.20090321git.tar.gz
@@ -45,10 +45,13 @@ and press again to hide.
sed -i -e '/^#!\//, 1d' src/guake/notifier.py
%patch5 -p1 -b .
-%patch6 -p1 -b .
+%patch7 -p1 -b .
./autogen.sh
+cat data/guake.desktop.in
+cat data/guake.desktop
+
# Enables to pass the configure without problem concerning python vte library
sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
sed -i -e "s|include <glib/gtypes.h>|include <glib.h>|" src/guake/globalhotkeys/keybinder.h
@@ -109,6 +112,9 @@ killall gconfd-2 > /dev/null || :
%{_datadir}/icons/hicolor/*/apps/%{name}*.png
%changelog
+* Sun Apr 19 2015 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.6.0-1
+- Update to upstream's 0.6.0
+
* Tue Jan 20 2015 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.5.2-1
- Update to upstream's 0.5.2
- Backport patch from upstream to fix resizing the window with the mouse
diff --git a/sources b/sources
index 196dda4..cd003c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b026aa8811cb73fbb8abb3649c79bde3 guake-0.5.0.tar.gz
+86502b6a8e12d42d74e6da7eaa403877 guake-0.6.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/guake.git/commit/?h=f21&id=0f3117d26b3ff1655932fe36717289714ae766f9
More information about the scm-commits
mailing list