Fix building with make >= 3.82, GTK+ >= 2.21, libtool >= 2.0 and upstream typing errors wrt #333953 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

6 files changed, 309 insertions, 15 deletions

diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog
index a0e6d6e91fcd..8f502941cfed 100644
--- a/x11-libs/gtk+extra/ChangeLog
+++ b/x11-libs/gtk+extra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+extra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.24 2010/03/27 12:02:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.25 2010/09/25 19:30:40 ssuominen Exp $
+
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gtk+extra-2.1.2.ebuild, +files/gtk+extra-2.1.2-build.patch,
+  +files/gtk+extra-2.1.2-gtk+-2.21.patch,
+  +files/gtk+extra-2.1.2-marshal.patch:
+  Fix building with make >= 3.82, GTK+ >= 2.21, libtool >= 2.0 and upstream
+  typing errors wrt #333953 by Diego E. Pettenò.
 
   27 Mar 2010; Pacho Ramos <pacho@gentoo.org> gtk+extra-2.1.2.ebuild:
   As Samuli noticed again in bug 311611, LICENSE should be FDL-1.1 also
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index d5812a44d0e8..1a2548f26f7d 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+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-marshal.patch 536 RMD160 14602c8e5f6598104c17e3265183281868eb4e69 SHA1 0ee01e2da7ccc6331c6d5e6a4e93c5504bb4399e SHA256 9cfb93fe3e4098ded71987be5e7c363da7c286956751c07da851c8e142300c4c
 DIST gtk+extra-2.1.2.tar.gz 1274946 RMD160 e14bfc2a055fdef0d037b494018ca25047cc3c9e SHA1 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07 SHA256 bfc9603e2023ea071f2661ecc29e52c94b1beed6b69deae45b466df7f5b2ce55
-EBUILD gtk+extra-2.1.2.ebuild 694 RMD160 74ca6cf922a1809299e2a37f14af74f602e769ca SHA1 efb9cfb2b35b2929619efd3fb3e3a703c4218f54 SHA256 569b8792dade378e8291307a0a67bd320bd32a09b44fcb436015ce638ebe52c0
-MISC ChangeLog 4038 RMD160 32de97a2fb9cac331cd19871ee1cd349d255544b SHA1 938aead78ad8fba85cd659ed0b3bdbde8dcf831f SHA256 402e8a7c107ed19272cca159e6d9e14bac1b82669fd1ae8a4451dc7327e6d3e5
+EBUILD gtk+extra-2.1.2.ebuild 883 RMD160 61abe4fc5f4093059302f330a1bf118653ad3359 SHA1 415e6e299ae0b916caabbede442e0b5f63ff1c34 SHA256 deca83183d594eab415a2d0207a2186ea41d87078c20dcf3f5e64f483c813b2f
+MISC ChangeLog 4367 RMD160 6bc941af4a22bc89ca6adef5921eb92ba7d1cf7c SHA1 c75db4a13b254aa296512d2011eac7b23590aad5 SHA256 8ea176117910fe54bf992a7ecbe88171a12c28ed7ad789c80b6463b39b68eabd
 MISC metadata.xml 209 RMD160 d8d5450994c26467cca04e0007b1ef7d4676d9d8 SHA1 972c9d81f4e17ce38f86fe6600fb6b786c4014ec SHA256 d1a9b5333a198e7e949511b738c16eeadb97a3ae7342bb6680aff97721be235c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkut890ACgkQCaWpQKGI+9QP+wCfW800QcBXelkiWuExU6imuRWu
