Mon Jun 11 00:02:18 UTC 2012

3 files changed, 68 insertions, 13 deletions

diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index 9bd937c0e..96de81dee 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -1,34 +1,36 @@
-# $Id: PKGBUILD 68559 2012-03-28 06:25:01Z bgyorgy $
+# $Id: PKGBUILD 72161 2012-06-09 09:50:29Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
 
 pkgname=guake
-pkgver=0.4.2
-pkgrel=7
+pkgver=0.4.3
+pkgrel=1
 pkgdesc='Drop-down terminal for GNOME'
 arch=('i686' 'x86_64')
 url="http://guake.org/"
 license=('GPL')
-depends=('python-notify' 'vte' 'python2-gconf' 'dbus-python')
+depends=('python-notify' 'vte' 'python2-gconf' 'dbus-python' 'pyxdg')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
 source=(http://guake.org/files/$pkgname-$pkgver.tar.gz
-        http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch
-        guake-glib2.32.patch)
-md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e'
-         '9aca6ba8e46ae1b69958cda0e03320ff'
-         'ac692391e2fa171f6f96e5ceb2284c2d')
+        guake-fix-notification.patch
+        guake-fix-pref.desktop.patch)
+md5sums=('951e42f3c6b24912baab2f4f6c84e658'
+         '0b57227e6869dd84dd4fb0794ed0d082'
+         '0e042a6ac89f5e77c45a96c42494bc3d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in
-  sed -i 's|PYTHON="/usr/bin/python"|PYTHON="/usr/bin/python2"|' src/guake{,-prefs}.in
-  patch -Np1 -i "$srcdir/guake-glib2.32.patch"
+  sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py}
 
-  # Patch to import proxy port setting as int (http://guake.org/ticket/246)
-  patch -Np1 -i "$srcdir/0001-Retrieve-port-as-int.2.patch"
+  # http://guake.org/ticket/416
+  patch -Np1 -i "$srcdir/guake-fix-notification.patch"
+
+  # http://guake.org/ticket/448
+  patch -Np1 -i "$srcdir/guake-fix-pref.desktop.patch"
 
   # Do not disable autostart in GNOME
   sed -i '/X-GNOME-Autostart-enabled/ d' data/guake.desktop.in
diff --git a/community/guake/guake-fix-notification.patch b/community/guake/guake-fix-notification.patch
new file mode 100644
index 000000000..847dac10e
--- /dev/null
+++ b/community/guake/guake-fix-notification.patch
@@ -0,0 +1,42 @@
+--- 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
+
diff --git a/community/guake/guake-fix-pref.desktop.patch b/community/guake/guake-fix-pref.desktop.patch
new file mode 100644
index 000000000..6bd256d28
--- /dev/null
+++ b/community/guake/guake-fix-pref.desktop.patch
@@ -0,0 +1,11 @@
+--- guake-0.4.2-orig/data/guake-prefs.desktop.in	2009-12-01 12:51:08.000000000 +0100
++++ guake-0.4.2/data/guake-prefs.desktop.in	2012-05-21 17:07:05.982022360 +0200
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Name=Guake Preferences
+ Name[pt_BR]=Preferências do Guake
+-Comment=Comment=Configure your Guake sessions
++Comment=Configure your Guake sessions
+ Comment[pt_BR]=Configurações do terminal Guake
+ TryExec=guake-prefs
+ Exec=guake-prefs