Fix "present but cannot be compiled" warning in configure, bug 82081.

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 26 insertions, 8 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 93125a884240..4d27736a6e6d 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.211 2009/01/05 21:55:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.212 2009/02/04 21:04:38 ulm Exp $
+
+  04 Feb 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/openmotif-2.3.1-ac-editres.patch, openmotif-2.3.0-r3.ebuild,
+  openmotif-2.3.1.1.ebuild:
+  Fix "present but cannot be compiled" warning in configure, in order to
+  prepare for autoconf-2.64. Bug 82081 (see also tracker bug 257596).
 
   05 Jan 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
   drop local xft USE-flag description, as it's global now
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-ac-editres.patch b/x11-libs/openmotif/files/openmotif-2.3.1-ac-editres.patch
new file mode 100644
index 000000000000..ab32f41a66d8
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.1-ac-editres.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/82081
+
+--- openmotif-2.3.1-orig/configure.ac	2008-08-30 13:10:19.000000000 +0200
++++ openmotif-2.3.1/configure.ac	2009-02-04 19:28:02.000000000 +0100
+@@ -75,6 +75,7 @@
+ AC_CHECK_LIB(Xmu,XmuNCopyISOLatin1Lowered ,
+ AC_DEFINE(HAVE_XMU_N_COPY_ISO,1,Have XmuNCopyISOLatin1Lowered)
+ , , -lXt -lX11)
++,,[[#include <X11/Intrinsic.h>]]
+ )
+ 
+ 
diff --git a/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
index 6b43d7e828f6..b8b846538d5b 100644
--- a/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v 1.10 2008/06/29 12:39:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v 1.11 2009/02/04 21:04:38 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -62,6 +62,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-sensitivity-invisible.patch"
 	epatch "${FILESDIR}/${P}-fix-nedit-segfaults.patch"
 	epatch "${FILESDIR}/${P}-freebsd-libiconv.patch"
+	epatch "${FILESDIR}/${PN}-2.3.1-ac-editres.patch" #82081
 
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
diff --git a/x11-libs/openmotif/openmotif-2.3.1.1.ebuild b/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
index 6112aa5fbd95..ed7929f09b20 100644
--- a/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.1.ebuild,v 1.7 2008/11/12 22:07:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.1.ebuild,v 1.8 2009/02/04 21:04:38 ulm Exp $
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -66,9 +66,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	# display stippled multilist items correctly, bug 215984
-	epatch "${FILESDIR}/${MY_P}-multilist-stipple.patch"
+	epatch "${FILESDIR}/${MY_P}-multilist-stipple.patch" #215984
+	epatch "${FILESDIR}/${MY_P}-ac-editres.patch" #82081
 
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am