summaryrefslogtreecommitdiff
path: root/community/guake
diff options
context:
space:
mode:
Diffstat (limited to 'community/guake')
-rw-r--r--community/guake/PKGBUILD17
-rw-r--r--community/guake/guake-glib2.32.patch21
2 files changed, 34 insertions, 4 deletions
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index 1df90ebb5..9bd937c0e 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68271 2012-03-21 05:47:03Z bgyorgy $
+# $Id: PKGBUILD 68559 2012-03-28 06:25:01Z 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=6
+pkgrel=7
pkgdesc='Drop-down terminal for GNOME'
arch=('i686' 'x86_64')
url="http://guake.org/"
@@ -15,18 +15,24 @@ 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)
+ http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch
+ guake-glib2.32.patch)
md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e'
- '9aca6ba8e46ae1b69958cda0e03320ff')
+ '9aca6ba8e46ae1b69958cda0e03320ff'
+ 'ac692391e2fa171f6f96e5ceb2284c2d')
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"
# Patch to import proxy port setting as int (http://guake.org/ticket/246)
patch -Np1 -i "$srcdir/0001-Retrieve-port-as-int.2.patch"
+ # Do not disable autostart in GNOME
+ sed -i '/X-GNOME-Autostart-enabled/ d' data/guake.desktop.in
+
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --disable-schemas-install \
--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
@@ -38,4 +44,7 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
+
+ # Remove autostart file
+ rm -r "$pkgdir/etc"
}
diff --git a/community/guake/guake-glib2.32.patch b/community/guake/guake-glib2.32.patch
new file mode 100644
index 000000000..a370e123c
--- /dev/null
+++ b/community/guake/guake-glib2.32.patch
@@ -0,0 +1,21 @@
+commit 0353da88e550031b4694a4168bd6d489f873d68a
+Author: max ulidtko <ulidtko@gmail.com>
+Date: Fri Mar 2 07:51:38 2012 +0200
+
+ globalhotkeys build fix for glib 2.31
+
+ apply patch from #425
+
+diff --git a/src/globalhotkeys/keybinder.h b/src/globalhotkeys/keybinder.h
+index 00e532d..69a50c0 100644
+--- a/src/globalhotkeys/keybinder.h
++++ b/src/globalhotkeys/keybinder.h
+@@ -2,7 +2,7 @@
+ #ifndef __KEY_BINDER_H__
+ #define __KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+