diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2003-10-23 10:55:37 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2003-10-23 10:55:37 +0000 |
| commit | 4bab595e61cb5fd3752cc8db3778bf5f5163bf77 (patch) | |
| tree | 5404c5c15c94bdfa82485d7ca91102e2244f286f | |
| parent | Enlarge environment limit to at least temporarilly releave the presure by ebu... (diff) | |
| download | historical-4bab595e61cb5fd3752cc8db3778bf5f5163bf77.tar.gz historical-4bab595e61cb5fd3752cc8db3778bf5f5163bf77.tar.bz2 historical-4bab595e61cb5fd3752cc8db3778bf5f5163bf77.zip | |
Make openoffice depend on fixed findutils
| -rw-r--r-- | app-office/openoffice/ChangeLog | 9 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 5 | ||||
| -rw-r--r-- | app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch | 16 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.0-r1.ebuild | 5 |
4 files changed, 31 insertions, 4 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2a0c9d2fbcce..d2ced8c6a216 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.45 2003/10/23 09:24:25 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.46 2003/10/23 10:55:31 pauldv Exp $ + + 23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild: + Depend on newest findutils so that the xargs problem is aleviated at least + temporarilly + + 23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild: + Add kernel 2.6.0 patch 23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild, openoffice-1.1.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index c3be390ed24a..bb03d6c8b360 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,7 +1,7 @@ MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 -MD5 9eb5539d9a7478933ac49a84b851ddc5 ChangeLog 10975 +MD5 3da9fcc0c891ba47c85cfd22a2b36721 ChangeLog 11250 MD5 7564812fd1fe3da72c7bf49ca9df4f6d openoffice-1.0.3-r1.ebuild 21884 -MD5 fb794e1f18e69fcb2195e65898891ee5 openoffice-1.1.0-r1.ebuild 19746 +MD5 f9a22685202f39f89cf99d6f626bd5f0 openoffice-1.1.0-r1.ebuild 19841 MD5 4404328b62ac96012b5568eac78d654f openoffice-1.1.0.ebuild 19772 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r1 195 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0 195 @@ -10,6 +10,7 @@ MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972 MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741 MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655 MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644 +MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603 MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285 MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367 MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220 diff --git a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch b/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch new file mode 100644 index 000000000000..15c90b2e456c --- /dev/null +++ b/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch @@ -0,0 +1,16 @@ +Submitted By: Mark Hymers <markh AT linuxfromscratch DOT org> +Date: 2003-10-05 +Initial Package Version: 1.1.0 +Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-September/003771.html +Description: Fixes critical segmentation fault on linux-2.6.0 based systems +--- oo_1.1_src/tools/source/solar/solar.c 2003-04-15 12:55:43.000000000 -0500 ++++ oo_1.1_src/tools/source/solar/solar.c.new 2003-10-05 12:31:58.000000000 -0500 +@@ -76,7 +76,7 @@ + #include <varargs.h> + #endif + +-#define NO_USE_FORK_TO_CHECK ++#define USE_FORK_TO_CHECK + #ifdef USE_FORK_TO_CHECK + #include <sys/wait.h> + #else diff --git a/app-office/openoffice/openoffice-1.1.0-r1.ebuild b/app-office/openoffice/openoffice-1.1.0-r1.ebuild index 6c007eff8b43..cc0d47285a75 100644 --- a/app-office/openoffice/openoffice-1.1.0-r1.ebuild +++ b/app-office/openoffice/openoffice-1.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r1.ebuild,v 1.4 2003/10/23 09:24:25 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r1.ebuild,v 1.5 2003/10/23 10:55:31 pauldv Exp $ # IMPORTANT: This is extremely alpha!!! @@ -80,6 +80,7 @@ RDEPEND=">=sys-libs/glibc-2.1 DEPEND="${RDEPEND} app-shells/tcsh !app-office/openoffice-bin + >=sys-aps/findutils-4.1.20-r1 !sys-apps/star" # fix a bug with tcsh and dircolors @@ -275,6 +276,8 @@ src_unpack() { epatch ${FILESDIR}/${PV}/nptl.patch + epatch ${FILESDIR}/${PV}/openoffice-1.1.0-linux-2.6-fix.patch + #The gcc-3.2.3 version in gentoo is fixed for the internal error that #blocks compilation with it, so remove the check from the configure script # epatch ${FILESDIR}/${PV}/fixed-gcc.patch |