glibc-2.4 fix wrt bug #125832

(Portage version: 2.1_pre6-r5)

5 files changed, 220 insertions, 1 deletions

diff --git a/app-editors/nvu/ChangeLog b/app-editors/nvu/ChangeLog
index 6a4a9da1b902..d4127edc3fa3 100644
--- a/app-editors/nvu/ChangeLog
+++ b/app-editors/nvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/nvu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.15 2006/01/02 19:21:17 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.16 2006/03/20 17:18:10 anarchy Exp $
+
+*nvu-1.0-r3 (20 Mar 2006)
+
+  20 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/010_glibc-2.4.patch, +nvu-1.0-r3.ebuild:
+  Glibc-2.4 fix wrt bug #125832
 
   02 Jan 2006; Jory A. Pratt <anarchy@gentoo.org> nvu-1.0-r2.ebuild:
   DEPEND correction wrt bug#115339
diff --git a/app-editors/nvu/Manifest b/app-editors/nvu/Manifest
index 68acc010164b..3f8de1a3ca6d 100644
--- a/app-editors/nvu/Manifest
+++ b/app-editors/nvu/Manifest
@@ -1,14 +1,51 @@
 MD5 80e048d8574c106a2735af8672e93e4a ChangeLog 5048
+RMD160 7a090ff07580b59505622e94c4199a3ad5b91c46 ChangeLog 5048
+SHA256 07bd5afc5c1a6d429629680415ab24db9b248dd1f35c9d498de0716b02b71312 ChangeLog 5048
+MD5 1bbe55892586ddbce300e5abb134a681 files/010_glibc-2.4.patch 2628
+RMD160 77d35dec11624ef1b3ad84d72eb437068cbc9f0f files/010_glibc-2.4.patch 2628
+SHA256 5a64ffadb56c3c2316202e57ce82b6439c3037c6f4a5a1d4783d03173741e5cd files/010_glibc-2.4.patch 2628
 MD5 565f1133c57a789f0cf51c02510a6f9c files/1.0/mozconfig-1.0 1367
+RMD160 cf760e7b9ba734b989f6e5d204b0fb6c9142e76b files/1.0/mozconfig-1.0 1367
+SHA256 9ffca88736697d620cfef8ce907e2e7e973eac51a71825831ec0ce96839df8cf files/1.0/mozconfig-1.0 1367
 MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/1.0/nvu-0.50-dir.patch 713
+RMD160 7a30d72bf54fff4be8d04798d1b9ca26a367c3b8 files/1.0/nvu-0.50-dir.patch 713
+SHA256 ab6628e84162eeb42aaf5619bc56e5f046f2ad5c46757e42bf676cad00a19f37 files/1.0/nvu-0.50-dir.patch 713
 MD5 952edf776beb47f9ddeeed1eb3a9407f files/1.0/nvu-0.50-freetype-compile.patch 13641
+RMD160 676fe412adbc68a1dc63a4b949b5827271bb901f files/1.0/nvu-0.50-freetype-compile.patch 13641
+SHA256 9d8b96fe66f3647f7a757c3a8325b0b24d2cd017c9aa8228eb5894c3ef64eefc files/1.0/nvu-0.50-freetype-compile.patch 13641
 MD5 7880f1109c0f8a9df0830238e70b0d62 files/1.0/nvu-0.50-nvu.patch 674
+RMD160 da79cbb283eb7f621b330f4ab94b2684c9871941 files/1.0/nvu-0.50-nvu.patch 674
+SHA256 85eca4e5171d7845efe333000b1b1106355f117fc7eef5ef592b4f2895759555 files/1.0/nvu-0.50-nvu.patch 674
 MD5 c4ea99043fc3f4591a6e11bb3028f04e files/1.0/nvu-1.0-gcc4-1.patch 6860
