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 | ef872afecdd4f19cd46adadfdeff0b561b8ddbcc (patch) | |
| tree | 74588326a730adbd5b7e7a51670bb91ef4104704 /x11-libs/libxklavier | |
| parent | Use pkg-config instead of xft-config for libXft detection wrt #397739 by "Weo... (diff) | |
| download | historical-ef872afecdd4f19cd46adadfdeff0b561b8ddbcc.tar.gz historical-ef872afecdd4f19cd46adadfdeff0b561b8ddbcc.tar.bz2 historical-ef872afecdd4f19cd46adadfdeff0b561b8ddbcc.zip | |
Fix build with USE=introspection, see ChangeLog
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/libxklavier')
| -rw-r--r-- | x11-libs/libxklavier/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/libxklavier/Manifest | 19 | ||||
| -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 |
4 files changed, 47 insertions, 13 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/Manifest b/x11-libs/libxklavier/Manifest index bd5e3a69e6dd..5e7005aa78c0 100644 --- a/x11-libs/libxklavier/Manifest +++ b/x11-libs/libxklavier/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX libxklavier-5.2-include-top_srcdir.patch 1019 RMD160 e65fa8d721e4850c7a3526a73e65c138f40ba460 SHA1 01aab4c8562e42fc48f0077b28b72923a43b361d SHA256 d2caabab0c46f6bd122ac7842005b85538f26ed1ee63b2b11febabb580fa8a1a DIST libxklavier-5.1.tar.bz2 346858 RMD160 b11190aaca9cfad31b9795d904c7581af24e262b SHA1 9ea0e705fbfa2c816babe8db632a59ccf98f6607 SHA256 1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1 DIST libxklavier-5.2.tar.xz 312864 RMD160 c42227a9ad5c5d52c91e0bcb25e05e6614073a2d SHA1 829b64e63a3d4d4463554f4f9e75a0059daa5396 SHA256 7c1f04a80035e03cec992e16b89bc708a32b3578d6e133343d2cb56385d25dfe EBUILD libxklavier-5.1.ebuild 1345 RMD160 965cead70378d37f0fe71a514e6ad8d0d8a6ae5d SHA1 91223c8059fbc9fc4bf83e94e19471c023ba167d SHA256 b6df50c459af6844fc1949b1b84f7fb35ca48a7247c52e94c020e1ad1103cce4 -EBUILD libxklavier-5.2.ebuild 1322 RMD160 e2e693a43c8640ffc6de7d34db7b815b45a2f90d SHA1 ce6ee7c2573f5fa5cf5ba2506b6cb3590af5ec66 SHA256 232e7ffb30a227431b756d8a439ea52293f22ba4427eef4260d51becc007240f -MISC ChangeLog 19400 RMD160 1630a635b478d07c464e35fb13fd1aa73e029a06 SHA1 5a4e83376010ce1f691e2bb8ed43346bd7e66941 SHA256 41233bc74f4ff0da768f3ac643dbc188673de4b0f01c03994fa0eaba80b0d4b6 +EBUILD libxklavier-5.2.ebuild 1445 RMD160 09fcd2e8e9459a7b7685c8b3d67c104dcf79905e SHA1 463cfdce4413d7c6fa060c04d824611078aca0db SHA256 a59d241353e63d2209a401190757ad501c44ed596bfb85fb06a8fac59d55ab89 +MISC ChangeLog 19626 RMD160 875ae5ca84393c40a5b3563b34c7f9d9be242f18 SHA1 be1f6c9baee7b5515e767d787913c4dffbb88b5d SHA256 81d927ef92ff030db918e2bd0d8bf65ef43db5332be466809bc4d4a2fd9ef18f MISC metadata.xml 363 RMD160 4dbc4f853ac6c39fbd8201e80e36f65c790a517b SHA1 b5925d77a0803a96b2160ae4c4661c96d53c53e3 SHA256 f1b88f406775d90ec7d414d51e38c4742fdc4dcf4ab0282df8c44e7a2f180543 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPGGSgAAoJEEdUh39IaPFNUqYH/i2Mwq3mhhEoURJ2wJstKN5+ -b6o8UGkDXHL/AXqOWYS2X89gasyjnkkw+Z2a/IwFGORsiudtO0V2IrZXOCT8nqlV -/HuJ+mib1YKfzc6Hpq+zivKr6gPnElzCUoWs7gWfwzGL6LysUjkVA/XTWNFoBSzS -YKNBM+puNUa0AuWeeNq0aTeWChY3HDXZOPkJfxCEEvg5pY9Hnf9w4teuEEegnAWv -fPiIi1e2TwnyT3ladws0ryiBBN+ScYkvtTN3ys9B6xeNoqt85orsdZtJQU1NxeiL -3jx+BvAyNDF1V8B5/zcoRmE0thvC3y7CUvZjwzg9vC4joqQvM+fVRgLarfvV1rc= -=O3sN +iQEcBAEBAgAGBQJPHa1CAAoJEEdUh39IaPFNoVwH/R4vAdFq6a3k7xwvBLVAf3vL +hvfUtMJI0cTemjdD7W4gPn1SpGokRkAmgv5O4bDIk4Yd7psmi1BH5YOmgPjjUKI8 +XNbC21EFTyQvNweEjOR5mL2QSBao3WcEnTMuMZA8Cu+w0Q+YCcXSfddqTpn5rZqd +NxD3aPBXEWMG0wr9YyofbBSLxyiEK9+4qr7PcAw3FfrYNQBFrzXU9qb5pfqCZfhW +OZLnXl1p1fsKcj8v5fc/5viY7VhZieoI5s6hw9D+lQ0GzV9qz7tHeBbSndeLwJAo +/xa6cKS7NOr8FF6LM3VXM8AeXeCDSm+Ajd6YBni1ZVphYiNbvmecPuLK2dD3H6Y= +=HE0D -----END PGP SIGNATURE----- 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() { |