diff options
Diffstat (limited to 'app-office/openoffice/files')
-rw-r--r-- | app-office/openoffice/files/1.1.3/gcc34-nojava-fix.patch | 11 | ||||
-rw-r--r-- | app-office/openoffice/files/1.1.3/gcc34-nptl-fix.patch | 14 | ||||
-rw-r--r-- | app-office/openoffice/files/1.1.3/gcc34.patch.bz2 | bin | 34342 -> 0 bytes | |||
-rw-r--r-- | app-office/openoffice/files/1.1.3/newstlportfix2.patch | 100 | ||||
-rw-r--r-- | app-office/openoffice/files/digest-openoffice-1.1.3-r1 | 5 |
5 files changed, 0 insertions, 130 deletions
diff --git a/app-office/openoffice/files/1.1.3/gcc34-nojava-fix.patch b/app-office/openoffice/files/1.1.3/gcc34-nojava-fix.patch deleted file mode 100644 index 73017c1bae19..000000000000 --- a/app-office/openoffice/files/1.1.3/gcc34-nojava-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sfx2/util/makefile.mk 2004-11-06 18:49:27.753988376 +0100 -+++ sfx2/util/makefile.mk 2004-11-06 18:39:19.706425656 +0100 -@@ -70,6 +70,8 @@ - GEN_HID=TRUE - GEN_HID_OTHER=TRUE - -+LINKFLAGSDEFS = # do not fail with missing symbols -+ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk diff --git a/app-office/openoffice/files/1.1.3/gcc34-nptl-fix.patch b/app-office/openoffice/files/1.1.3/gcc34-nptl-fix.patch deleted file mode 100644 index 3e3360b2f422..000000000000 --- a/app-office/openoffice/files/1.1.3/gcc34-nptl-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./sal/osl/unx/process.c.orig 2003-07-02 15:34:17.000000000 +0200 -+++ ./sal/osl/unx/process.c 2004-11-01 15:16:40.976815960 +0100 -@@ -1017,11 +1017,6 @@ - for (i = 0; data.m_pszEnv[i] != NULL; i++) - putenv(data.m_pszEnv[i]); - --#if defined(LINUX) -- /* mfe: linux likes to have just one thread when the exec family is called */ -- /* this np function has this purpose ... */ -- pthread_kill_other_threads_np(); --#endif - OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); - - /* Connect std IO to pipe ends */ diff --git a/app-office/openoffice/files/1.1.3/gcc34.patch.bz2 b/app-office/openoffice/files/1.1.3/gcc34.patch.bz2 Binary files differdeleted file mode 100644 index 2c3a4e355949..000000000000 --- a/app-office/openoffice/files/1.1.3/gcc34.patch.bz2 +++ /dev/null diff --git a/app-office/openoffice/files/1.1.3/newstlportfix2.patch b/app-office/openoffice/files/1.1.3/newstlportfix2.patch deleted file mode 100644 index f88927669a7b..000000000000 --- a/app-office/openoffice/files/1.1.3/newstlportfix2.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- stlport/makefile.mk.orig 2004-01-28 11:52:04.000000000 +0100 -+++ stlport/makefile.mk 2004-11-04 15:36:38.158427224 +0100 -@@ -72,11 +72,12 @@ - # --- Files -------------------------------------------------------- - .EXPORT : CC CXX - .IF "$(COMID)"=="gcc3" -- TARFILE_NAME=STLport-4.5 - .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103" -+ TARFILE_NAME=STLport-4.5 - PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch - .ELSE -- PATCH_FILE_NAME=STLport-4.5.patch -+ TARFILE_NAME=STLport-4.6.2 -+ PATCH_FILE_NAME=STLport-4.6.2.patch - .ENDIF - .ELSE # "$(COMID)"=="gcc3" - .IF "$(OS)"=="MACOSX" -@@ -127,7 +128,7 @@ - .ELIF "$(OS)"=="MACOSX" - BUILD_FLAGS=-f gcc-3.0-macosx.mak - .ELSE -- BUILD_FLAGS=-f gcc-3.0.mak -+ BUILD_FLAGS=-f gcc.mak - .ENDIF - .ELSE # "$(COMID)"=="gcc3" - # MacOS X/Darwin need a special makefile ---- /dev/null 2004-10-28 17:21:08.585283768 +0200 -+++ stlport/STLport-4.6.2.patch 2004-11-04 21:27:55.986110360 +0100 -@@ -0,0 +1,71 @@ -+--- misc/build/STLport-4.6.2/src/num_get_float.cpp 2003-11-02 09:58:50.000000000 +0100 -++++ misc/build/STLport-4.6.2/src/num_get_float.cpp 2004-11-04 15:26:12.605525720 +0100 -+@@ -770,18 +770,18 @@ -+ -+ void _STLP_CALL -+ __string_to_float(const string& v, float& val) { -+- val = _Stl_string_to_double(v.data()); -++ val = _Stl_string_to_double(v.c_str()); -+ } -+ -+ void _STLP_CALL -+ __string_to_float(const string& v, double& val) { -+- val = _Stl_string_to_double(v.data()); -++ val = _Stl_string_to_double(v.c_str()); -+ } -+ -+ #ifndef _STLP_NO_LONG_DOUBLE -+ void _STLP_CALL -+ __string_to_float(const string& v, long double& val) { -+- val = _Stl_string_to_long_double(v.data()); -++ val = _Stl_string_to_long_double(v.c_str()); -+ } -+ #endif -+ -+--- misc/build/STLport-4.6.2/stlport/config/stl_gcc.h 2003-11-02 09:59:11.000000000 +0100 -++++ misc/build/STLport-4.6.2/stlport/config/stl_gcc.h 2004-11-04 15:26:12.342565696 +0100 -+@@ -7,7 +7,9 @@ -+ # define _STLP_USE_GLIBC -+ #endif -+ -++#if (__GNUC__ >= 3) && (__GNUC_MAJOR__ >= 4) -+ # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD -++#endif -+ -+ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) ) -+ # define _STLP_NO_WCHAR_T -+@@ -263,7 +265,7 @@ -+ -+ # if (__GNUC__ >= 3) -+ -+-# if ((__GNUC_MINOR__ == 0) || (__APPLE__)) -++# if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__)) -+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 -+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward -+ # else -+--- misc/build/STLport-4.6.2/stlport/stdexcept 2003-11-02 09:59:01.000000000 +0100 -++++ misc/build/STLport-4.6.2/stlport/stdexcept 2004-11-04 15:26:12.474545632 +0100 -+@@ -60,6 +60,11 @@ -+ # endif -+ # define _STLP_EXCEPTION_BASE exception -+ -++#if (__GNUC__ >= 3) -++#undef _STLP_NOTHROW_INHERENTLY -++#define _STLP_NOTHROW_INHERENTLY throw() -++#endif -++ -+ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { -+ public: -+ __Named_exception(const string& __str) -+--- misc/build/STLport-4.6.2/src/common_rules.mak 2004-11-04 21:25:58.322997872 +0100 -++++ misc/build/STLport-4.6.2/src/common_rules.mak 2004-11-04 21:26:15.731351400 +0100 -+@@ -84,7 +84,8 @@ -+ $(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) -+ $(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) -+ ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT) -+- -ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) -++# not needed ? -++# -ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) -+ ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) -+ -+ install_unix : diff --git a/app-office/openoffice/files/digest-openoffice-1.1.3-r1 b/app-office/openoffice/files/digest-openoffice-1.1.3-r1 deleted file mode 100644 index 2dfccc7d9b29..000000000000 --- a/app-office/openoffice/files/digest-openoffice-1.1.3-r1 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 9df288bb534964d4b96efdf7bf029456 OOo_1.1.3-1_source.tar.gz 215360913 -MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958 -MD5 072736926e5c04aba26b2fedaaf413fb LINUXGCCPinc.zip 4145981 -MD5 6cfa9ea26afd1effaee4497a7c82ef89 LINUXGCCPlib.zip 496451 -MD5 e77e91543d95353f742942af8f8d01b3 LINUXGCCPruntime.zip 2533976 |