diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.2/curlfix.patch | 41 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild | 5 |
3 files changed, 50 insertions, 2 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 4f6fc433a262..32fdb11df9c5 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-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.54 2004/07/17 21:32:17 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.55 2004/08/01 13:19:08 suka Exp $ + + 01 Aug 2004; suka@gentoo.org +files/1.1.2/curlfix.patch, + openoffice-ximian-1.1.60.ebuild: + Fix compile with curl-7.12.0, this closes bug #58983 17 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild: diff --git a/app-office/openoffice-ximian/files/1.1.2/curlfix.patch b/app-office/openoffice-ximian/files/1.1.2/curlfix.patch new file mode 100644 index 000000000000..9ef4e0b7b9be --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.2/curlfix.patch @@ -0,0 +1,41 @@ +--- patches/OOO_1_1/system-curl.diff 2004-07-31 21:53:47.821651752 +0200 ++++ patches/OOO_1_1/system-curl.diff 2004-07-31 21:53:47.822651600 +0200 +@@ -67,3 +67,38 @@ + SHL1DEF=$(MISC)$/$(SHL1TARGET).def + SHL1LIBS= \ + $(LIB1TARGET) ++Index: ftphandleprovider.hxx ++=================================================================== ++RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftphandleprovider.hxx,v ++retrieving revision 1.2 ++diff -u -r1.2 ftphandleprovider.hxx ++--- ucb/source/ucp/ftp/ftphandleprovider.hxx 15 Oct 2002 09:21:17 -0000 1.2 +++++ ucb/source/ucp/ftp/ftphandleprovider.hxx 20 Jul 2004 22:02:48 -0000 ++@@ -1,5 +1,5 @@ ++ #include <rtl/ustring.hxx> ++-#include <curl/types.h> +++#include <curl/curl.h> ++ ++ namespace ftp { ++ ++Index: ftploaderthread.hxx ++=================================================================== ++RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftploaderthread.hxx,v ++retrieving revision 1.5 ++diff -u -r1.5 ftploaderthread.hxx ++--- ucb/source/ucp/ftp/ftploaderthread.hxx 28 Aug 2002 07:23:14 -0000 1.5 +++++ ucb/source/ucp/ftp/ftploaderthread.hxx 20 Jul 2004 22:02:48 -0000 ++@@ -71,11 +71,10 @@ ++ #ifndef _OSL_THREAD_H_ ++ #include <osl/thread.h> ++ #endif ++-#ifndef __CURL_TYPES_H ++-#include <curl/types.h> +++#ifndef __CURL_CURL_H +++#include <curl/curl.h> ++ #endif ++ ++- ++ namespace ftp { ++ ++ /** A loaderthread acts as factory for CURL-handles, diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild index 626d137fcd59..c154ae19ab75 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild,v 1.7 2004/07/17 21:32:17 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild,v 1.8 2004/08/01 13:19:08 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -229,6 +229,9 @@ src_unpack() { cd ${PATCHDIR} epatch ${FILESDIR}/${OO_VER}/fixscale.patch + #Fix problems with newer curl versions + epatch ${FILESDIR}/${OO_VER}/curlfix.patch + #Exchange faulty patch rm patches/OOO_1_1/print-fontconfig.diff || die cp ${FILESDIR}/${OO_VER}/print-fontconfig.diff patches/OOO_1_1/ || die |