Add missing conditional for USE=-xft in XmRenderT.c, bug 229779.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686

4 files changed, 35 insertions, 7 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index fb9c62a388b0..c159fd1a1f70 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.188 2008/06/27 11:17:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.189 2008/06/28 08:46:27 ulm Exp $
+
+  28 Jun 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/openmotif-2.3.1-XmRenderT-no-xft.patch, openmotif-2.3.1.ebuild:
+  Add missing conditional for USE=-xft in XmRenderT.c, fixes bug 229779.
 
 *openmotif-2.3.1 (27 Jun 2008)
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index c07a976e14e6..2262af6890fd 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -6,18 +6,19 @@ AUX motif-config-2.3 1181 RMD160 66b0f8eafe0726eda72bb9776ccff38c984a2a2b SHA1 a
 AUX openmotif-2.3.0-fix-nedit-segfaults.patch 926 RMD160 c6ddd15bee038509cc7e18098f209ac6c14f8e48 SHA1 c87b69cb24d3004bd146cd1e8645c72956fcfbdc SHA256 8aeb1daed4862393c7dc10df469d43e2a98154d18c7a0c3e65ca2750a412072c
 AUX openmotif-2.3.0-freebsd-libiconv.patch 406 RMD160 56845c5fd29d8cfe6495145742f4e787f52f875f SHA1 a6245a668962863d178fa020293b0cc310ddf83b SHA256 b48ef26033bb0444b987361c87017f1b726c317fb16f642d202287547362410b
 AUX openmotif-2.3.0-sensitivity-invisible.patch 6503 RMD160 98ddb9cc9e8c84e28a2d8802f4a389f42f5f9715 SHA1 1da82de91d748b6eaf04fa9d320181b7a27138ff SHA256 d55d756548b6c8e7892f2d597cb8ac4dcd78d5164602d5878be314ed6d6cdcb3
+AUX openmotif-2.3.1-XmRenderT-no-xft.patch 487 RMD160 97d8439eab1010072766ba56d1e999f154ed5d09 SHA1 3cb77f3cb67a772665a07bf440bd40a0516d63ca SHA256 df19a632372b3a351467fc4ed54c7f1954ad65d8b506f943a1c856f2b77d751e
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 DIST openmotif-2.3.1.tar.gz 5932681 RMD160 8fe6f41a8b75636d9211d34cae96d47a7ed10ade SHA1 7132493712111e6846deda241137f28a957b5878 SHA256 46397a76e06dab0e31ffd2a9e2cf8f5ad408dc0f451f4e600889a8d5b0bae9a4
 EBUILD openmotif-2.3.0-r1.ebuild 4045 RMD160 41a400b6dd19108de0baada221c4baeda25cdfd3 SHA1 0c5785ebebfc8e11712e1df98bed9023e29ecbc4 SHA256 678529158984a47a1ba3d08b316c27691ba13e27d33d4c9c192cb75c603a11af
 EBUILD openmotif-2.3.0-r3.ebuild 4112 RMD160 5cdd48a8599f0a7b8d0d06837ecf680205aa2c5b SHA1 4367741c73f114119bc8c5f83248b6e79b0ac0fc SHA256 9cc66d7a86794c5553928b812c505fa242187e197cef03d62666a8d9b00ec8df
-EBUILD openmotif-2.3.1.ebuild 4012 RMD160 ba1563fc0cd8d4c4cd651705121223dfe58ff200 SHA1 c218d3df86ef062fa29c4296983707fd49b7b108 SHA256 2dabcd317b2d627a604cdfd51ae9e47a7427bd715c32fb0ec74b8c9a6ada3545
-MISC ChangeLog 28944 RMD160 092cec614f5df3ffc175f03e57679c5cac4450d2 SHA1 6ec2ce3408cc1a8445a0d1d553bc728d339f79e9 SHA256 eabc163db6717311ceded7bd29274c4980dbb574072f2d62f9518844a348fa59
+EBUILD openmotif-2.3.1.ebuild 4162 RMD160 69bf5210c2b95b8f08091a7d656ec42f71f9a6cb SHA1 785faf49143b88f9065ea60002d3b6c75472f7bb SHA256 5ee2ba74e26c311e07ef0d7e888e2cf2266d2366ede3218600d41cc0d5d0ecd3
+MISC ChangeLog 29138 RMD160 66bb2b083160c9ec87a823aff3d8198c1b1d1344 SHA1 5b6b3464fe40664fc300ac97d26500ec26b15fa5 SHA256 0f260b2281d7af535235952d9f22cd0f73a096c4f9765b520134414d7dab5c9a
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkhkzIIACgkQOeoy/oIi7uyQfQCgu4dokxXLSPry3SMQOYNPIvYo
-RuAAn1CiXGAUS/y6gKq9AGz/Nr5/GhYT
-=IwFj
+iEYEARECAAYFAkhl+pMACgkQOeoy/oIi7ux9pgCcChKqbUZfuKfy+EdftELrN8l3
+nAoAoI+0cYQaG1I9RchpDnyhwFPN2IHE
+=RH+Z
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-XmRenderT-no-xft.patch b/x11-libs/openmotif/files/openmotif-2.3.1-XmRenderT-no-xft.patch
new file mode 100644
index 000000000000..8508dbbb9d65
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.1-XmRenderT-no-xft.patch
@@ -0,0 +1,18 @@
+--- openmotif-2.3.1-orig/lib/Xm/XmRenderT.c	2008-04-23 16:58:27.000000000 +0200
++++ openmotif-2.3.1/lib/Xm/XmRenderT.c	2008-06-28 10:05:58.000000000 +0200
+@@ -1979,6 +1979,7 @@
+ }
+ 
+ #ifdef FIX_1414
++#ifdef USE_XFT
+ static int
+ GetSameRenditions(XmRendition *rend_cache, XmRendition rend, int count_rend)
+ {
+@@ -2009,6 +2010,7 @@
+ 
+ }
+ #endif
++#endif
+ 
+ /* Make sure all the font related resources make sense together and */
+ /* then load the font specified by fontName if necessary. */
diff --git a/x11-libs/openmotif/openmotif-2.3.1.ebuild b/x11-libs/openmotif/openmotif-2.3.1.ebuild
index a0512e4a09b1..3a47f24ce239 100644
--- a/x11-libs/openmotif/openmotif-2.3.1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.ebuild,v 1.1 2008/06/27 11:17:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.ebuild,v 1.2 2008/06/28 08:46:27 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -60,8 +60,13 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	# fix linking problem on FreeBSD, bug 219040
 	epatch "${FILESDIR}/${PN}-2.3.0-freebsd-libiconv.patch"
 
+	# add missing conditional for USE=-xft, bug 229779
+	epatch "${FILESDIR}/${P}-XmRenderT-no-xft.patch"
+
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am