Fixed build problems: 1. when gtk+-1 is not installed AM_PATH_GTK could not be found, 2. build failes with --as-needed, bug #207638, thank Muelli for report.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-ovz005 i686

4 files changed, 60 insertions, 14 deletions

diff --git a/media-libs/imlib/ChangeLog b/media-libs/imlib/ChangeLog
index fba373a574ac..e4f266255b0a 100644
--- a/media-libs/imlib/ChangeLog
+++ b/media-libs/imlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/imlib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.67 2008/07/05 08:53:05 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.68 2008/07/16 10:00:37 pva Exp $
+
+  16 Jul 2008; Peter Volkov <pva@gentoo.org>
+  +files/imlib-1.9.15-asneeded.patch, imlib-1.9.15-r2.ebuild:
+  Fixed build problems: 1. when gtk+-1 is not installed AM_PATH_GTK could
+  not be found, 2. build failes with --as-needed, bug #207638, thank Muelli
+  for report.
 
   05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
   -imlib-1.9.15-r1.ebuild:
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index 83480b673ceb..0c96467615b0 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -1,8 +1,10 @@
+AUX imlib-1.9.15-asneeded.patch 1120 RMD160 14f2e712bbffe75db5e54dc77d979ca22f7e65c7 SHA1 231b4b00b0fbfc98e01c19b5513861b71a6ea68d SHA256 60f8a3f9bee11c0987b663ec86d48f208d7d96f35463f9babdd43389f466ce94
 AUX imlib-1.9.15-bpp16-CVE-2007-3568.patch 457 RMD160 7892bce6d9375befc0a322dd5870f10e5d41ceb5 SHA1 c3977dcb4d95ffab5cadb68bb3e3c7693c1e8be3 SHA256 f0097c1db200b19a3e8f06d85765dd8b8f757dd0bc6fd9bafa0c31cd9c14d8ec
 AUX imlib-1.9.15-fix-rendering.patch 3263 RMD160 2ec2c9bb864d64b588d3b786e9b256f4d3788436 SHA1 3b8cb97fd6918bddc70b78fc04e5a7b4a5395c0e SHA256 7f5f8967ec52658e776a0a60a3a3c93d367ccf877d92569a9313e78bbd510604
 AUX imlib-1.9.15.patch 2253 RMD160 beb86753cc2024a9eb671acdc3886b7a5692b526 SHA1 29fb949680e5b2d95392b4c5efd1fdfa21f2df3d SHA256 43dd12dae7913475f968f35a4fa4b1ef4670451e58c712cbd6e5460f20fc9197
 AUX imlib-security.patch 13040 RMD160 432377938bd85f9974bff8f08aca6d93d310057c SHA1 ec1b47281c1a7fb21abe841f948ecc56ed13f310 SHA256 d67a7faa2dba8d361cf25b6fc8125c1da92f25b612bffe909daacdeda577dd57
+DIST gtk-1-for-imlib.m4.bz2 2742 RMD160 11e0016ec8f37b617198b9cfc6d7bc703b50a808 SHA1 c099fbc5dd80b9db81b4e89481422ab40c06dfef SHA256 e024d822d64819e23f7ad7c8283086ffd1e112b859b4669f1624dda1c56d8c47
 DIST imlib-1.9.15.tar.bz2 683242 RMD160 195b80833167134ba2d9a9574d420279f9cf55f4 SHA1 c9a732a354fbb3c7e1a426e5d19fc92d73f8f720 SHA256 4e6a270308a9ae16586bfc133c1a3dfb2e56f431edb66aaa3a80e36e5ed84ce0
