Fix bugs 215984 and 232742.

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

5 files changed, 215 insertions, 5 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index a5180e087147..43c986cf1427 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,16 @@
 # 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.191 2008/07/01 19:30:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.192 2008/07/25 22:33:19 ulm Exp $
+
+*openmotif-2.3.1-r1 (25 Jul 2008)
+
+  25 Jul 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/openmotif-2.3.1-fix-grace-crash.patch,
+  +files/openmotif-2.3.1-multilist-stipple.patch,
+  +openmotif-2.3.1-r1.ebuild:
+  Display stippled multilist items correctly, fixes bug 215984 again.
+  Fix crash with sci-visualization/grace, bug 232742; patch by S. Umar at
+  upstream bug 1381.
 
   01 Jul 2008; Ulrich Mueller <ulm@gentoo.org>
   files/openmotif-2.3.0-freebsd-libiconv.patch, openmotif-2.3.1.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 4515483133d2..38f463081fb9 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -7,18 +7,21 @@ AUX openmotif-2.3.0-fix-nedit-segfaults.patch 926 RMD160 c6ddd15bee038509cc7e180
 AUX openmotif-2.3.0-freebsd-libiconv.patch 744 RMD160 e01f49c108b1393cfa408f5ec452f18afe852503 SHA1 7ba83a4da347bfa1ce94340fdaa5675dd104d5bb SHA256 15065447d0670b64242b9673113ecc23e90d7b3a778a9c5ae5da2b48940c08d0
 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
+AUX openmotif-2.3.1-fix-grace-crash.patch 786 RMD160 a8f40c637680562e1c6095512d74f6ddc9c0abed SHA1 c126c3f1b61d8ac37add5bedae8c1043095d5cd2 SHA256 9caad200b6d8f771913dbe08cbd6ea0eca249e2a27ee8d373a851768e9a25b07
+AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
 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 4020 RMD160 504ac420272d842a9dacd10f2d827e19acff12d1 SHA1 3b81957cfb8cd8e70a6d218106d07cb71f46c379 SHA256 34ceb5f16e7373ff7c66f4ecfa918feb44299165a2eca4209878d6ad3eeb3bab
 EBUILD openmotif-2.3.0-r3.ebuild 4088 RMD160 43b3f3576e2febe253def1b3c0f344a36724d5de SHA1 ec15d89845471be1fa8a65afdd3467a493ef79d8 SHA256 2d5f3f1a304bf2c698040a3a379816c5c160800b8efb2c21d389d4980094af6c
+EBUILD openmotif-2.3.1-r1.ebuild 4431 RMD160 bee23be28cfa81d6cffa232a4cdab15fccc86645 SHA1 a1cd21b2cdae07692bf4ce7028b1c107ff379eb5 SHA256 d07e2eaf8b16bea9024f17f9d3cec0199418c75ea5c076d0240ae525853559fa
 EBUILD openmotif-2.3.1.ebuild 4214 RMD160 ecaff6d3b934e29c891f034036018f8b3894a8a2 SHA1 5513e81ea1d5eef202890ae21962b581bb1b9982 SHA256 c708e233e8dd3b768a5f4bdd700f7b421b0c4c26515149c4a43001ef848e3d0d
