diff options
Diffstat (limited to 'patches/OOO_1_1/win32-msvs-2003-misc.diff')
| -rw-r--r-- | patches/OOO_1_1/win32-msvs-2003-misc.diff | 80 |
1 files changed, 6 insertions, 74 deletions
diff --git a/patches/OOO_1_1/win32-msvs-2003-misc.diff b/patches/OOO_1_1/win32-msvs-2003-misc.diff index 179bf20da..5c4c8890b 100644 --- a/patches/OOO_1_1/win32-msvs-2003-misc.diff +++ b/patches/OOO_1_1/win32-msvs-2003-misc.diff @@ -21,43 +21,10 @@ retrieving revision 1.4.10.1 diff -u -p -u -w -r1.4.10.1 boost_1_27_0.patch --- boost/boost_1_27_0.patch 15 Aug 2003 11:47:26 -0000 1.4.10.1 +++ boost/boost_1_27_0.patch 1 Apr 2004 22:44:43 -0000 -@@ -1,21 +1,66 @@ ----- misc/boost_1_27_0/boost/config/compiler/gcc.hpp --+++ misc/build/boost_1_27_0/boost/config/compiler/gcc.hpp --@@ -49,10 +49,10 @@ -+*** misc/boost_1_27_0/boost/config/compiler/gcc.hpp Thu Feb 7 16:26:06 2002 -+--- misc/build/boost_1_27_0/boost/config/compiler/gcc.hpp Mon Sep 15 13:00:28 2003 -+*************** -+*** 49,58 **** -+ # error "Compiler not configured - please reconfigure" -+ #endif -+ // -+! // last known and checked version is 3.1: -+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 1)) -+ # if defined(BOOST_ASSERT_CONFIG) -+! # error "Unknown compiler version - please run the configure tests and report the results" -+ # else -+ # warning "Unknown compiler version - please run the configure tests and report the results" -+ # endif -+--- 49,58 ---- - # error "Compiler not configured - please reconfigure" - #endif - // ---// last known and checked version is 3.1: ---#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 1)) --+// last known and checked version is 3.3: --+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) -+! // last known and checked version is 3.3: -+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) - # if defined(BOOST_ASSERT_CONFIG) ---# error "Unknown compiler version - please run the configure tests and report the results" --+# error "Unknown / untested compiler version - please run the configure tests and report the results" -+! # error "Unknown / untested compiler version - please run the configure tests and report the results" - # else - # warning "Unknown compiler version - please run the configure tests and report the results" - # endif --*** misc/boost_1_27_0/boost/config/user.hpp Thu Feb 7 10:26:05 2002 ----- misc/build/boost_1_27_0/boost/config/user.hpp Fri Apr 11 17:50:51 2003 +@@ -23,6 +23,42 @@ + # else + # warning "Unknown compiler version - please run the configure tests and report the results" + # endif +*** misc/boost_1_27_0/boost/config/compiler/visualc.hpp Thu Feb 7 16:26:08 2002 +--- misc/build/boost_1_27_0/boost/config/compiler/visualc.hpp Mon Sep 15 13:01:38 2003 +*************** @@ -94,11 +61,9 @@ diff -u -p -u -w -r1.4.10.1 boost_1_27_0.patch + # if defined(BOOST_ASSERT_CONFIG) + # error "Unknown compiler version - please run the configure tests and report the results" + # else -+*** misc/boost_1_27_0/boost/config/user.hpp Thu Feb 7 16:26:05 2002 -+--- misc/build/boost_1_27_0/boost/config/user.hpp Mon Sep 15 13:00:28 2003 + *** misc/boost_1_27_0/boost/config/user.hpp 2002-02-07 16:26:05.000000000 +0100 + --- misc/build/boost_1_27_0/boost/config/user.hpp 2004-10-04 19:33:26.631731992 +0200 *************** - *** 56,58 **** - --- 56,68 ---- Index: configmgr/source/api2/apiaccessobj.hxx =================================================================== RCS file: /cvs/util/configmgr/source/api2/apiaccessobj.hxx,v @@ -674,39 +639,6 @@ diff -u -p -u -w -r1.62.20.1 makefile.mk DOCUSTUDIO4INTEGRATIONHTMLFILES= \ $(DESTDIRDOCU)$/DevStudioWizards$/CalcAddinWizard.html \ -@@ -238,7 +239,10 @@ INSTALLSCRIPT= \ - $(DESTDIR)$/setsdkenv_windows.bat - .ENDIF - --DIR_FILE_LIST=\ -+#-------------------------------------------------- -+# TARGETS -+#-------------------------------------------------- -+all : \ - $(EXELIST) \ - $(XMLLIST) \ - $(SDKDLLLIST) \ -@@ -251,19 +255,9 @@ DIR_FILE_LIST=\ - $(DESTDIRDOCU)$/common$/spec$/xml_format$/xml_specification.pdf - # $(DESTDIRCLASSES)$/oosupport.nbm \ - --DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d)) --DIR_CREATE_FLAG=$(MISC)$/copying_dirs_created.txt --DIR_FILE_FLAG=$(MISC)$/copying_files.txt -- --#-------------------------------------------------- --# TARGETS --#-------------------------------------------------- --all : \ -- $(DIR_FILE_LIST) \ -- $(DIR_FILE_FLAG) -- - #-------------------------------------------------- - # use global rules - #-------------------------------------------------- - .INCLUDE: $(PRJ)$/util$/odk_rules.pmk - -+ Index: python/makefile.mk =================================================================== RCS file: /cvs/external/python/makefile.mk,v |