diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2009-05-26 21:09:28 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2009-05-26 21:09:28 +0000 |
| commit | 623e8ffe709560c1a96c445c0421dfc6efa427e4 (patch) | |
| tree | 1ebe38d2358d3768feb9e5c492c5c0a67c6daac2 /app-office/openoffice | |
| parent | Add patch to fix building with glibc-2.10. Closes bug #270640. (diff) | |
| download | gentoo-2-623e8ffe709560c1a96c445c0421dfc6efa427e4.tar.gz gentoo-2-623e8ffe709560c1a96c445c0421dfc6efa427e4.tar.bz2 gentoo-2-623e8ffe709560c1a96c445c0421dfc6efa427e4.zip | |
Update to ooo-build-3.0.1.5 patch set, some more build fixes
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/ooo_getline.diff | 42 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.1.0.ebuild | 5 |
3 files changed, 7 insertions, 46 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index cf1a0081b9f1..77791dadd540 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.465 2009/05/24 08:46:28 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.466 2009/05/26 21:09:27 suka Exp $ + + 26 May 2009; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.1.0.ebuild, -files/ooo_getline.diff: + Update to ooo-build-3.0.1.5 build set, some more build fixes 24 May 2009; Andreas Proschofsky <suka@gentoo.org> openoffice-3.1.0.ebuild: diff --git a/app-office/openoffice/files/ooo_getline.diff b/app-office/openoffice/files/ooo_getline.diff deleted file mode 100644 index 9fed114c3979..000000000000 --- a/app-office/openoffice/files/ooo_getline.diff +++ /dev/null @@ -1,42 +0,0 @@ ---- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200 -+++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200 -@@ -154,7 +154,7 @@ - - char *copy(); - char *base_name(); --char *getline(); -+char *ooo_getline(); - char *isdefined(); - struct filepointer *getfile(); - struct inclist *newinclude(); ---- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200 -+++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200 -@@ -548,7 +548,7 @@ - * Get the next line. We only return lines beginning with '#' since that - * is all this program is ever interested in. - */ --char *getline(filep) -+char *ooo_getline(filep) - register struct filepointer *filep; - { - register char *p, /* walking pointer */ ---- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200 -+++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200 -@@ -45,7 +45,7 @@ - register int type; - boolean recfailOK; - -- while ((line = getline(filep))) { -+ while ((line = ooo_getline(filep))) { - switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) { - case IF: - doif: -@@ -168,7 +168,7 @@ - register char *line; - register int type; - -- while ((line = getline(filep))) { -+ while ((line = ooo_getline(filep))) { - switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) { - case IF: - case IFFALSE: diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild index ea251c96ccf7..adb25f754048 100644 --- a/app-office/openoffice/openoffice-3.1.0.ebuild +++ b/app-office/openoffice/openoffice-3.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.4 2009/05/24 08:46:28 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.5 2009/05/26 21:09:27 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -9,7 +9,7 @@ inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg- IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates" -MY_PV=3.1.0.4 +MY_PV=3.1.0.5 PATCHLEVEL=OOO310 SRC=OOo_${PV}_src MST=ooo310-m11 @@ -233,7 +233,6 @@ src_prepare() { epatch "${FILESDIR}/ooo-env_log.diff" cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die - cp -f "${FILESDIR}/ooo_getline.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die #Use flag checks |