build fixes for nptl and pyuno problems

Package-Manager: portage-2.0.51-r13

5 files changed, 44 insertions, 7 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index a8671d54b89d..1d0a99c3ff54 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.96 2005/01/17 20:43:25 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.97 2005/01/18 18:12:22 suka Exp $
+
+  18 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  -files/1.1.3/gcc34-nptl-fix.patch, +files/1.1.3/nptl.patch,
+  +files/1.1.3/pyunolink-fix.patch, openoffice-ximian-1.3.7.ebuild:
+  Fixes for nptl and pyuno build breakage, should close quite some bugs, if
+  this works out
 
   17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/1.1.3/gcc-instlib.patch, openoffice-ximian-1.3.7.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 0703b6e351c1..894f404b7b6b 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
 MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873
 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
-MD5 cad1c440f4ff4bb6ba55eebc8698b678 openoffice-ximian-1.3.7.ebuild 17261
-MD5 91a1e484df4e7f1f1ab930e68d7e3b8c ChangeLog 23767
+MD5 f7ef636ce6c9d23a92a0d7500364d1b0 openoffice-ximian-1.3.7.ebuild 17357
+MD5 0b97a58a9c925c8eba3f3f22b189d749 ChangeLog 24044
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
@@ -14,6 +14,7 @@ MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
 MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
 MD5 f9578015a434c209259917e9df3c0b27 files/1.1.3/gcc34_2.patch.bz2 33535
 MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.3/pyunolink-fix.patch 475
 MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980
 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
@@ -24,9 +25,9 @@ MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576
 MD5 03a4e552b53cb7fc9da8d844369ff647 files/1.1.3/gentoo-1.3.7.patch 995
 MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
 MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
-MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
 MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.3/nptl.patch 785
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.3/gcc34-sal-link-to-libsupc++.diff 405
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
 MD5 dd3785621235368cc28f1f85101fcac7 files/1.1.3/nojvmfwk-fix.patch 6986
diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch b/app-office/openoffice-ximian/files/1.1.3/nptl.patch
index 3e3360b2f422..996a7ceec67d 100644
--- a/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch
+++ b/app-office/openoffice-ximian/files/1.1.3/nptl.patch
@@ -1,5 +1,16 @@
---- ./sal/osl/unx/process.c.orig	2003-07-02 15:34:17.000000000 +0200
-+++ ./sal/osl/unx/process.c	2004-11-01 15:16:40.976815960 +0100
+--- tools/source/solar/solar.c.orig
++++ tools/source/solar/solar.c
+@@ -577,7 +577,7 @@
+ 
+   {
+ 	char* p = NULL;
+-	InfoMemoryAccess( p );
++	/*InfoMemoryAccess( p );*/
+ 	p = (char*)&p;
+ 	InfoMemoryAccess( p );
+ 	InfoMemoryTypeAccess( t_short );
+*** sal/osl/unx/process.c.orig
+--- sal/osl/unx/process.c
 @@ -1017,11 +1017,6 @@
  			for (i = 0; data.m_pszEnv[i] != NULL; i++)
  	     		putenv(data.m_pszEnv[i]);
diff --git a/app-office/openoffice-ximian/files/1.1.3/pyunolink-fix.patch b/app-office/openoffice-ximian/files/1.1.3/pyunolink-fix.patch
new file mode 100644
index 000000000000..6d8ce6323868
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.3/pyunolink-fix.patch
@@ -0,0 +1,14 @@
+--- pyuno.orig/source/module/makefile.mk	2005-01-18 11:59:23.462336464 +0100
++++ pyuno/source/module/makefile.mk	2005-01-18 11:59:42.289474304 +0100
+@@ -82,9 +82,9 @@
+ # so this library cannot be checked
+ SHL1NOCHECK=yes
+ PYUNORC=pyunorc
+-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
++#.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
+ PYTHONLIB=-lpython
+-.ENDIF
++#.ENDIF
+ .ELSE
+ # on windows, the python executable also uses the shared library,
+ # so we link pyuno directly to it
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
index 8708de1b647a..0db6289da716 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.9 2005/01/17 21:26:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.10 2005/01/18 18:12:22 suka Exp $
 
 # Notes:
 #
@@ -391,6 +391,11 @@ src_compile() {
 	# Build as minimal as possible
 	export BUILD_MINIMAL="${LANGNO}"
 
+	# Embedded python dies without Home set
+	if test "z${HOME}" = "z"; then
+		export HOME=""
+	fi
+
 	#Get info for parallel build
 	export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`