summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-03-31 13:03:50 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-03-31 13:03:50 +0000
commitdd0bb501757e8bcb5b8978b96dd36c66fd983cfe (patch)
tree328962b7218d282cb1354fb1059c7be1fb9c5478 /app-office
parentFixing gconvdir on multilib archs, BUG #86861 (diff)
downloadgentoo-2-dd0bb501757e8bcb5b8978b96dd36c66fd983cfe.tar.gz
gentoo-2-dd0bb501757e8bcb5b8978b96dd36c66fd983cfe.tar.bz2
gentoo-2-dd0bb501757e8bcb5b8978b96dd36c66fd983cfe.zip
Re-adding a patch which is necessary for oox-1.3.6
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-ximian/ChangeLog6
-rw-r--r--app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch14
2 files changed, 19 insertions, 1 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index af580f63ffb4..8475a3f8c28d 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
# 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.115 2005/03/28 08:37:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.116 2005/03/31 13:03:50 suka Exp $
+
+ 31 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+ +files/1.1.3/gcc34-nptl-fix.patch:
+ Re-adding a patch which is necessary for oox-1.3.6
28 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+files/1.1.3/getcompver.awk.patch, openoffice-ximian-1.3.6.ebuild,
diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch b/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch
new file mode 100644
index 000000000000..3e3360b2f422
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch
@@ -0,0 +1,14 @@
+--- ./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
+@@ -1017,11 +1017,6 @@
+ for (i = 0; data.m_pszEnv[i] != NULL; i++)
+ putenv(data.m_pszEnv[i]);
+
+-#if defined(LINUX)
+- /* mfe: linux likes to have just one thread when the exec family is called */
+- /* this np function has this purpose ... */
+- pthread_kill_other_threads_np();
+-#endif
+ OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
+
+ /* Connect std IO to pipe ends */