introspection.m4 is required for eautoreconf (bug #397761, thanks to Oleg for reporti...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog
index 9cad6d58facc7c446df897f89477b302db18ccf2..da725a2882b1f560bf04f02854a8e6ea67504142 100644 (file)
--- a/x11-libs/gtk+extra/ChangeLog
+++ b/x11-libs/gtk+extra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+extra
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.37 2011/12/29 18:14:32 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.38 2012/01/09 17:37:09 tetromino Exp $
+
+  09 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtk+extra-3.0.1.ebuild, +files/gtk+extra-3.0.1-gunicode.h.patch:
+  introspection.m4 is required for eautoreconf (bug #397761, thanks to Oleg for
+  reporting). Also, fix building with >=glib-2.31.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> gtk+extra-3.0.1.ebuild:
   amd64 stable, bug 393007

diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index 28734dc526837e3d728acfef3145af1f7fb18562..4b5bf789ae133d7b2470f7ac32c522582839b307 100644 (file)
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gtk+extra-2.1.2-build.patch 6704 RMD160 b9b8788ed4f347ecb99d785e225813d4b0693966 SHA1 f748a07694869d984be9673408f49ad3bb4242da SHA256 8ecf5526f9ddc04aa58db561eb1e70cfe91540ddf215db0e761135e0bbdb7932
 AUX gtk+extra-2.1.2-gtk+-2.21.patch 990 RMD160 6057209dc703bfb12d12fd3ed7b01aaee2b0c9e7 SHA1 2af3d99e6404b239fb720af39b2a3ffc91d5cf6b SHA256 634dc1f16b85a2902106280fb92f358c5a5fa41c04377d9f7f419e64228d8575
 AUX gtk+extra-2.1.2-itementry-crash.patch 665 RMD160 66964cef9b7dc5997c52be25651d7ecfb4aa61b7 SHA1 c4fb6d7f0534455de6de38aefda8aaa760d9452c SHA256 672149d0061ec2e62c13c5e215afcd9575cfbe6e8f9d345122fcf1c566d34fab
 AUX gtk+extra-2.1.2-marshal.patch 536 RMD160 14602c8e5f6598104c17e3265183281868eb4e69 SHA1 0ee01e2da7ccc6331c6d5e6a4e93c5504bb4399e SHA256 9cfb93fe3e4098ded71987be5e7c363da7c286956751c07da851c8e142300c4c
 AUX gtk+extra-3.0.1-fix-configure.patch 4906 RMD160 180ec1d095680923683df2f7c246bd1b2efa37a4 SHA1 65c5501114e23a7f23c08ecb9e4a69cc197c3e78 SHA256 c7e7f4186d941244ee3a8e299f2372bb0cc2ed66b02a1e3e809dc29b9a324937
+AUX gtk+extra-3.0.1-gunicode.h.patch 377 RMD160 6d1467e8ad7515d43440ace99dcc481b071fe3f6 SHA1 f1ff19162a349b1d00f502b5dfe603e1c9280bcb SHA256 a05ad52b6f701e58c6938884440dd380ecbfa482fef6355ed457fb6d642f44b9
 DIST gtk+extra-2.1.2.tar.gz 1274946 RMD160 e14bfc2a055fdef0d037b494018ca25047cc3c9e SHA1 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07 SHA256 bfc9603e2023ea071f2661ecc29e52c94b1beed6b69deae45b466df7f5b2ce55
 DIST gtk+extra-3.0.1.tar.gz 1378220 RMD160 e8bd1f6d4c5e50beb653b96801b84a049d1fb111 SHA1 ae976fc6809807639d08069119c4ded9e8d38438 SHA256 11ab4a9210a5ff454f1310ee9e93a12422aff524e3c699afe268ec574df7b6d8
+DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD gtk+extra-2.1.2-r1.ebuild 1070 RMD160 3deae844095229683048daf8020fabef94aafd31 SHA1 f15db81f441f4cdf77b8ec9ba088c7a7de06028f SHA256 fdfeb31c71acd41d8b798ff6d4a7bedb56f6f92be04f31110bc48bca1304a056
-EBUILD gtk+extra-3.0.1.ebuild 1195 RMD160 4288e098124f993c88ffce03970177c5db58b57b SHA1 eda43de019905bb4a658701ed9c5f0260d1ac0ad SHA256 280cf6f623cf95c0010f0c21b4ebef6d018a7f334f0a678b64fd60571b381a70
-MISC ChangeLog 5808 RMD160 40a27208e88814312f95049f223aa1ff5fe75a23 SHA1 b8999febee626130763d267a0bb43dc16fcf3f41 SHA256 7235bbec2e1d04ff2ed8cc256d168e3f61ae1e961861d8c898489848c75ef5a2
+EBUILD gtk+extra-3.0.1.ebuild 1428 RMD160 31b493298991c39760312cace30a987561923f95 SHA1 a294e5f8194e29ad8cf099d3af5f84b447170b27 SHA256 d8800b8652221b3e490e3bf965b426c2ed21f68a1d07cb5fa2bb3d525fe57215
+MISC ChangeLog 6070 RMD160 14ca815a334006f84acba903c18170a8b6557070 SHA1 f8c8d103d4c90940d34aca6c2499dc6943d7c757 SHA256 bdafc1d5eb8446ec25fb574dace235c028df5967acbe90bbcb47c7ccb275198b
 MISC metadata.xml 274 RMD160 8af80b495a9229fed210308d7c40add13039ca68 SHA1 c35820b2533d8a834e346c4fd21e1c2552915ed9 SHA256 624a014a9903b5d6808bad7691e52c0fe3cece7d11062be9b81681d30730f659
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk78rg4ACgkQCaWpQKGI+9QfCQCff4TYM8UrlUqVUxhYeRBmufhu
-0l8AniLnitR1uPSen0PB+W9XYk4b3Gru
-=byDs
+iF4EAREIAAYFAk8LJcoACgkQdjK8w9WeBnDnxQD/S2U5/5g3dbbNKwd2SgaM3FCo
+pLZvMDOcaY4armKG5VUBAIXXKvNi9WyVojpMQc1SnjOcsiPunLL58sMRTre10iUv
+=wxIL
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch b/x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch
new file mode 100644 (file)
index 0000000..63017be
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch
@@ -0,0 +1,14 @@
+2011-11-16 Fredy Paquet <mailbox AT opag.ch>
+    * fixed include problem with glib V2.31.0 (only glib.h can be included directly)
+
+--- gtkextra/gtkcharsel.c      2011/09/10 11:44:53     1.10
++++ gtkextra/gtkcharsel.c      2011/11/26 11:05:59     1.11
+@@ -34,7 +34,7 @@
+ 
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ #include <string.h>
+ #include "gtkextra-compat.h"

diff --git a/x11-libs/gtk+extra/gtk+extra-3.0.1.ebuild b/x11-libs/gtk+extra/gtk+extra-3.0.1.ebuild
index 12f5f5feb8b5f1d5095651f23db695c755f5b367..761ed154a7235a2bfc2e0aee05c67a9997d56b66 100644 (file)
--- a/x11-libs/gtk+extra/gtk+extra-3.0.1.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.0.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/gtk+extra/gtk+extra-3.0.1.ebuild,v 1.3 2011/12/29 18:14:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-3.0.1.ebuild,v 1.4 2012/01/09 17:37:09 tetromino Exp $
 
 EAPI="4"
 
@@ -8,7 +8,8 @@ inherit autotools eutils
 
 DESCRIPTION="Useful Additional GTK+ widgets"
 HOMEPAGE="http://gtkextra.sourceforge.net"
-SRC_URI="mirror://sourceforge/gtkextra/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gtkextra/${P}.tar.gz
+       mirror://gentoo/introspection.m4.bz2"
 
 LICENSE="FDL-1.1 LGPL-2"
 SLOT="0"
@@ -25,7 +26,13 @@ src_prepare() {
        # Fix configure,
        # https://sourceforge.net/tracker/?func=detail&aid=3414011&group_id=11638&atid=111638
        epatch "${FILESDIR}/${P}-fix-configure.patch"
-       eautoreconf
+
+       # Upstream patch to fix building with >=glib-2.31
+       epatch "${FILESDIR}/${P}-gunicode.h.patch"
+
+       # eautoreconf needs introspection.m4
+       cp "${WORKDIR}"/introspection.m4 . || die
+       AT_M4DIR="." eautoreconf
 }
 
 src_configure() {