-EBUILD imlib-1.9.15-r2.ebuild 1514 RMD160 cd91380623158878043b34d9f3255548c0293515 SHA1 990d51a0745e7eef2ff69e79971ad4d099c0849d SHA256 919ab32a31a8d2c33fac821e69867dad4c93a3ab68ac88d5bf68a06358244d52
-MISC ChangeLog 9147 RMD160 2ab9ee2cb5d0aece1780e2dd27a879133ddb5271 SHA1 96c9fa3bfc06f6460d53ac09065744085162bee9 SHA256 aa099fffaef194ea78587da128bb0371a8c06fcbe6361c035f63f3ea84c9f81d
+EBUILD imlib-1.9.15-r2.ebuild 1716 RMD160 8a54f5b9ebeb1c6bea6abb5f6d448f1d6803ed9f SHA1 76731600d45edb15eed78f73270ba5b955063cf0 SHA256 d45018ac0ee0257bfb55f3ec0bbf3e2aba76065fdcbfd51dc7aabd9e80cfa1bc
+MISC ChangeLog 9414 RMD160 0250cb11f713831296ad02de14943e391243a6af SHA1 16bc2593f45fc3220b8b6efc5a62e7eab7f7e9b8 SHA256 3fd9d29d3b6b442eb52a17c8c067f4b2197cacde0f314a2545a9a64716a830f4
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/media-libs/imlib/files/imlib-1.9.15-asneeded.patch b/media-libs/imlib/files/imlib-1.9.15-asneeded.patch
new file mode 100644
index 000000000000..3b7dd8a8bbca
--- /dev/null
+++ b/media-libs/imlib/files/imlib-1.9.15-asneeded.patch
@@ -0,0 +1,38 @@
+This code is broken with the newer libtool. Just dropping it is more or less
+safe as in any case if libtool does not supports shared libraries it'll issue
+an error...
+
+Adding include is necessary for gcc-4.3.
+
+--- configure.in	2008-07-16 09:18:35 +0000
++++ configure.in	2008-07-16 09:18:43 +0000
+@@ -61,6 +61,7 @@
+   AC_TRY_RUN([
+ #include <glib.h>
+ #include <gmodule.h>
++#include <stdlib.h>
+ main ()
+ {
+     if (g_module_supported ())
+@@ -74,21 +74,6 @@
+   CFLAGS="$oCFLAGS"
+ fi
+ 
+-dnl Now we check to see if our libtool supports shared lib deps
+-dnl (in a rather ugly way even)
+-builddir=`pwd`
+-if $dynworks; then
+-   imlib_libtool_config="$builddir/libtool --config"
+-   imlib_deplibs_check=`$imlib_libtool_config | \
+-      grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
+-      sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
+-   if test "x$imlib_deplibs_check" = "xnone" || \
+-      test "x$imlib_deplibs_check" = "xunknown" || \
+-      test "x$imlib_deplibs_check" = "x"; then
+-      dynworks=false
+-   fi
+-fi
+-
+ if $dynworks; then
+    AC_DEFINE(USE_GMODULE, 1, [ ])
+    GMODULE_LIBS="`glib-config --libs gmodule`"
diff --git a/media-libs/imlib/imlib-1.9.15-r2.ebuild b/media-libs/imlib/imlib-1.9.15-r2.ebuild
index 93f38f4286b8..a8fe16d0305d 100644
--- a/media-libs/imlib/imlib-1.9.15-r2.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-r2.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r2.ebuild,v 1.10 2008/07/05 08:51:28 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r2.ebuild,v 1.11 2008/07/16 10:00:37 pva Exp $
 
-inherit autotools eutils gnome.org
+inherit autotools eutils
 
+PVP=(${PV//[-\._]/ })
 DESCRIPTION="Image loading and rendering library"
 HOMEPAGE="http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/"
+SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
+	mirror://gentoo/gtk-1-for-imlib.m4.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,17 +33,14 @@ src_unpack() {
 	# Conditionalize gdk functions for bug 40453.
 	# Fix imlib-config for bug 3425.
 	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/${PN}-security.patch #security #72681
+	epatch "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887
+	epatch "${FILESDIR}"/${P}-fix-rendering.patch #197489
+	epatch "${FILESDIR}"/${P}-asneeded.patch #207638
 
-	# Fix security bug 72681.
-	epatch "${FILESDIR}"/${PN}-security.patch
+	mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4
 
-	# Fixes security bug #201887
-	epatch "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch
-
-	# Fixes #197489
-	epatch "${FILESDIR}"/${P}-fix-rendering.patch
-
-	eautoreconf
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {