From b0bdc9e3950e7e1e4cd0b1e6601da7744ecccf08 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Tue, 22 Oct 2002 23:20:14 +0000 Subject: Add merged patches which conflicted. --- .../files/patch-berkeleydb+db-3.2.9.patch | 80 +++++++++------------- .../files/patch-bridges+prj+build.lst | 18 ++--- ...h-connectivity+source+drivers+mozab+makefile.mk | 20 +++--- .../files/patch-cosv+source+strings+streamstr.cxx | 8 +-- .../patch-dtrans+source+X11+X11_selection.cxx | 8 +-- .../files/patch-freetype+makefile.mk | 37 ++++------ .../files/patch-product+inc+scp+udk_basefiles.scp | 8 +-- .../files/patch-product+util+makefile.mk | 36 ++++++---- .../patch-sfx2+source+appl+officeacceptthread.cxx | 21 ++---- .../files/patch-stlport+makefile.mk | 25 +++---- ...unix+office+gnome-vfs-filetype-registration.cxx | 13 ++-- .../files/patch-unzip+source+file_io.c | 22 ++++-- .../files/patch-unzip+source+misc.c | 18 ++--- 13 files changed, 148 insertions(+), 166 deletions(-) (limited to 'editors/openoffice.org-2.0-devel') diff --git a/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch index 97fec46bcef4..5039502f793d 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch +++ b/editors/openoffice.org-2.0-devel/files/patch-berkeleydb+db-3.2.9.patch @@ -1,64 +1,50 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002 -+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002 -@@ -47,17 +47,27 @@ - --- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002 - *************** - *** 1795,1800 **** ----- 1795,1802 ---- -+--- 1795,1803 ---- - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - + irix*) JINCSUBDIRS="irix";; - + netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +--- ../berkeleydb/db-3.2.9.patch.orig Fri Oct 18 22:02:26 2002 ++++ ../berkeleydb/db-3.2.9.patch Fri Oct 18 22:05:40 2002 +@@ -1,3 +1,13 @@ ++--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig Fri Oct 18 21:46:44 2002 +++++ build/unxsols3.pro/db-3.2.9/dist/configure Fri Oct 18 21:48:47 2002 ++@@ -1795,6 +1795,7 @@ ++ case "$host_os" in ++ solaris*) JINCSUBDIRS="solaris";; ++ linux*) JINCSUBDIRS="linux genunix";; ++ freebsd*) JINCSUBDIRS="freebsd genunix";; - *) JINCSUBDIRS="genunix";; - esac ++ *) JINCSUBDIRS="genunix";; ++ esac ++ + *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 19:28:22 2001 + --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Mon Jun 11 15:50:55 2001 + *************** +@@ -43,3 +53,51 @@ - --- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001 - +++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001 -+@@ -984,7 +984,7 @@ -+ optimize_def="-O2" -+ LIBS="-lipc $LIBS";; -+ bsdi*) optimize_def="-O2";; -+-freebsd*) optimize_def="-O2" -++freebsd*) optimize_def="-O" -+ CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" -+ LIBS="-pthread";; -+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - @@ -995,6 +995,7 @@ - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" -@@ -68,13 +78,22 @@ - #define HAVE_QNX 1 - --- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 - +++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 --@@ -1194,11 +1194,12 @@ + CC= @MAKEFILE_CC@ + CCLINK= @MAKEFILE_CCLINK@ ++--- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 +++++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 +@@ -1194,11 +1194,23 @@ - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then --- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' ++ # can we support soname and/or expsyms with a.out? -oliva ++ else + archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - else ++- else ++ need_version=no ++ fi ++ ;; ++ ++ freebsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - + else -@@ -84,3 +103,24 @@ - fi - ;; - ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' ++ # can we support soname and/or expsyms with a.out? -oliva +++ else +++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +++ need_version=no ++ fi ++ ;; ++ +@@ -2019,6 +2031,20 @@ + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' + soname_spec='${libname}${release}.so$major' diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-bridges+prj+build.lst index cd979b062a34..fee3d847c5e6 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-bridges+prj+build.lst +++ b/editors/openoffice.org-2.0-devel/files/patch-bridges+prj+build.lst @@ -1,11 +1,11 @@ ---- ../bridges/prj/build.lst.orig Tue Mar 19 22:06:50 2002 -+++ ../bridges/prj/build.lst Tue Jun 4 12:24:46 2002 -@@ -9,6 +9,8 @@ - br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL - br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL - br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL +--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001 ++++ ../bridges/prj/build.lst Fri Oct 18 22:13:04 2002 +@@ -13,5 +13,8 @@ + br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL + br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL + br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL ++br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL +br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL +br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL - br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL - br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL - br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL + br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL + br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL diff --git a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk index f422040f99d4..f99a49c36067 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk @@ -1,12 +1,12 @@ ---- ../connectivity/source/drivers/mozab/makefile.mk.orig Wed Jun 12 01:37:30 2002 -+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Jun 12 01:37:47 2002 -@@ -107,9 +107,7 @@ +--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Aug 19 19:23:47 2002 ++++ ../connectivity/source/drivers/mozab/makefile.mk Wed Oct 16 00:01:36 2002 +@@ -167,7 +167,9 @@ + # --- MOZAB BASE Library ----------------------------------- - SHL1VERSIONMAP= $(TARGET).map --.IF "$(OS)"!="FREEBSD" - SHL1TARGET= $(TARGET)$(MOZAB_MAJOR) --.ENDIF - SHL1OBJS=$(SLOFILES) - SHL1STDLIBS=\ - $(CPPULIB) \ ++.IF "$(OS)"!="FREEBSD" + SHL2VERSIONMAP= $(TARGET2).map ++.ENDIF + SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR) + SHL2OBJS=$(SLO2FILES) + SHL2STDLIBS=\ diff --git a/editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx index 8abdf74d97b8..5bdb940ec43b 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx +++ b/editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -1,11 +1,11 @@ ---- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 -+++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +--- ../cosv/source/strings/streamstr.cxx.orig Tue Aug 13 14:29:52 2002 ++++ ../cosv/source/strings/streamstr.cxx Fri Oct 18 20:20:41 2002 @@ -65,7 +65,7 @@ // NOT FULLY DECLARED SERVICES #include #include --#if defined(WNT) || defined(LINUX) -+#if defined(WNT) || defined(LINUX) || defined(FREEBSD) +-#if defined(WNT) || defined(LINUX) || defined(MACOSX) ++#if defined(WNT) || defined(LINUX) || defined(MACOSX) || defined(FREEBSD) #include #else #include diff --git a/editors/openoffice.org-2.0-devel/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice.org-2.0-devel/files/patch-dtrans+source+X11+X11_selection.cxx index 5e02222798cc..77df99f679ab 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-dtrans+source+X11+X11_selection.cxx +++ b/editors/openoffice.org-2.0-devel/files/patch-dtrans+source+X11+X11_selection.cxx @@ -1,10 +1,10 @@ ---- ../dtrans/source/X11/X11_selection.cxx.orig Sat Jul 20 23:18:03 2002 -+++ ../dtrans/source/X11/X11_selection.cxx Sat Jul 20 23:18:05 2002 -@@ -65,7 +65,7 @@ +--- ../dtrans/source/X11/X11_selection.cxx.orig Wed Jul 31 22:43:56 2002 ++++ ../dtrans/source/X11/X11_selection.cxx Fri Oct 18 20:16:37 2002 +@@ -66,7 +66,7 @@ #include #include #include --#if defined(LINUX) || defined(NETBSD) +-#ifdef LINUX +#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) #include #else diff --git a/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk index 9c238f45b04d..9cf22888eb25 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk @@ -1,24 +1,15 @@ ---- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002 -+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002 -@@ -79,7 +79,11 @@ - #relative to CONFIGURE_DIR - CONFIGURE_ACTION=$(GNUMAKE) - .IF "$(GUI)"=="UNX" --CONFIGURE_FLAGS=setup -+.IF "$(debug)"=="" -+CONFIGURE_FLAGS=setup CFLAGS="-O" -+.ELSE # "$(debug)"=="" -+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb" -+.ENDIF # "$(debug)"=="" - .ELSE # "$(GUI)"=="UNX" - CONFIGURE_FLAGS=setup visualc - .ENDIF # "$(GUI)"=="UNX" -@@ -90,7 +94,7 @@ - .IF "$(GUI)"=="UNX" - OUT2LIB= \ - objs$/.libs$/libfreetype.a \ -- objs$/.libs$/libfreetype.so.6* -+ objs$/.libs$/libfreetype.so.7 - - .ENDIF # "$(GUI)"=="UNX" +--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 ++++ ../freetype/makefile.mk Fri Oct 18 20:06:42 2002 +@@ -95,9 +95,11 @@ + objs$/.libs$/libfreetype.a + .IF "$(OS)"=="MACOSX" + OUT2LIB+=objs$/.libs$/libfreetype.*.dylib ++.ELIF "$(OS)"=="FREEBSD" ++OUT2LIB+=objs$/.libs$/libfreetype.so.7* + .ELSE + OUT2LIB+=objs$/.libs$/libfreetype.so.6* +-.ENDIF # "$(OS)"=="MACOSX" ++.ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" + .ELSE # "$(GUI)"=="UNX" + .IF "$(USE_SHELL)"=="4nt" diff --git a/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp index 7b55cc064156..693a57bb041e 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -6,13 +6,13 @@ // (setup is linked against it). +#if ( defined ( LINUX )) #if ( defined( _gcc3 ) && defined( C300 ) ) - File gid_File_Lib_gcc -@@ -42,6 +43,7 @@ - Name = STRING(libstdc++.so.3); + BIN_FILE_BODY; +@@ -31,6 +32,7 @@ Styles = (NETWORK,RELATIVE); End + +#endif #endif - #endif + File gid_File_Lib_Sal diff --git a/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk index e52b0a4ea6ef..cb6f306e19b1 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk @@ -1,6 +1,6 @@ ---- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 -+++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 -@@ -137,13 +137,6 @@ +--- ../product/util/makefile.mk.orig Wed Oct 2 21:24:25 2002 ++++ ../product/util/makefile.mk Mon Oct 21 14:26:10 2002 +@@ -131,13 +131,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -8,27 +8,37 @@ -ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.3 \ -- $(DESTDIRDLL)$/libstdc++.so.3.0.1 +- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ +- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) -.ENDIF .ELIF "$(OS)"=="NETBSD" ########### @@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 + # special targets for linux gcc3 + .IF "$(COMID)"=="gcc3" ++.IF "$(OS)"!="FREEBSD" -+.IF "$(OS)"=="LINUX" - .IF "$(CCNUMVER)">="000300010000" + $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : + $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) +@@ -511,7 +505,9 @@ + -rm -f $@ + +ln -s libstdc++.so.$(LIBSTDCPP3) $@ + .ENDIF ++.ENDIF + ++.IF "$(OS)"!="FREEBSD" + $(DLLOUT)$/libgcc_s.so.1 : + $(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT) + +@@ -521,7 +517,8 @@ - $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ - +ln -s libgcc_s.so.1 $@ -+ +- +ln -s libgcc_s.so.1 $@ ++ +ln -fs libgcc_s.so.1 $@ +.ENDIF -+ #------------------------------------------------------------- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice.org-2.0-devel/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice.org-2.0-devel/files/patch-sfx2+source+appl+officeacceptthread.cxx index a33491e0d8b2..154fcd10850b 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-sfx2+source+appl+officeacceptthread.cxx +++ b/editors/openoffice.org-2.0-devel/files/patch-sfx2+source+appl+officeacceptthread.cxx @@ -1,18 +1,11 @@ ---- ../sfx2/source/appl/officeacceptthread.cxx.orig Sat Jul 20 22:56:19 2002 -+++ ../sfx2/source/appl/officeacceptthread.cxx Sat Jul 20 22:56:54 2002 -@@ -123,13 +123,13 @@ - sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo ) - { - int nRet; --#if defined (SOLARIS) || defined (IRIX) -+#if defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) +--- ../sfx2/source/appl/officeacceptthread.cxx.orig Thu Oct 11 15:39:58 2001 ++++ ../sfx2/source/appl/officeacceptthread.cxx Fri Oct 18 23:35:14 2002 +@@ -126,7 +126,7 @@ + #if defined (SOLARIS) int status; nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); - #elif defined(LINUX) +-#elif defined(LINUX) ++#elif defined(LINUX) || defined (FREEBSD) nRet = kill(aProcessInfo.Ident, 0); #endif --#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) -+#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) - if ( nRet == 0 ) - return sal_True; // process is running - if ( nRet < 0 ) + #if defined (UNX) diff --git a/editors/openoffice.org-2.0-devel/files/patch-stlport+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-stlport+makefile.mk index c55d863b689f..0cbbfcaf00a7 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-stlport+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-stlport+makefile.mk @@ -1,32 +1,29 @@ ---- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002 -+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002 -@@ -106,11 +106,29 @@ +--- ../stlport/makefile.mk.orig Tue Aug 27 19:26:10 2002 ++++ ../stlport/makefile.mk Fri Oct 18 22:33:22 2002 +@@ -107,16 +107,26 @@ .IF "$(COM)"=="GCC" .IF "$(COMID)"=="gcc3" -+ +.IF "$(OS)"=="FREEBSD" +BUILD_FLAGS=-f gcc-3.0-freebsd.mak +.ELSE BUILD_FLAGS=-f gcc-3.0.mak +.ENDIF -+ .ELSE # "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-freebsd.mak -+.ELSE - BUILD_FLAGS=-f gcc.mak -+.ENDIF -+ + # MacOS X/Darwin need a special makefile + .IF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-apple-macosx.mak ++.ELIF "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-freebsd.mak + .ELSE # "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc.mak + .ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(COMID)"=="gcc3" -+ +.IF "$(OS)"=="FREEBSD" +BUILD_ACTION=gmake +.ELSE BUILD_ACTION=make +.ENDIF -+ .ENDIF .IF "$(COM)"=="C52" diff --git a/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx index ce51a0e98880..6dc462a10d24 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice.org-2.0-devel/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed May 1 23:45:49 2002 -+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 23:48:17 2002 -@@ -62,7 +62,9 @@ +--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Aug 28 14:10:06 2002 ++++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Fri Oct 18 22:45:43 2002 +@@ -62,7 +62,7 @@ #include #include #include -+#if !(defined NETBSD || defined FREEBSD) +-#ifndef MACOSX ++#if !(defined NETBSD || defined FREEBSD || defined MACOSX) #include -+#endif + #endif #include - - /* diff --git a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c index 2a838fe377b1..2f85a108c185 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c @@ -1,11 +1,21 @@ ---- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 -@@ -864,7 +864,7 @@ - #ifndef __386BSD__ +--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002 ++++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -865,7 +865,9 @@ static struct timeb tbp; #endif /* !__386BSD__ */ --#elif !defined(NETBSD) /* !BSD */ -+#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ + #else /* !BSD */ ++#if (!defined(NETBSD) && !defined(FREEBSD)) extern long timezone; ++#endif /* !defined(NETBSD) && !defined(FREEBSD) */ #endif /* ?BSD */ #endif /* ?AMIGA */ + diff --git a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c index 649a976f4c4d..3da53f865c0b 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c @@ -1,15 +1,11 @@ ---- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 -+++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 -@@ -300,9 +300,9 @@ +--- ../unzip/source/misc.c.orig Wed May 2 03:13:26 2001 ++++ ../unzip/source/misc.c Fri Oct 18 23:37:13 2002 +@@ -300,7 +300,7 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; --#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) --#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) --#if !defined __386BSD__ && !defined FREEBSD -+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) -+#if (defined(BSD) || defined(MTS) -+#if !defined __386BSD__ +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ -- cgit v1.2.3