+RMD160 d7d47cbe00ac05045eb7f92a69c1c8703925c3d2 files/1.0/nvu-1.0-gcc4-1.patch 6860
+SHA256 a8ccffaf13ffc4b0711d28727d16ab751e17aa104ad6da9f4ad88bae4f774c5e files/1.0/nvu-1.0-gcc4-1.patch 6860
 MD5 c68ab50fa971f53df6ae113289920242 files/1.0/nvu-1.0-gcc4.patch 1924
+RMD160 7f7220aca0df6e801b9f5cfd33725bc11e301906 files/1.0/nvu-1.0-gcc4.patch 1924
+SHA256 8d01c0973fc17858a0d40afca67f30c3f54762b6abcc4e1fb1aed8f110e7b255 files/1.0/nvu-1.0-gcc4.patch 1924
 MD5 bde161b6920a9f919de3eb400506b6a7 files/1.0/nvu.desktop 182
+RMD160 1775dfae770da3c90dc9a83934b36876bfce5009 files/1.0/nvu.desktop 182
+SHA256 d2b439f20bf4ef0547f799a562e34d67e01490d1a17b6fd1b2e63c86926c0397 files/1.0/nvu.desktop 182
 MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r2 71
+RMD160 231bfbbb998a79cefc186e0862c4a33b8a9da4d5 files/digest-nvu-0.90-r2 71
+SHA256 bb0c7035c68b1221342a837e127d2ec2efc034897d9d9afa39358c6750206c45 files/digest-nvu-0.90-r2 71
 MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0-r2 70
+RMD160 09c3dc34fc351be63a5b32dcac1fd447a3da9bdd files/digest-nvu-1.0-r2 70
+SHA256 bb77602d3db0ce3121f0539ead6ca0be366b0ab13f62c093e941744545693172 files/digest-nvu-1.0-r2 70
+MD5 331e2f632c2e315378193c928afe3514 files/digest-nvu-1.0-r3 256
+RMD160 e76ac0081af973af9392199e9ceaebb77304609f files/digest-nvu-1.0-r3 256
+SHA256 74325cc9527e15c1c2a9b3daee112e92ed7f417d91f382f6e2b4c2c5c644f116 files/digest-nvu-1.0-r3 256
 MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160
+RMD160 b3b57ca4815386f85f91b666ce41d4d9b45b9f64 files/mozconfig2 2160
+SHA256 9067662d295e1bf58da656d4693589977b8345d0ead9065b5515979d64a26ad5 files/mozconfig2 2160
 MD5 2f058933e09a68513c1ca3022b81a441 metadata.xml 433
+RMD160 90a9f20a0ff79b149e2af2f4665f6e27039160b8 metadata.xml 433
+SHA256 a5d3856076e7aec6f50904b5f9ba7342f9782ff2c239f655647c39751c2c1318 metadata.xml 433
 MD5 c3c4cbc233f87340d78fab34edbc469e nvu-0.90-r2.ebuild 2298
+RMD160 1f46ec8498b28dc49dd20899425089168ca12037 nvu-0.90-r2.ebuild 2298
+SHA256 7b0a45946c0399084e4ed0d0b50bbd861fb9e665596e24d444c88f0b6e8ac5ab nvu-0.90-r2.ebuild 2298
 MD5 f71aac9cd14f142bff51d1f51c8ac89c nvu-1.0-r2.ebuild 3124
