diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-01-30 08:43:39 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-01-30 08:43:39 +0000 |
| commit | 22d819dac5cdd83833efa79a5ec26a88054251d3 (patch) | |
| tree | 1b2694ed0bab5024ebdd09ab7d6578a533c24a06 /editors/openoffice.org-2.0/files | |
| parent | Unbreak for FreeBSD >=5.x (diff) | |
Update to 1.9m74s1
Notes
Notes:
svn path=/head/; revision=127688
Diffstat (limited to 'editors/openoffice.org-2.0/files')
2 files changed, 16 insertions, 42 deletions
diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in index ff953c9a2cc7..a1aeeef73064 100644 --- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2.0/files/patch-config_office+configure.in @@ -1,44 +1,18 @@ -#iZ and CWS data -o http://www.openoffice.org/issues/show_bug.cgi?id=40176 - http://www.openoffice.org/issues/show_bug.cgi?id=40226 -o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4 -o configure4 - -Description -o Correct PTHREAD_CFLAGS, PTHREAD_LIBS -o CUPS support via --enable-cups - +o http://www.openoffice.org/issues/show_bug.cgi?id=41516 +o configuretypofix Index: config_office/configure.in =================================================================== RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.82 -diff -u -r1.82 configure.in ---- config_office/configure.in 5 Jan 2005 12:09:48 -0000 1.82 -+++ config_office/configure.in 9 Jan 2005 10:36:08 -0000 -@@ -449,7 +449,7 @@ - test_x=yes - test_gtk=yes - test_kde=yes -- test_cups=no -+ test_cups=yes - AC_MSG_CHECKING([the FreeBSD operating system release]) - if test -n "$with_os_version"; then - OSVERSION="$with_os_version" -@@ -457,13 +457,15 @@ - OSVERSION=`/sbin/sysctl -n kern.osreldate` - fi - AC_MSG_RESULT([found OSVERSION=$OSVERSION]) -- PTHREAD_CFLAGS="-D_THREAD_SAFE" - if test "$OSVERSION" -lt "500016"; then -+ PTHREAD_CFLAGS="-D_THREAD_SAFE" - PTHREAD_LIBS="-pthread" - elif test "$OSVERSION" -lt "502102"; then -+ PTHREAD_CFLAGS="-D_THREAD_SAFE" - PTHREAD_LIBS="-lc_r" - else -- PTHREAD_LIBS="-lpthread" -+ PTHREAD_CFLAGS="" -+ PTHREAD_LIBS="-pthread" - fi - ;; - "OSF1") +retrieving revision 1.87 +diff -u -r1.87 configure.in +--- config_office/configure.in 25 Jan 2005 16:54:53 -0000 1.87 ++++ config_office/configure.in 28 Jan 2005 09:26:37 -0000 +@@ -2408,7 +2408,7 @@ + fi + + AC_MSG_CHECKING([whether $GNUPATCH is GNU patch]) +- if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then ++ if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it]) diff --git a/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl index 4385f524d262..f77e24a3a1bf 100644 --- a/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl @@ -1,6 +1,6 @@ IZ and CWS o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS (not yet) +o CWS sdksample offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl contains an illigal char |