diff options
Diffstat (limited to 'patches/OOO_1_1_2/system-curl.diff')
-rw-r--r-- | patches/OOO_1_1_2/system-curl.diff | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/patches/OOO_1_1_2/system-curl.diff b/patches/OOO_1_1_2/system-curl.diff deleted file mode 100644 index ddeca044e..000000000 --- a/patches/OOO_1_1_2/system-curl.diff +++ /dev/null @@ -1,91 +0,0 @@ ---- curl/makefile.mk 16 Jul 2003 17:24:06 -0000 1.8 -+++ curl/makefile.mk 22 Dec 2003 15:07:10 -0000 -@@ -71,6 +71,12 @@ - - # --- Files -------------------------------------------------------- - -+.IF "$(SYSTEM_CURL)" == "YES" -+@all: -+ -+ echo "Using curl already installed on system." -+.ENDIF -+ - TARFILE_NAME=curl-7.9.8 - - .IF "$(GUI)"=="UNX" -Index: office/files.scp -=================================================================== -RCS file: /cvs/installation/scp/source/office/files.scp,v -retrieving revision 1.369.16.3.12.3 -diff -u -r1.369.16.3.12.3 files.scp ---- scp/source/office/files.scp 13 Dec 2003 15:36:15 -0000 1.369.16.3.12.3 -+++ scp/source/office/files.scp 22 Dec 2003 19:38:30 -0000 -@@ -938,6 +938,8 @@ - #endif - End - -+#ifndef SYSTEM_CURL -+ - File GID_FILE_LIB_CURL - TXT_FILE_BODY; - Styles = (PACKED); -@@ -949,6 +951,7 @@ - #endif - End - -+#endif - - File GID_FILE_LIB_I18NREGEXP - TXT_FILE_BODY; -Index: ftpurl.hxx -=================================================================== -RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftpurl.hxx,v -retrieving revision 1.11 -diff -u -r1.11 ftpurl.hxx ---- ucb/source/ucp/ftp/ftpurl.hxx 27 Mar 2003 17:26:48 -0000 1.11 -+++ ucb/source/ucp/ftp/ftpurl.hxx 15 Jan 2004 03:16:09 -0000 -@@ -80,6 +80,9 @@ - #include "ftpdirp.hxx" - #include "ftpcfunc.hxx" - -+#define TRUE 1 -+#define FALSE 0 -+ - namespace ftp { - - /** Forward declarations. -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, |