diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2004-04-09 08:47:39 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2004-04-09 08:47:39 +0000 |
| commit | 7ead418e9b515590dda33e738e0f5e34b36a712b (patch) | |
| tree | ebb7c61ab03ff66cc6ab680179742f59fcd134b6 /editors/openoffice-1.1-devel/files | |
| parent | Move autogen from post-patch to pre-configure to fix dependency problems (diff) | |
update to 1.1.2RC (checkout cws_srx645_ooo112fix1, 2004/04/08 9pm JST)
please see the release note
http://download.openoffice.org/1.1.2rc/release_notes_1.1.2rc.html
removed patches:
a) patch-solenv+inc+unxfbsdi.mk
http://www.openoffice.org/issues/show_bug.cgi?id=25500
b) patch-sw+source+filter+ww8+ww8scan.cxx
http://www.openoffice.org/issues/show_bug.cgi?id=23856
http://www.openoffice.org/issues/show_bug.cgi?id=24123
but actually fixed somewhere I cannot find
added patch:
c) patch-setup2+wrapper+install.sh
http://www.openoffice.org/issues/show_bug.cgi?id=27638
Note: simple test was done for FreeBSD 5.2.1-RELEASE
Notes
Notes:
svn path=/head/; revision=106558
Diffstat (limited to 'editors/openoffice-1.1-devel/files')
3 files changed, 13 insertions, 27 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+wrapper+install.sh b/editors/openoffice-1.1-devel/files/patch-setup2+wrapper+install.sh new file mode 100644 index 000000000000..0ab0e49caeca --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-setup2+wrapper+install.sh @@ -0,0 +1,13 @@ +--- ../setup2/wrapper/install.sh.org Fri Apr 9 17:29:34 2004 ++++ ../setup2/wrapper/install.sh Sat Jan 10 03:53:17 2004 +@@ -4,8 +4,8 @@ + cd `dirname $0` + + # Set the Defaults Here +-oo_version="OpenOffice.org 1.1.1" +-oo_home=OpenOffice.org1.1.1 ++oo_version="OpenOffice.org 1.1.2" ++oo_home=OpenOffice.org1.1.2 + oo_default_prefix=/usr/local + oo_default_netflg=-net + oo_default_interact=no diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index dd0dbb067109..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Sat Jan 10 03:59:13 2004 -+++ ../solenv/inc/unxfbsdi.mk Fri Mar 12 21:39:05 2004 -@@ -211,7 +211,7 @@ - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - - # STLport always needs pthread. --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS) -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS) - LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) - - # name of library manager diff --git a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx deleted file mode 100644 index fad83b3f2be0..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx +++ /dev/null @@ -1,16 +0,0 @@ ---- ../sw/source/filter/ww8/ww8scan.cxx.orig 2003-12-17 19:32:50.000000000 +0100 -+++ ../sw/source/filter/ww8/ww8scan.cxx 2004-01-06 06:29:48.000000000 +0100 -@@ -198,8 +198,13 @@ - ++pIter; - } - if (bBroken) -+#if defined( UNX ) && !defined( DBG_UTIL ) -+ DBG_ERROR(rtl::OUStringToOString(sError, RTL_TEXTENCODING_ASCII_US)); -+#else - DbgError(rtl::OUStringToOString(sError, RTL_TEXTENCODING_ASCII_US)); - #endif -+ -+#endif - } - - //Find an entry, return its address if found and 0 if not |