-MISC ChangeLog 29466 RMD160 6b7ef48ae160e4fdba1564a9904f567f4688faeb SHA1 5ed71e0067b0de6cb9857c43903d64268c1e678d SHA256 e143acc0bd28dca031e4b069b7e8985982299365965e66c645da8f61f6e4251a
+MISC ChangeLog 29842 RMD160 dd87a8eddf8ed893f8bf4860a539f4e2b7e52879 SHA1 2d8dfd50c479a7668d3605d57ddbf37ddf073a22 SHA256 c1e5131aec4daa2443c1e4b2ee3b2007b72a8c1e6c7d8cce29ba57530f36a889
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkhqhg8ACgkQOeoy/oIi7uyRmACeKJ8O4pPom/PtPbsYGOR8LF/c
-SSwAn0HSZFagaV6CTrimKlb9oj0by6lk
-=GwJb
+iEYEARECAAYFAkiKVL8ACgkQOeoy/oIi7uzbrACg5SvFOyst2SEq0swyNuXtFJeX
+5icAnizEDG/KcE1stze5npjki7799ilU
+=om7E
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch b/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch
new file mode 100644
index 000000000000..9a7425b24e8f
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch
@@ -0,0 +1,20 @@
+--- openmotif-2.3.1-orig/lib/Xm/TextF.c	2008-04-22 18:34:22.000000000 +0200
++++ openmotif-2.3.1/lib/Xm/TextF.c	2008-07-25 23:31:47.000000000 +0200
+@@ -1959,6 +1959,7 @@
+   
+   if (change_stipple) {
+     valueMask |= GCFillStyle;
++    values.fill_style = FillStippled;
+     if (stipple) {
+ #ifdef FIX_1381
+ 		  /*added for gray insensitive foreground (instead stipple)*/
+--- openmotif-2.3.1-orig/lib/Xm/TextOut.c	2008-02-11 17:19:52.000000000 +0100
++++ openmotif-2.3.1/lib/Xm/TextOut.c	2008-07-25 23:31:47.000000000 +0200
+@@ -623,6 +623,7 @@
+   values.background = tw->core.background_pixel;
+   if (change_stipple) {
+     valueMask |= GCFillStyle;
++    values.fill_style = FillStippled;
+     if (stipple) {
+ #ifdef FIX_1381
+ 		/*added for gray insensitive foreground (instead stipple)*/
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-multilist-stipple.patch b/x11-libs/openmotif/files/openmotif-2.3.1-multilist-stipple.patch
new file mode 100644
index 000000000000..125d9009d909
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.1-multilist-stipple.patch
@@ -0,0 +1,27 @@
+--- openmotif-2.3.1-orig/lib/Xm/I18List.c	2007-09-14 18:29:52.000000000 +0200
++++ openmotif-2.3.1/lib/Xm/I18List.c	2008-07-25 23:33:23.000000000 +0200
+@@ -2086,12 +2086,7 @@
+     values.graphics_exposures = False;
+ 
+     mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures;
+-
+-#ifdef FIX_1381
+-	smask = mask | GCFillStyle;
+-#else
+     smask = mask | GCStipple | GCFillStyle;
+-#endif
+     
+     XmI18List_gc(ilist) = XtGetGC(w, mask, &values);
+ 
+@@ -2122,11 +2117,6 @@
+     	XmI18List_entry_background_gc(ilist) = XtGetGC(w, mask, &values);
+     }
+ 
+-#ifdef FIX_1381
+-	/*added for gray insensitive foreground (instead stipple)*/
+-    values.foreground=_XmAssignInsensitiveColor(w);
+-#endif
+-
+     XmI18List_stippled_gc(ilist) = XtGetGC(w, smask, &values);
+ 
+     if (XmI18List_entry_background_use(ilist))
diff --git a/x11-libs/openmotif/openmotif-2.3.1-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..683926d0ed72
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.3.1-r1.ebuild
@@ -0,0 +1,150 @@
+# 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-r1.ebuild,v 1.1 2008/07/25 22:33:19 ulm Exp $
+
+inherit eutils flag-o-matic multilib autotools
+
+DOC_P=${PN}-2.3.0
+DESCRIPTION="Open Motif"
+HOMEPAGE="http://www.motifzone.org/"
+SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz
+	doc? ( http://www.motifzone.net/files/documents/${DOC_P}-manual.pdf.tgz )"
+
+LICENSE="MOTIF libXpm doc? ( OPL )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples jpeg png unicode xft"
+
+# make people unmerge motif-config and all previous slots
+# since the slotting is finally gone now
+RDEPEND="!x11-libs/motif-config
+	!x11-libs/lesstif
+	!<=x11-libs/openmotif-2.3.0
+	x11-libs/libXmu
+	x11-libs/libXp
+	unicode? ( virtual/libiconv )
+	xft? ( x11-libs/libXft )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	x11-misc/xbitmaps"
+
+pkg_setup() {
+	# clean up orphaned cruft left over by motif-config
+	local i l count=0
+	for i in "${ROOT}"usr/bin/{mwm,uil,xmbind} \
+		"${ROOT}"usr/include/{Xm,uil,Mrm} \
+		"${ROOT}"usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
+		[[ -L "${i}" ]] || continue
+		l=$(readlink "${i}")
+		if [[ ${l} == *openmotif-* || ${l} == *lesstif-* ]]; then
+			einfo "Cleaning up orphaned ${i} symlink ..."
+			rm -f "${i}"
+		fi
+	done
+
+	cd "${ROOT}"usr/share/man
+	for i in $(find . -type l); do
+		l=$(readlink "${i}")
+		if [[ ${l} == *-openmotif-* || ${l} == *-lesstif-* ]]; then
+			(( count++ ))
+			rm -f "${i}"
+		fi
+	done
+	[[ ${count} -ne 0 ]] && \
+		einfo "Cleaned up ${count} orphaned symlinks in ${ROOT}usr/share/man"
+}
+
+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"
+
+	# display stippled multilist items correctly, bug 215984
+	epatch "${FILESDIR}/${P}-multilist-stipple.patch"
+
+	# fix crash with sci-visualization/grace, bug 232742
+	epatch "${FILESDIR}/${P}-fix-grace-crash.patch"
+
+	# disable compilation of demo binaries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	# fix libtool-2.2 breakage, bug 220599
+	sed -i -e 's/LT_HAVE/FINDXFT_HAVE/g' ac_find_xft.m4
+
+	# add X.Org vendor string to aliases for virtual bindings
+	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+	AT_M4DIR=. eautoreconf
+}
+
+src_compile() {
+	# get around some LANG problems in make (#15119)
+	unset LANG
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# multilib includes don't work right in this package...
+	has_multilib_profile && append-flags "-I$(get_ml_incdir)"
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	econf --with-x \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	dodir /etc/X11/mwm
+	mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm
+	dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/
+
+	if use examples; then
+		emake -j1 -C demos DESTDIR="${D}" install-data \
+			|| die "installation of demos failed"
+		dodir /usr/share/doc/${PF}/demos
+		mv "${D}"/usr/share/Xm/* "${D}"/usr/share/doc/${PF}/demos
+	fi
+	rm -rf "${D}"/usr/share/Xm
+
+	dodoc README RELEASE RELNOTES BUGREPORT TODO
+	use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	local line
+	while read line; do elog "${line}"; done <<-EOF
+	Gentoo is no longer providing slotted Open Motif libraries.
+	See bug 204249 and its dependencies for the reasons.
+
+	From the Open Motif 2.3.0 (upstream) release notes:
+	"Open Motif 2.3 is an updated version of 2.2. Any applications
+	built against a previous 2.x release of Open Motif will be binary
+	compatible with this release."
+
+	If you have binary-only applications requiring libXm.so.3, you may
+	therefore create a symlink from libXm.so.3 to libXm.so.4.
+	Please note, however, that there will be no Gentoo support for this.
+	Alternatively, you may install x11-libs/openmotif-compat-2.2* for
+	the Open Motif 2.2 libraries.
+	EOF
+}