diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-09 17:37:09 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-09 17:37:09 +0000 |
| commit | a0530efa81af8ba7225c14a93dc898af90066ea0 (patch) | |
| tree | 21e2f8da4002d7ab9512c223a07e58d52e8135ed /x11-libs/gtk+extra | |
| parent | x86 stable wrt bug #396359 (diff) | |
| download | gentoo-2-a0530efa81af8ba7225c14a93dc898af90066ea0.tar.gz gentoo-2-a0530efa81af8ba7225c14a93dc898af90066ea0.tar.bz2 gentoo-2-a0530efa81af8ba7225c14a93dc898af90066ea0.zip | |
introspection.m4 is required for eautoreconf (bug #397761, thanks to Oleg for reporting). Also, fix building with >=glib-2.31.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/gtk+extra')
| -rw-r--r-- | x11-libs/gtk+extra/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch | 14 | ||||
| -rw-r--r-- | x11-libs/gtk+extra/gtk+extra-3.0.1.ebuild | 15 |
3 files changed, 32 insertions, 6 deletions
diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog index 9cad6d58facc..da725a2882b1 100644 --- 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/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 index 000000000000..63017be44fec --- /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 12f5f5feb8b5..761ed154a723 100644 --- 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() { |