[arch-commits] Commit in guake/repos (14 files)

Balló György bgyorgy at archlinux.org
Sun Oct 5 19:43:55 UTC 2014


    Date: Sunday, October 5, 2014 @ 21:43:55
  Author: bgyorgy
Revision: 120181

archrelease: copy trunk to community-i686, community-x86_64

Added:
  guake/repos/community-i686/PKGBUILD
    (from rev 120180, guake/trunk/PKGBUILD)
  guake/repos/community-i686/fix-crasher.patch
    (from rev 120180, guake/trunk/fix-crasher.patch)
  guake/repos/community-i686/fix-hotkey.patch
    (from rev 120180, guake/trunk/fix-hotkey.patch)
  guake/repos/community-i686/guake.install
    (from rev 120180, guake/trunk/guake.install)
  guake/repos/community-x86_64/PKGBUILD
    (from rev 120180, guake/trunk/PKGBUILD)
  guake/repos/community-x86_64/fix-crasher.patch
    (from rev 120180, guake/trunk/fix-crasher.patch)
  guake/repos/community-x86_64/fix-hotkey.patch
    (from rev 120180, guake/trunk/fix-hotkey.patch)
  guake/repos/community-x86_64/guake.install
    (from rev 120180, guake/trunk/guake.install)
Deleted:
  guake/repos/community-i686/PKGBUILD
  guake/repos/community-i686/guake-fix-notification.patch
  guake/repos/community-i686/guake.install
  guake/repos/community-x86_64/PKGBUILD
  guake/repos/community-x86_64/guake-fix-notification.patch
  guake/repos/community-x86_64/guake.install

-----------------------------------------------+
 /PKGBUILD                                     |  102 ++++++++++++++++++++++++
 /guake.install                                |   44 ++++++++++
 community-i686/PKGBUILD                       |   54 ------------
 community-i686/fix-crasher.patch              |   13 +++
 community-i686/fix-hotkey.patch               |   14 +++
 community-i686/guake-fix-notification.patch   |   42 ---------
 community-i686/guake.install                  |   22 -----
 community-x86_64/PKGBUILD                     |   54 ------------
 community-x86_64/fix-crasher.patch            |   13 +++
 community-x86_64/fix-hotkey.patch             |   14 +++
 community-x86_64/guake-fix-notification.patch |   42 ---------
 community-x86_64/guake.install                |   22 -----
 12 files changed, 200 insertions(+), 236 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-10-05 19:43:44 UTC (rev 120180)
+++ community-i686/PKGBUILD	2014-10-05 19:43:55 UTC (rev 120181)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x at linuxmail.org>
-
-pkgname=guake
-pkgver=0.4.4
-pkgrel=4
-pkgdesc='Drop-down terminal for GNOME'
-arch=('i686' 'x86_64')
-url="http://guake.org/"
-license=('GPL')
-depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg')
-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')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # 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
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-               --disable-static --disable-schemas-install \
-               --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-               PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}

Copied: guake/repos/community-i686/PKGBUILD (from rev 120180, guake/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-10-05 19:43:55 UTC (rev 120181)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x at linuxmail.org>
+
+pkgname=guake
+pkgver=0.5.0
+pkgrel=1
+pkgdesc='Drop-down terminal for GNOME'
+arch=('i686' 'x86_64')
+url="http://guake.org/"
+license=('GPL')
+depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg')
+makedepends=('intltool' 'gnome-common')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz
+        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}
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+               --disable-static --disable-schemas-install \
+               --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+               PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}

Copied: guake/repos/community-i686/fix-crasher.patch (from rev 120180, guake/trunk/fix-crasher.patch)
===================================================================
--- community-i686/fix-crasher.patch	                        (rev 0)
+++ community-i686/fix-crasher.patch	2014-10-05 19:43:55 UTC (rev 120181)
@@ -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:

