summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerkan Kaba <serkan@gentoo.org>2012-02-19 11:16:15 +0000
committerSerkan Kaba <serkan@gentoo.org>2012-02-19 11:16:15 +0000
commit71263bec4b48ff6e83ad608e2e8df35f650dc007 (patch)
treefca702f0aa71bdecc64a1430110a34c8e7674b6b /x11-libs
parentVersion bump (diff)
downloadgentoo-2-71263bec4b48ff6e83ad608e2e8df35f650dc007.tar.gz
gentoo-2-71263bec4b48ff6e83ad608e2e8df35f650dc007.tar.bz2
gentoo-2-71263bec4b48ff6e83ad608e2e8df35f650dc007.zip
Fix bug #404397 reported by Aljosha Papsch <papsch.al@googlemail.com>
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtkhotkey/ChangeLog8
-rw-r--r--x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch12
-rw-r--r--x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild5
3 files changed, 21 insertions, 4 deletions
diff --git a/x11-libs/gtkhotkey/ChangeLog b/x11-libs/gtkhotkey/ChangeLog
index 441ebf251d5b..e832cb6b5393 100644
--- a/x11-libs/gtkhotkey/ChangeLog
+++ b/x11-libs/gtkhotkey/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/gtkhotkey
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/ChangeLog,v 1.13 2011/02/27 16:14:29 serkan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/ChangeLog,v 1.14 2012/02/19 11:16:15 serkan Exp $
+
+ 19 Feb 2012; Serkan Kaba <serkan@gentoo.org> gtkhotkey-0.2.1.ebuild,
+ +files/gtkhotkey-0.2.1-glibheaders.patch:
+ Fix bug #404397 reported by Aljosha Papsch <papsch.al@googlemail.com>
27 Feb 2011; Serkan Kaba <serkan@gentoo.org>
-files/gtkhotkey-0.2.0-buildfixes.patch,
diff --git a/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
new file mode 100644
index 000000000000..684d0ccef945
--- /dev/null
+++ b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
@@ -0,0 +1,12 @@
+diff -Nurp gtkhotkey-0.2.1/src/gtk-hotkey-error.h gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h
+--- gtkhotkey-0.2.1/src/gtk-hotkey-error.h 2009-09-03 22:52:49.000000000 +0200
++++ gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h 2012-02-19 12:04:19.483701649 +0100
+@@ -23,7 +23,7 @@
+ #ifndef __GTK_HOTKEY_ERROR_H__
+ #define __GTK_HOTKEY_ERROR_H__
+
+-#include <glib/gquark.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild
index f8eabe814b4d..89aac1f2566b 100644
--- a/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild
+++ b/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild,v 1.4 2011/02/27 16:04:55 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild,v 1.5 2012/02/19 11:16:15 serkan Exp $
EAPI="2"
@@ -34,6 +34,7 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die "Patching Makefile.in failed"
+ epatch "${FILESDIR}"/${P}-glibheaders.patch
}
src_install() {