From f3bad9da867a05a004c263a1706c3757ced1ddb5 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Wed, 1 May 2002 21:09:48 +0000 Subject: Upgrade to 1.0.0 Builds ok, but is still broken --- ...atch-cpputools+source+registercomponent+makefile.mk | 10 ++++++++++ ...patch-psprint+source+printer+printerinfomanager.cxx | 11 +++++++++++ .../files/patch-setup2+script+setupserver | 11 +++++------ ...ch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh | 9 ++++----- .../files/patch-unzip+source+file_io.c | 13 ++++++------- .../files/patch-unzip+source+misc.c | 18 ++++++++---------- 6 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 editors/openoffice.org-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk create mode 100644 editors/openoffice.org-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx (limited to 'editors/openoffice.org-2.0-devel') diff --git a/editors/openoffice.org-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac 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 ec06265f3b01..2a838fe377b1 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,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../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__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #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 26400cd2c1c4..8087b0887af4 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,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 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__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ -- cgit v1.2.3