+RMD160 f3d34ea7bca91756fd6a79d0617015a3850fdf9d nvu-1.0-r2.ebuild 3124
+SHA256 f4a15f05c095dae5df62570581af25d3c597cdf3c1f4752a6753ff86fb3b31c6 nvu-1.0-r2.ebuild 3124
+MD5 0cb5404a265b3c664474f4f998ce348d nvu-1.0-r3.ebuild 3207
+RMD160 dc1aebed2b22045335e2409a931ea8894f25bde9 nvu-1.0-r3.ebuild 3207
+SHA256 21b11a30440e09f2409dced3a85258c96a7cc153909bc8d3b935888959e2c62f nvu-1.0-r3.ebuild 3207
diff --git a/app-editors/nvu/files/010_glibc-2.4.patch b/app-editors/nvu/files/010_glibc-2.4.patch
new file mode 100644
index 000000000000..e4b56d30dd48
--- /dev/null
+++ b/app-editors/nvu/files/010_glibc-2.4.patch
@@ -0,0 +1,84 @@
+diff -u -p -8 -r1.12 nsStackFrameUnix.cpp
+--- xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
++++ xpcom/base/nsStackFrameUnix.cpp	23 Jan 2006 09:23:04 -0000
+@@ -77,19 +77,30 @@ void DemangleSymbol(const char * aSymbol
+     if (demangled)
+     {
+         strncpy(aBuffer,demangled,aBufLen);
+         free(demangled);
+     }
+ #endif // MOZ_DEMANGLE_SYMBOLS
+ }
+ 
++#if defined(linux) // Linux
++#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)) // use glibc backtrace()
++#include <execinfo.h>
++void DumpStackToFile(FILE* aStream)
++{
++  void *array[20];
++  size_t size;
+ 
+-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
++  fflush(aStream);
++  size = backtrace (array, 20);
++  backtrace_symbols_fd (array, size, fileno(aStream));
++}
+ 
++#elif defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // old style i386 or PPC Linux stackwalking code
+ #include <setjmp.h>
+ //
+ 
+ void DumpStackToFile(FILE* aStream)
+ {
+   jmp_buf jb;
+   setjmp(jb);
+ 
+@@ -135,16 +146,23 @@ void DumpStackToFile(FILE* aStream)
+ 
+       PRUint32 off = (char*)pc - (char*)info.dli_saddr;
+       fprintf(aStream, "%s+0x%08X [%s +0x%08X]\n",
+               symbol, off, info.dli_fname, foff);
+     }
+   }
+ }
+ 
++#else // not implemented
++void DumpStackToFile(FILE* aStream)
++{
++  fprintf(aStream, "Info: Stacktrace not implemented for this Linux platform\n");
++}
++#endif // Linux
++
+ #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))
+ 
+ /*
+  * Stack walking code for Solaris courtesy of Bart Smaalder's "memtrak".
+  */
+ 
+ #include <synch.h>
+ #include <ucontext.h>
+
+diff -u -p -8 -r1.96 nsTraceRefcntImpl.cpp
+--- xpcom/base/nsTraceRefcntImpl.cpp	24 Jun 2005 00:24:41 -0000	1.96
++++ xpcom/base/nsTraceRefcntImpl.cpp	23 Jan 2006 09:24:05 -0000
+@@ -823,18 +823,18 @@ static void InitTraceLog(void)
+ #include "nsStackFrameWin.h"
+ void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ // WIN32 x86 stack walking code
+-// i386 or PPC Linux stackwalking code or Solaris
+-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
++// Linux stackwalking code or Solaris
++#elif (defined(linux) && defined(__GLIBC__)) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+ #include "nsStackFrameUnix.h"
+ void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ #else // unsupported platform.
diff --git a/app-editors/nvu/files/digest-nvu-1.0-r3 b/app-editors/nvu/files/digest-nvu-1.0-r3
new file mode 100644
index 000000000000..9e9bf40be61d
--- /dev/null
+++ b/app-editors/nvu/files/digest-nvu-1.0-r3
@@ -0,0 +1,3 @@
+MD5 ae0f7c85e230ce8a90dc438b53be06e6 nvu-1.0-sources.tar.bz2 29687976
+RMD160 6d6fdb747d79e8602a4757e8eff8bbb21db6df8c nvu-1.0-sources.tar.bz2 29687976
+SHA256 9ec892e352c3596a4f734a885c6e085028574714cf0d44c2dac32b0d89b4b630 nvu-1.0-sources.tar.bz2 29687976
diff --git a/app-editors/nvu/nvu-1.0-r3.ebuild b/app-editors/nvu/nvu-1.0-r3.ebuild
new file mode 100644
index 000000000000..5e0461f025b6
--- /dev/null
+++ b/app-editors/nvu/nvu-1.0-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0-r3.ebuild,v 1.1 2006/03/20 17:18:10 anarchy Exp $
+
+inherit eutils mozconfig flag-o-matic multilib
+
+DESCRIPTION="A WYSIWYG web editor for linux similiar to Dreamweaver"
+HOMEPAGE="http://www.nvu.com/"
+SRC_URI="http://cvs.nvu.com/download/${P}-sources.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
+DEPEND="|| ( x11-proto/printproto virtual/x11 )
+	sys-apps/gawk
+	dev-lang/perl
+	>=media-libs/freetype-2.1.9-r1"
+
+S=${WORKDIR}/mozilla
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Fix those darn directories!  Make something more "standard"
+	# That can extend to future versions with much more ease. - Chris
+	epatch ${FILESDIR}/1.0/nvu-0.50-dir.patch || die "failed to apply dir. patch"
+	epatch ${FILESDIR}/1.0/nvu-0.50-freetype-compile.patch || die "failed to patch for freetype"
+	epatch ${FILESDIR}/1.0/${P}-gcc4-1.patch || die "failed to apply gcc-4 patch"
+	epatch "${FILESDIR}/010_glibc-2.4.patch" || die "failed to apply glibc-2.4 patch"
+
+	# I had to manually edit the mozconfig.linux file as it
+	# has some quirks... just copy the darn thing over :) - Chris
+	# cp ${FILESDIR}/mozconfig ${S}/.mozconfig
+	# remove --enable-optimize and let the code below
+	# add the appropriate one - basic
+	# Also set mozilla-five-home (and libdir) below - herbs
+	grep -v 'enable-optimize\|mozilla-five-home' \
+		${FILESDIR}/1.0/mozconfig-1.0 > .mozconfig
+
+	# Set the lib directory
+	echo "ac_add_options --libdir=/usr/$(get_libdir)" >> .mozconfig
+	echo "ac_add_options --with-default-mozilla-five-home=/usr/$(get_libdir)/nvu" >> .mozconfig
+
+	# copied from mozilla.eclass (modified slightly),
+	# otherwise it defaults to -O which crashes on startup for me - basic
+	# Set optimization level based on CFLAGS
+	if is-flag -O0; then
+		echo 'ac_add_options --enable-optimize=-O0' >> .mozconfig
+	elif is-flag -O1; then
+		echo 'ac_add_options --enable-optimize=-O1' >> .mozconfig
+	else
+		# mozilla fallback
+		echo 'ac_add_options --enable-optimize=-O2' >> .mozconfig
+	fi
+}
+
+src_compile() {
+	# The build system is a weeee bit sensitive to naughty -O flags.
+	# filter them out and let the build system figure out what
+	# won't let it die :) - Chris
+	filter-flags '-O*'
+	# epatch ${FILESDIR}/nvu-0.80-mozconfig.patch
+
+	make -f client.mk build_all || die "Make failed"
+}
+
+src_install() {
+
+	# patch the final nvu binary to workaround bug #67658
+	epatch ${FILESDIR}/1.0/nvu-0.50-nvu.patch
+
+	make -f client.mk DESTDIR=${D} install || die
+
+	#menu entry for gnome/kde
+	insinto /usr/share/applications
+	sed -e "s:/usr/lib/nvu:/usr/$(get_libdir)/nvu:" \
+		${FILESDIR}/1.0/nvu.desktop > ${T}/nvu.desktop
+	doins ${T}/nvu.desktop
+}
+
+pkg_postinst() {
+	einfo "If you choose to setup the webbrowser feature to execute urls"
+	einfo "under the HELP section please refer to"
+	einfo "http://www.nvu.com/Building_From_Source.html#tipsandhints ."
+	einfo "Make sure you follow the instructions to the letter if you have"
+	einfo "any problems email me at anarchy@gentoo.org I will be more then"
+	einfo "happy to assist you. DO NOT file a bug report on this issue."
+}