From: Ulrich Müller Date: Tue, 12 Feb 2008 20:49:50 +0000 (+0000) Subject: Fix Motif version detection and disable ARGB visuals, bugs 200628 and 181952. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ba47c81b520f0f02530d0f029fd09ac77d8a0c06;p=gentoo.git Fix Motif version detection and disable ARGB visuals, bugs 200628 and 181952. Package-Manager: portage-2.1.4.4 --- diff --git a/app-editors/nedit/ChangeLog b/app-editors/nedit/ChangeLog index 8ac6c517d6aa..b843d09abcb6 100644 --- a/app-editors/nedit/ChangeLog +++ b/app-editors/nedit/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/nedit -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.46 2007/07/05 20:36:32 uberlord Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.47 2008/02/12 20:49:50 ulm Exp $ + +*nedit-5.5-r1 (12 Feb 2008) + + 12 Feb 2008; Ulrich Mueller + +files/nedit-5.5-argbvisuals.patch, +files/nedit-5.5-motif23.patch, + +nedit-5.5-r1.ebuild: + Fix Motif version detection and disable ARGB visuals, bugs 200628 and 181952. + Both patches provided by Ioan Marius Curelariu . 05 Jul 2007; Roy Marples nedit-5.5.ebuild: Keyworded ~x86-fbsd, #184298 thanks to Sascha Lucas. diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index f5db423d0f91..12e3c7f1b615 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,4 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX nedit-5.5-argbvisuals.patch 1462 RMD160 3d87969386ca8ca83b4e87d823d6298129d62dd8 SHA1 4ec157bc4e98a00f5152f67ed5f5e384822497c1 SHA256 ddf22535a85293e3be1453160305f926a1d9233a76febcb1380a2228ec82e1fe +AUX nedit-5.5-motif23.patch 526 RMD160 462ef04c1bd14b9164eecf6646250b2e353ffc66 SHA1 1603079b4ed4eaac08fc58fa8abf54627e5ec9fa SHA256 29e7bbbc4828422344790eb8663d9b872bc9deb6bb5966c8ee54e81f29c018eb DIST nedit-5.5-src.tar.bz2 1124825 RMD160 93fce64bdc5d8a9eff86ab76cec67d44d676d0eb SHA1 7d3c87a793a5047cf857af1ac82e39f3b33e8a87 SHA256 0f6ae7205753080e8b047fb45759a7d6036b19396045c0b5c4a979441231966b +EBUILD nedit-5.5-r1.ebuild 1327 RMD160 534291b533ae8dc867ce9c0755f4854defd06c35 SHA1 909aa4fbec63492ea51b0cb85961689133046e0e SHA256 272909c6c69021034c3ba42a2d6e050c1eac982e8730af716868c452037483e8 EBUILD nedit-5.5.ebuild 1207 RMD160 a823f3d4d8139690d63cf9cd0b4a1beccb1549d6 SHA1 18a867374fc8298fcf05a9dc8fc38b9802a9b7b0 SHA256 945352708bcfa03e25c2abc21950244901a58dcc515ed681cf81bcfc31943b8c -MISC ChangeLog 6183 RMD160 32750d8d6a224b5ce0906d12eef5daa57fbe69b0 SHA1 ba6bfe9bfb81b7b6560d5624c3c6d24bd3eb19cf SHA256 2970294a38b36935f99bc61f9c5f5d48b54e7e7848b6397195ff0f34f3828cd3 +MISC ChangeLog 6502 RMD160 0c079c42bbe6aa8c683ba1a737ef9774b47b762e SHA1 0f17b0e9ef1d9e10dc743136dbef52d8a63cd681 SHA256 b9dc1c280f06f69d3a76dac947d4acc31ec4859fd5078f0a378c205e0995cfad MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.8 (GNU/Linux) + +iEYEARECAAYFAkeyBpEACgkQOeoy/oIi7uzWBwCdGdikzxs5gkPA5sactyUZ/Iy2 +xxcAnRxpIK89SZTNTjPgqoe+62VCMRCX +=wkPX +-----END PGP SIGNATURE----- diff --git a/app-editors/nedit/files/nedit-5.5-argbvisuals.patch b/app-editors/nedit/files/nedit-5.5-argbvisuals.patch new file mode 100644 index 000000000000..e684892e65ad --- /dev/null +++ b/app-editors/nedit/files/nedit-5.5-argbvisuals.patch @@ -0,0 +1,24 @@ + +--- source/nedit.c.or 2004-09-02 11:49:56.000000000 +0300 ++++ source/nedit.c 2007-05-29 15:15:19.000000000 +0300 +@@ -434,6 +434,20 @@ + and -iconic are per-window and it should not be allowed to consume them, + so we temporarily masked them out. */ + maskArgvKeywords(argc, argv, protectedKeywords); ++ /* X.Org 6.8 and above add support for ARGB visuals (with alpha-channel), ++ typically with a 32-bit color depth. By default, NEdit uses the visual ++ with the largest color depth. However, both OpenMotif and Lesstif ++ cannot handle ARGB visuals (crashes, weird display effects, ...), so ++ NEdit should avoid selecting such a visual. ++ Unfortunatly, there appears to be no reliable way to identify ++ ARGB visuals that doesn't require some of the recent X.Org ++ extensions. Luckily, the X.Org developers have provided a mechanism ++ that can hide these problematic visuals from the application. This can ++ be achieved by setting the XLIB_SKIP_ARGB_VISUALS environment variable. ++ Users can set this variable before starting NEdit, but it is much ++ more convenient that NEdit takes care of this. This must be done before ++ the display is opened (empirically verified). */ ++ putenv("XLIB_SKIP_ARGB_VISUALS=1"); + TheDisplay = XtOpenDisplay (context, NULL, APP_NAME, APP_CLASS, + NULL, 0, &argc, argv); + unmaskArgvKeywords(argc, argv, protectedKeywords); diff --git a/app-editors/nedit/files/nedit-5.5-motif23.patch b/app-editors/nedit/files/nedit-5.5-motif23.patch new file mode 100644 index 000000000000..bfbb971c1abf --- /dev/null +++ b/app-editors/nedit/files/nedit-5.5-motif23.patch @@ -0,0 +1,13 @@ + +--- util/check_lin_tif.c.or 2007-10-17 12:53:19.000000000 +0300 ++++ util/check_lin_tif.c 2007-10-17 13:02:29.000000000 +0300 +@@ -251,7 +251,8 @@ + if (!force_bad && + ((XmVERSION == 2 && XmREVISION == 1) || + (XmVERSION == 2 && XmREVISION == 2 && XmUPDATE_LEVEL == 3 && +- strcmp("@(#)Motif Version 2.2.3", vs) == 0))) { ++ strcmp("@(#)Motif Version 2.2.3", vs) == 0) || ++ (XmVERSION == 2 && XmREVISION >= 3))) { + exit(0); + } + diff --git a/app-editors/nedit/nedit-5.5-r1.ebuild b/app-editors/nedit/nedit-5.5-r1.ebuild new file mode 100644 index 000000000000..2cc2b17c332c --- /dev/null +++ b/app-editors/nedit/nedit-5.5-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5-r1.ebuild,v 1.1 2008/02/12 20:49:50 ulm Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Multi-purpose text editor for the X Window System" +HOMEPAGE="http://nedit.org/" +SRC_URI="mirror://sourceforge/nedit/${P}-src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="spell" + +RDEPEND="spell? ( virtual/aspell-dict ) + x11-libs/openmotif + x11-libs/libXp" +DEPEND="${RDEPEND} + || ( dev-util/yacc sys-devel/bison )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-argbvisuals.patch" + epatch "${FILESDIR}/${P}-motif23.patch" +} + +src_compile() { + sed -i -e "s:-Wl,-Bstatic::" makefiles/Makefile.linux + sed -i -e "s:0.93.0:0.94.0:" util/check_lin_tif.c + sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" makefiles/Makefile.linux + sed -i -e 's:"/bin/csh":"/bin/sh":' source/preferences.c + make CC="$(tc-getCC)" linux || die +} + +src_install() { + into /usr + dobin source/nedit + exeinto /usr/bin + newexe source/nc neditc + newman doc/nedit.man nedit.1 + newman doc/nc.man neditc.1 + + dodoc README ReleaseNotes ChangeLog COPYRIGHT + cd doc + dodoc *.txt nedit.doc README.FAQ NEdit.ad + dohtml *.{dtd,xsl,xml,html,awk} +}