diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-18 17:57:09 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-18 17:57:09 +0000 |
| commit | c2340878ed55ee980c5eb623b45dad1d7783a3dc (patch) | |
| tree | a3f4fc39b0dafe84e6f9a1e99362efa32b86fa9a /app-office/openoffice/files | |
| parent | Stable on alpha. (diff) | |
| download | historical-c2340878ed55ee980c5eb623b45dad1d7783a3dc.tar.gz historical-c2340878ed55ee980c5eb623b45dad1d7783a3dc.tar.bz2 historical-c2340878ed55ee980c5eb623b45dad1d7783a3dc.zip | |
remove double patch, oops
Package-Manager: portage-2.0.51-r13
Diffstat (limited to 'app-office/openoffice/files')
| -rw-r--r-- | app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch | 14 | ||||
| -rw-r--r-- | app-office/openoffice/files/1.1.4/nptl.patch | 16 |
2 files changed, 10 insertions, 20 deletions
diff --git a/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch b/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch deleted file mode 100644 index 3e3360b2f422..000000000000 --- a/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./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 */ diff --git a/app-office/openoffice/files/1.1.4/nptl.patch b/app-office/openoffice/files/1.1.4/nptl.patch index 7a17bcc79fdc..996a7ceec67d 100644 --- a/app-office/openoffice/files/1.1.4/nptl.patch +++ b/app-office/openoffice/files/1.1.4/nptl.patch @@ -11,11 +11,15 @@ InfoMemoryTypeAccess( t_short ); *** sal/osl/unx/process.c.orig --- sal/osl/unx/process.c -@@ -1020,7 +1020,7 @@ - #if defined(LINUX) - /* mfe: linux likes to have just one thread when the exec family is called */ - /* this np function has this purpose ... */ +@@ -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(); -+ /*pthread_kill_other_threads_np();*/ - #endif +-#endif OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); + + /* Connect std IO to pipe ends */ |