-dFUAn1pEDJO/NIqEKygyqjVxqaCGpIWz
-=tq+j
------END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-build.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-build.patch
new file mode 100644
index 000000000000..9d931226db00
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-build.patch
@@ -0,0 +1,246 @@
+--- configure.in
++++ configure.in
+@@ -30,10 +30,10 @@
+ AC_SUBST(GTK_EXTRA_VERSION)
+ 
+ # libtool versioning
+-LT_CURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`
+-LT_REVISION=$GTK_EXTRA_INTERFACE_AGE
+-LT_AGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`
+-LIBGTKEXTRA_SO_VERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE
++LTCURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`
++LTREVISION=$GTK_EXTRA_INTERFACE_AGE
++LTAGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`
++LIBGTKEXTRA_SO_VERSION=$LTCURRENT:$LTREVISION:$LTAGE
+ AC_SUBST(LIBGTKEXTRA_SO_VERSION)
+ 
+ # For automake
+--- gtkextra/Makefile.am
++++ gtkextra/Makefile.am
+@@ -54,7 +54,9 @@
+ 	-version-info $(LIBGTKEXTRA_SO_VERSION)    \
+ 	-export-dynamic                                         \
+ 	-rpath $(libdir)                                        \
+-	$(no_undefined)                                         \
++	$(no_undefined)
++
++LDADD = \
+ 	$(GTK_LIBS)                                             
+ 
+ #
+@@ -63,97 +65,97 @@
+ 
+ 
+ gtkextra_public_h_sources = \
+-        gtkbordercombo.h 	\
+-        gtkcharsel.h	\
+-        gtkcheckitem.h	\
+-        gtkcolorcombo.h	\
+-        gtkcombobutton.h	\
+-        gtkdirtree.h	\
+-        gtkextra.h	\
+-        gtkextrafeatures.h	\
+-        gtkextraicons.h	\
+-        gtkextra-marshal.h	\
+-        gtkextratypebuiltins.h	\
+-        gtkfilelist.h	\
+-        gtkfileicons.h	\
+-        gtkfontcombo.h	\
+-        gtkiconfilesel.h	\
+-        gtkiconlist.h	\
+-        gtkitementry.h	\
+-        gtkplot.h	\
+-        gtkplotarray.h	\
+-        gtkplot3d.h	\
+-        gtkplotdt.h	\
+-        gtkplotpolar.h	\
+-        gtkplotdata.h	\
+-        gtkplotpixmap.h	\
+-        gtkplotbar.h	\
+-        gtkplotbox.h	\
+-        gtkplotbubble.h	\
+-        gtkplotcandle.h	\
+-        gtkplotflux.h	\
+-        gtkplotsurface.h	\
+-        gtkplotcsurface.h	\
+-        gtkplotcanvas.h	\
+-        gtkplotpc.h	\
+-        gtkplotgdk.h	\
+-        gtkplotps.h	\
+-        gtkplotprint.h	\
+-        gtkplotsegment.h	\
+-        gtkpsfont.h	\
+-        gtksheet.h	\
+-        gtktogglecombo.h	\
+-        gtkplotcanvasline.h \
+-        gtkplotcanvasrectangle.h \
+-        gtkplotcanvasellipse.h \
+-        gtkplotcanvastext.h \
+-        gtkplotcanvaspixmap.h \
+-        gtkplotcanvasplot.h 
++	gtkbordercombo.h 	\
++	gtkcharsel.h	\
++	gtkcheckitem.h	\
++	gtkcolorcombo.h	\
++	gtkcombobutton.h	\
++	gtkdirtree.h	\
++	gtkextra.h	\
++	gtkextrafeatures.h	\
++	gtkextraicons.h	\
++	gtkextra-marshal.h	\
++	gtkextratypebuiltins.h	\
++	gtkfilelist.h	\
++	gtkfileicons.h	\
++	gtkfontcombo.h	\
++	gtkiconfilesel.h	\
++	gtkiconlist.h	\
++	gtkitementry.h	\
++	gtkplot.h	\
++	gtkplotarray.h	\
++	gtkplot3d.h	\
++	gtkplotdt.h	\
++	gtkplotpolar.h	\
++	gtkplotdata.h	\
++	gtkplotpixmap.h	\
++	gtkplotbar.h	\
++	gtkplotbox.h	\
++	gtkplotbubble.h	\
++	gtkplotcandle.h	\
++	gtkplotflux.h	\
++	gtkplotsurface.h	\
++	gtkplotcsurface.h	\
++	gtkplotcanvas.h	\
++	gtkplotpc.h	\
++	gtkplotgdk.h	\
++	gtkplotps.h	\
++	gtkplotprint.h	\
++	gtkplotsegment.h	\
++	gtkpsfont.h	\
++	gtksheet.h	\
++	gtktogglecombo.h	\
++	gtkplotcanvasline.h \
++	gtkplotcanvasrectangle.h \
++	gtkplotcanvasellipse.h \
++	gtkplotcanvastext.h \
++	gtkplotcanvaspixmap.h \
++	gtkplotcanvasplot.h 
+ 
+ gtkextra_c_sources = 	\
+-        gtkbordercombo.c	\
+-        gtkcharsel.c	\
+-        gtkcheckitem.c	\
+-        gtkcolorcombo.c	\
+-        gtkcombobutton.c	\
+-        gtkdirtree.c	\
+-        gtkextra.c	\
+-        gtkextra-marshal.c	\
+-        gtkextratypebuiltins.c	\
+-        gtkfilelist.c	\
+-        gtkfontcombo.c	\
+-        gtkiconlist.c	\
+-        gtkitementry.c	\
+-        gtkiconfilesel.c	\
+-        gtkplot.c	\
+-        gtkplotarray.c	\
+-        gtkplot3d.c	\
+-        gtkplotdt.c	\
+-        gtkplotpolar.c	\
+-        gtkplotdata.c	\
+-        gtkplotpixmap.c \
+-        gtkplotbar.c	\
+-        gtkplotbox.c	\
+-        gtkplotbubble.c	\
+-        gtkplotcandle.c	\
+-        gtkplotflux.c	\
+-        gtkplotsurface.c	\
+-        gtkplotcsurface.c	\
+-        gtkplotcanvas.c	\
+-        gtkplotpc.c	\
+-        gtkplotgdk.c	\
+-        gtkplotps.c	\
+-        gtkplotprint.c	\
+-        gtkplotsegment.c	\
+-        gtkpsfont.c	\
+-        gtksheet.c	\
+-        gtktogglecombo.c \
+-        gtkplotcanvasline.c \
+-        gtkplotcanvasrectangle.c \
+-        gtkplotcanvasellipse.c \
+-        gtkplotcanvastext.c \
+-        gtkplotcanvaspixmap.c \
+-        gtkplotcanvasplot.c 
++	gtkbordercombo.c	\
++	gtkcharsel.c	\
++	gtkcheckitem.c	\
++	gtkcolorcombo.c	\
++	gtkcombobutton.c	\
++	gtkdirtree.c	\
++	gtkextra.c	\
++	gtkextra-marshal.c	\
++	gtkextratypebuiltins.c	\
++	gtkfilelist.c	\
++	gtkfontcombo.c	\
++	gtkiconlist.c	\
++	gtkitementry.c	\
++	gtkiconfilesel.c	\
++	gtkplot.c	\
++	gtkplotarray.c	\
++	gtkplot3d.c	\
++	gtkplotdt.c	\
++	gtkplotpolar.c	\
++	gtkplotdata.c	\
++	gtkplotpixmap.c \
++	gtkplotbar.c	\
++	gtkplotbox.c	\
++	gtkplotbubble.c	\
++	gtkplotcandle.c	\
++	gtkplotflux.c	\
++	gtkplotsurface.c	\
++	gtkplotcsurface.c	\
++	gtkplotcanvas.c	\
++	gtkplotpc.c	\
++	gtkplotgdk.c	\
++	gtkplotps.c	\
++	gtkplotprint.c	\
++	gtkplotsegment.c	\
++	gtkpsfont.c	\
++	gtksheet.c	\
++	gtktogglecombo.c \
++	gtkplotcanvasline.c \
++	gtkplotcanvasrectangle.c \
++	gtkplotcanvasellipse.c \
++	gtkplotcanvastext.c \
++	gtkplotcanvaspixmap.c \
++	gtkplotcanvasplot.c 
+ 
+ gtkextra_private_h_sources = \
+ 	icons.h \
+@@ -169,7 +171,7 @@
+ 	gtkextrafeatures.h.in	\
+ 	gtkextra-marshal.list 	
+ 
+-INCLUDES = -I$(top_buildir) -I$(top_srcdir) $(GTK_CFLAGS) 
++INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(GTK_CFLAGS) 
+ 
+ # target platform:
+ lib_LTLIBRARIES = $(gtkextratargetlib)
+@@ -197,13 +199,13 @@
+ $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}
+ 
+ $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
+-        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
+-        && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
+-        || ( rm -f gtkextra-marshal.tmp && exit 1 )
++	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
++	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
++	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
+ $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
+-        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
+-        && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
+-        || ( rm -f gtkextra-marshal.tmp && exit 1 )
++	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
++	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
++	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
+ 
+ 
+ $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-gtk+-2.21.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-gtk+-2.21.patch
new file mode 100644
index 000000000000..50b2a8e628ea
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-gtk+-2.21.patch
@@ -0,0 +1,28 @@
+--- gtkextra/gtkitementry.c
++++ gtkextra/gtkitementry.c
+@@ -131,7 +131,9 @@
+ static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
+                                                         gboolean        include_preedit);
+ static void         gtk_entry_queue_draw               (GtkEntry       *entry);
++#if GTK_CHECK_VERSION(2,21,0) == 0
+ static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
++#endif
+ static void         gtk_entry_recompute                (GtkEntry       *entry);
+ static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
+ 							CursorType      type,
+@@ -1754,6 +1756,7 @@
+     gdk_window_invalidate_rect (entry->text_area, NULL, FALSE);
+ }
+ 
++#if GTK_CHECK_VERSION(2,21,0) == 0
+ static void
+ gtk_entry_reset_im_context (GtkEntry *entry)
+ {
+@@ -1763,6 +1766,7 @@
+       gtk_im_context_reset (entry->im_context);
+     }
+ }
++#endif
+ 
+ static void
+ gtk_entry_get_cursor_locations (GtkEntry   *entry,
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-marshal.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-marshal.patch
new file mode 100644
index 000000000000..5790fbbb7a70
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-marshal.patch
@@ -0,0 +1,11 @@
+--- gtkextra/gtkcolorcombo.c
++++ gtkextra/gtkcolorcombo.c
+@@ -146,7 +146,7 @@
+                                       GTK_CLASS_TYPE(object_class),
+                                       GTK_SIGNAL_OFFSET(GtkColorComboClass,
+                                       changed),
+-                                      gtkextra_VOID__INT_BOXED,
++                                      gtkextra_VOID__BOXED_BOXED,
+                                       GTK_TYPE_NONE,  
+                                       2, GTK_TYPE_INT, GDK_TYPE_COLOR);
+ 
diff --git a/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
index 4e6b4301e2f2..88e901e61546 100644
--- a/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v 1.3 2010/03/27 12:02:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v 1.4 2010/09/25 19:30:40 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Useful Additional GTK+ widgets"
 HOMEPAGE="http://gtkextra.sourceforge.net"
@@ -26,3 +26,12 @@ DOCS="AUTHORS ChangeLog README"
 pkg_setup() {
 	G2CONF="${G2CONF} --with-html-dir=/usr/share/doc/${PF}/html"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-marshal.patch \
+		"${FILESDIR}"/${P}-gtk+-2.21.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}