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 | 679bd5d68ec86a3137ab589d4398e2dd2a85664c (patch) | |
| tree | 6272492cd5d88430428bf5b4b05244481d43b5b9 /app-office | |
| parent | Stable on alpha. (diff) | |
| download | gentoo-2-679bd5d68ec86a3137ab589d4398e2dd2a85664c.tar.gz gentoo-2-679bd5d68ec86a3137ab589d4398e2dd2a85664c.tar.bz2 gentoo-2-679bd5d68ec86a3137ab589d4398e2dd2a85664c.zip | |
remove double patch, oops
(Portage version: 2.0.51-r13)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -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 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.4.ebuild | 11 |
4 files changed, 21 insertions, 27 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 5db7e5ad53c6..cd66a800e8e5 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.105 2005/01/18 17:25:32 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.106 2005/01/18 17:57:09 suka Exp $ + + 18 Jan 2005; Andreas Proschofsky <suka@gentoo.org> + openoffice-1.1.4.ebuild, -files/1.1.4/gcc34-nptl-fix.patch, + files/1.1.4/nptl.patch: + Remove gcc34-nptl-fix as this is now incorporated in the regular nptl-patch 18 Jan 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-1.1.4.ebuild, +files/1.1.4/nptl.patch: 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 */ diff --git a/app-office/openoffice/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild index edb17d76921e..7df0fc42cfe0 100644 --- a/app-office/openoffice/openoffice-1.1.4.ebuild +++ b/app-office/openoffice/openoffice-1.1.4.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/openoffice-1.1.4.ebuild,v 1.13 2005/01/18 17:25:32 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.14 2005/01/18 17:57:09 suka Exp $ # Notes: # @@ -231,6 +231,7 @@ src_unpack() { epatch ${FILESDIR}/${PV}/STLport-vector.patch fi + #Fixes for nptl if use nptl; then epatch ${FILESDIR}/${PV}/nptl.patch fi @@ -246,15 +247,13 @@ src_unpack() { epatch ${FILESDIR}/${PV}/gcc34.patch.bz2 epatch ${FILESDIR}/${PV}/gcc34-sal-link-to-libsupc++.diff use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch - use nptl && epatch ${FILESDIR}/${PV}/gcc34-nptl-fix.patch fi - #phtread-fix - epatch ${FILESDIR}/${PV}/pthreadlink-fix.patch - - #Fix for hardened + #Fixes for hardened if use hardened; then + epatch ${FILESDIR}/${PV}/pthreadlink-fix.patch epatch ${FILESDIR}/${PV}/hardened-link.patch + epatch ${FILESDIR}/${PV}/pyunolink-fix.patch fi #Do our own branding by setting gentoo linux as the vendor |