Copied: guake/repos/community-i686/fix-hotkey.patch (from rev 120180, guake/trunk/fix-hotkey.patch)
===================================================================
--- community-i686/fix-hotkey.patch	                        (rev 0)
+++ community-i686/fix-hotkey.patch	2014-10-05 19:43:55 UTC (rev 120181)
@@ -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: community-i686/guake-fix-notification.patch
===================================================================
--- community-i686/guake-fix-notification.patch	2014-10-05 19:43:44 UTC (rev 120180)
+++ community-i686/guake-fix-notification.patch	2014-10-05 19:43:55 UTC (rev 120181)
@@ -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
-

Deleted: community-i686/guake.install
===================================================================
--- community-i686/guake.install	2014-10-05 19:43:44 UTC (rev 120180)
+++ community-i686/guake.install	2014-10-05 19:43:55 UTC (rev 120181)
@@ -1,22 +0,0 @@
-pkgname=guake
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}

Copied: guake/repos/community-i686/guake.install (from rev 120180, guake/trunk/guake.install)
===================================================================
--- community-i686/guake.install	                        (rev 0)
+++ community-i686/guake.install	2014-10-05 19:43:55 UTC (rev 120181)
@@ -0,0 +1,22 @@
+pkgname=guake
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-10-05 19:43:44 UTC (rev 120180)
+++ community-x86_64/PKGBUILD	2014-10-05 19:43:55 UTC (rev 120181)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x at linuxmail.org>
-
-pkgname=guake
-pkgver=0.4.4
-pkgrel=4
-pkgdesc='Drop-down terminal for GNOME'
-arch=('i686' 'x86_64')
-url="http://guake.org/"
-license=('GPL')
-depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg')
-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')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # 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
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-               --disable-static --disable-schemas-install \
-               --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-               PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}

Copied: guake/repos/community-x86_64/PKGBUILD (from rev 120180, guake/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-10-05 19:43:55 UTC (rev 120181)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x at linuxmail.org>
+
+pkgname=guake
+pkgver=0.5.0
+pkgrel=1
+pkgdesc='Drop-down terminal for GNOME'
+arch=('i686' 'x86_64')
+url="http://guake.org/"
+license=('GPL')
+depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg')
+makedepends=('intltool' 'gnome-common')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz
+        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}
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+               --disable-static --disable-schemas-install \
+               --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+               PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}

Copied: guake/repos/community-x86_64/fix-crasher.patch (from rev 120180, guake/trunk/fix-crasher.patch)
===================================================================
--- community-x86_64/fix-crasher.patch	                        (rev 0)
+++ community-x86_64/fix-crasher.patch	2014-10-05 19:43:55 UTC (rev 120181)
@@ -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:

Copied: guake/repos/community-x86_64/fix-hotkey.patch (from rev 120180, guake/trunk/fix-hotkey.patch)
===================================================================
--- community-x86_64/fix-hotkey.patch	                        (rev 0)
+++ community-x86_64/fix-hotkey.patch	2014-10-05 19:43:55 UTC (rev 120181)
@@ -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: community-x86_64/guake-fix-notification.patch
===================================================================
--- community-x86_64/guake-fix-notification.patch	2014-10-05 19:43:44 UTC (rev 120180)
+++ community-x86_64/guake-fix-notification.patch	2014-10-05 19:43:55 UTC (rev 120181)
@@ -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
-

Deleted: community-x86_64/guake.install
===================================================================
--- community-x86_64/guake.install	2014-10-05 19:43:44 UTC (rev 120180)
+++ community-x86_64/guake.install	2014-10-05 19:43:55 UTC (rev 120181)
@@ -1,22 +0,0 @@
-pkgname=guake
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}

Copied: guake/repos/community-x86_64/guake.install (from rev 120180, guake/trunk/guake.install)
===================================================================
--- community-x86_64/guake.install	                        (rev 0)
+++ community-x86_64/guake.install	2014-10-05 19:43:55 UTC (rev 120181)
@@ -0,0 +1,22 @@
+pkgname=guake
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}



More information about the arch-commits mailing list