diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-23 18:58:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-23 18:58:22 +0000 |
| commit | ef90c84c1cfd2b717e13a3c20a8a06c0cfa9bf0c (patch) | |
| tree | b452625c8fde409994c4fc6587d1d17c3ca01d42 | |
| parent | Use pkg-config instead of xft-config for libXft detection wrt #397739 by "Weo... (diff) | |
| download | gentoo-2-ef90c84c1cfd2b717e13a3c20a8a06c0cfa9bf0c.tar.gz gentoo-2-ef90c84c1cfd2b717e13a3c20a8a06c0cfa9bf0c.tar.bz2 gentoo-2-ef90c84c1cfd2b717e13a3c20a8a06c0cfa9bf0c.zip | |
Fix build with USE=introspection, see ChangeLog
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
| -rw-r--r-- | x11-libs/libxklavier/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/libxklavier/files/libxklavier-5.2-include-top_srcdir.patch | 23 | ||||
| -rw-r--r-- | x11-libs/libxklavier/libxklavier-5.2.ebuild | 11 |
3 files changed, 37 insertions, 4 deletions
diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog index 31d08cbbf348..d51c002854da 100644 --- a/x11-libs/libxklavier/ChangeLog +++ b/x11-libs/libxklavier/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/libxklavier # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.161 2012/01/19 18:46:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.162 2012/01/23 18:58:22 ssuominen Exp $ + + 23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> libxklavier-5.2.ebuild, + +files/libxklavier-5.2-include-top_srcdir.patch: + Insert missing $(top_srcdir) reference to introspection CFLAGS wrt #399871 by + Markus Wernig *libxklavier-5.2 (19 Jan 2012) diff --git a/x11-libs/libxklavier/files/libxklavier-5.2-include-top_srcdir.patch b/x11-libs/libxklavier/files/libxklavier-5.2-include-top_srcdir.patch new file mode 100644 index 000000000000..50439efc5013 --- /dev/null +++ b/x11-libs/libxklavier/files/libxklavier-5.2-include-top_srcdir.patch @@ -0,0 +1,23 @@ +From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon, 16 Jan 2012 15:00:18 +0000 +Subject: Use local include files for building GIR + +Add -I argument for g-ir-scanner to use the include files from the local tree +instead of the ones installed in the system. +--- +diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am +index 6c8631a..c53ff6d 100644 +--- a/libxklavier/Makefile.am ++++ b/libxklavier/Makefile.am +@@ -94,7 +94,7 @@ introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURC + + Xkl-1.0.gir: libxklavier.la + Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 +-Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) ++Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) + Xkl_1_0_gir_LIBS = libxklavier.la + Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) + INTROSPECTION_GIRS += Xkl-1.0.gir +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-libs/libxklavier/libxklavier-5.2.ebuild b/x11-libs/libxklavier/libxklavier-5.2.ebuild index a5fad3cc200e..f23b8b85fd0e 100644 --- a/x11-libs/libxklavier/libxklavier-5.2.ebuild +++ b/x11-libs/libxklavier/libxklavier-5.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-5.2.ebuild,v 1.1 2012/01/19 18:46:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-5.2.ebuild,v 1.2 2012/01/23 18:58:22 ssuominen Exp $ EAPI=4 -inherit gnome.org libtool +inherit autotools eutils gnome.org libtool DESCRIPTION="A library for the X Keyboard Extension (high-level API)" HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier" @@ -30,7 +30,12 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog CREDITS NEWS README" src_prepare() { - elibtoolize + if use introspection; then + epatch "${FILESDIR}"/${P}-include-top_srcdir.patch + eautoreconf + else + elibtoolize + fi } src_configure() { |