mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00
Code Issues Releases Activity

Update to 3.1.0.

Browse Source 
Funded by OpenOffice.org community
This commit is contained in:
Maho Nakata 2009-05-16 06:23:58 +00:00
parent 37376ef091
commit 184f8b1f5a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=233977
20 changed files with 86 additions and 3678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/openoffice-3/Makefile
View File

@ -31,7 +31,7 @@ DISTFILES+= ${CWSARCHIVE}:cws
.endif
CWSARCHIVE= ${WITH_CWS}.tar.gz
OOOVERSION= 3.0.1
OOOVERSION= 3.1.0
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
@ -72,8 +72,8 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
MILESTONE?= 15
OOOTAG?= OOO300_m${MILESTONE}
MILESTONE?= 11
OOOTAG?= OOO310_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
@ -132,7 +132,6 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
USE_BISON= build
GNU_CONFIGURE= yes
WRKSRC?= ${WRKDIR}/${OOOTAG}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
MAXPROCESSES?= 1
@ -176,7 +175,13 @@ pre-everything::
@${TOUCH} ${BUILD_COOKIE}
.endif
#issue XXXXXX not raised yet...
CRLFFILES=curl/curl*patch neon/neon*patch
post-extract:
for i in ${CRLFFILES}; do \
cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's# ##g' $$i ; \
done
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_CWS)
cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
@ -189,6 +194,7 @@ post-extract:
.if !defined(WITHOUT_MOZILLA)
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
pre-configure:
#Workaround for gperf. #i85469#
@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf

6
editors/openoffice-3/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 97923bc2f9d98ffec7863f1170ef4291
SHA256 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = dcd6ca79fe264608a4d3089a7de06eaa57bd897f7071a546e40ac2b5ab951dce
SIZE (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 335188535
MD5 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 7f8a9dd05f2bb8449447cca02a54891b
SHA256 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 77a5c868b3dcfdfd4439727b491f6724d86fee318ae706e287bfb4159203dd55
SIZE (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 407464693
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144

10
editors/openoffice-3/files/Makefile.knobs
View File

@ -23,10 +23,10 @@ CONFIGURE_ARGS+= --disable-mozilla
CONFIGURE_ARGS+= --enable-build-mozilla
.endif
.if defined(WITHOUT_GNOMEVFS)
CONFIGURE_ARGS+= --disable-gnome-vfs
.if defined(WITHOUT_GNOME)
CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs
.else
USE_GNOME+= gnomevfs2
USE_GNOME+= gconf2 gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
@ -69,10 +69,10 @@ pre-fetch:
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
.if !defined(WITHOUT_GNOMEVFS)
.if !defined(WITHOUT_GNOME)
@${ECHO}
@${ECHO} "You can compile OOo without gnome VFS support with"
@${ECHO} "make -DWITHOUT_GNOMEVFS"
@${ECHO} "make -DWITHOUT_GNOME"
.endif
.if !defined(WITH_SYSTEM_ICU)
@${ECHO}

11
editors/openoffice-3/files/patch-i101333 Normal file
View File

@ -0,0 +1,11 @@
--- openssl/makefile.mk~ 2009-04-25 09:42:18.000000000 +0900
+++ openssl/makefile.mk 2009-04-25 13:00:45.000000000 +0900
@@ -65,7 +65,7 @@
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILE_NAME=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8k.map \

43
editors/openoffice-3/files/patch-i84586
View File

@ -1,43 +0,0 @@
? sc/unxfbsdi.pro
Index: sc/source/ui/vba/vbaaxis.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
retrieving revision 1.2
diff -u -r1.2 vbaaxis.cxx
--- sc/source/ui/vba/vbaaxis.cxx 7 Dec 2007 10:43:48 -0000 1.2
+++ sc/source/ui/vba/vbaaxis.cxx 14 Dec 2007 23:40:31 -0000
@@ -47,8 +47,8 @@
const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
ScVbaChart*
ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
@@ -142,12 +142,12 @@
bCrossesAreCustomized = sal_False;
return;
case xlAxisCrossesMinimum: // The axis crosses at the minimum value.
- mxPropertySet->getPropertyValue(MIN) >>= fNum;
+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
setCrossesAt( fNum );
bCrossesAreCustomized = sal_False;
break;
case xlAxisCrossesMaximum: // The axis crosses at the maximum value.
- mxPropertySet->getPropertyValue(MAX) >>= fNum;
+ mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
setCrossesAt(fNum);
bCrossesAreCustomized = sal_False;
break;
@@ -182,7 +182,7 @@
mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
//obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
double fmin = 0.0;
- mxPropertySet->getPropertyValue(MIN) >>= fmin;
+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
if (forigin == fmin)
nCrosses = xlAxisCrossesMinimum;
else

1659
editors/openoffice-3/files/patch-i85127
View File

File diff suppressed because it is too large Load Diff

16
editors/openoffice-3/files/patch-i85972
View File

@ -31,23 +31,19 @@ diff -u -r1.4 lp_solve_5.5.patch
++fi
++
++rm *.o 2>/dev/null
Index: lpsolve/makefile.mk
===================================================================
RCS file: /cvs/external/lpsolve/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- lpsolve/makefile.mk 11 Apr 2008 07:18:41 -0000 1.5
+++ lpsolve/makefile.mk 3 Jul 2008 00:20:53 -0000
--- lpsolve/makefile.mk.orig 2008-12-24 09:40:11.000000000 +0900
+++ lpsolve/makefile.mk 2008-12-24 12:09:06.000000000 +0900
@@ -46,7 +46,7 @@
PATCH_FILE_NAME=lp_solve_5.5-windows.patch
.ELSE
PATCH_FILE_NAME=lp_solve_5.5.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
.ENDIF
CONFIGURE_DIR=
@@ -70,11 +70,16 @@
@@ -73,11 +73,16 @@
.IF "$(COMNAME)"=="sunpro5"
BUILD_ACTION=sh ccc.solaris
.ELSE

14
editors/openoffice-3/files/patch-i87583
View File

@ -1,17 +1,3 @@
--- configmgr/source/cmdtools/setofficelang.sh.orig 2008-06-09 08:42:48.000000000 -0400
+++ configmgr/source/cmdtools/setofficelang.sh 2008-06-27 15:47:37.000000000 -0400
@@ -75,6 +75,11 @@
export DYLD_LIBRARY_PATH
;;
+ FreeBSD)
+ LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ export LD_LIBRARY_PATH
+ ;;
+
HP-UX)
SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
export SHLIB_PATH
--- desktop/scripts/soffice.sh.orig 2008-06-09 08:57:10.000000000 -0400
+++ desktop/scripts/soffice.sh 2008-06-27 16:12:58.000000000 -0400
@@ -75,6 +75,15 @@

21
editors/openoffice-3/files/patch-i91318
View File

@ -1,16 +1,11 @@
Index: hunspell/hunspell-1.1.12.patch
===================================================================
RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
retrieving revision 1.12
diff -u -r1.12 hunspell-1.1.12.patch
--- hunspell/hunspell-1.1.12.patch 2 Jul 2008 09:46:59 -0000 1.12
+++ hunspell/hunspell-1.1.12.patch 10 Aug 2008 01:02:29 -0000
@@ -487,3 +487,11 @@
i68568utf.test \
1706659.test \
digits_in_words.test \
+--- misc/hunspell-1.1.12/tests/test.sh 2007-07-15 22:33:13.000000000 +0900
++++ misc/build/hunspell-1.1.12/tests/test.sh 2008-08-10 10:00:33.000000000 +0900
--- hunspell/hunspell-1.2.8.patch~ 2009-02-21 08:52:35.000000000 +0900
+++ hunspell/hunspell-1.2.8.patch 2009-03-05 09:30:33.000000000 +0900
@@ -619,3 +619,11 @@
p++;
}
if (i > 0 && buf[i - 1] == '\n') {
+--- misc/hunspell-1.2.8/tests/test.sh 2007-07-15 22:33:13.000000000 +0900
++++ misc/build/hunspell-1.2.8/tests/test.sh 2008-08-10 10:00:33.000000000 +0900
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash

88
editors/openoffice-3/files/patch-i93235
View File

@ -1,88 +0,0 @@
Add support for Diablo JDK 1.6.0 and above.
--- /dev/null 2008-08-27 17:05:37.000000000 -0400
+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 2008-08-27 17:20:55.000000000 -0400
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <updated>2008-08-27</updated>
+
+ <vendorInfos>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.3.1</minVersion>
+ </vendor>
+ <vendor name="The FreeBSD Foundation">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="IBM Corporation">
+ <minVersion>1.3.1</minVersion>
+ <maxVersion>1.4.2</maxVersion>
+ </vendor>
+ <vendor name="Blackdown Java-Linux Team">
+ <minVersion>1.3.1</minVersion>
+ </vendor>
+ <vendor name="Free Software Foundation, Inc.">
+ <minVersion>1.4.2</minVersion>
+ </vendor>
+ <vendor name="BEA Systems, Inc.">
+ <minVersion>1.4.1</minVersion>
+ </vendor>
+ </vendorInfos>
+
+ <plugins>
+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ </plugins>
+</javaSelection>
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig 2008-04-11 06:16:59.000000000 -0400
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk 2008-08-27 17:09:45.000000000 -0400
@@ -43,9 +43,11 @@
.IF "$(SOLAR_JAVA)"!=""
$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="FREEBSD"
+ -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
+.ELIF "$(OS)"=="MACOSX"
-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+.ELIF "$(OS)"=="LINUX"
-$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
.ELSE
-$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig 2008-04-11 06:19:31.000000000 -0400
+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2008-08-27 17:19:35.000000000 -0400
@@ -128,13 +128,15 @@
rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
+ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
|| sVendor2.equals(pInfo->sVendor) == sal_True
|| sVendor3.equals(pInfo->sVendor) == sal_True
|| sVendor4.equals(pInfo->sVendor) == sal_True
|| sVendor5.equals(pInfo->sVendor) == sal_True
|| sVendor6.equals(pInfo->sVendor) == sal_True
- || sVendor7.equals(pInfo->sVendor) == sal_True))
+ || sVendor7.equals(pInfo->sVendor) == sal_True
+ || sVendor8.equals(pInfo->sVendor) == sal_True))
return 0;
rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
--- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx.orig 2008-04-11 06:24:39.000000000 -0400
+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 2008-08-27 17:13:00.000000000 -0400
@@ -56,6 +56,7 @@
VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
+ VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
END_VENDOR_MAP()

14
editors/openoffice.org-3/Makefile
View File

@ -31,7 +31,7 @@ DISTFILES+= ${CWSARCHIVE}:cws
.endif
CWSARCHIVE= ${WITH_CWS}.tar.gz
OOOVERSION= 3.0.1
OOOVERSION= 3.1.0
NO_LATEST_LINK= yes
USE_GNOME= desktopfileutils gtk20
MOZILLA_VERSION= 1.7.5
@ -72,8 +72,8 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set
FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
MILESTONE?= 15
OOOTAG?= OOO300_m${MILESTONE}
MILESTONE?= 11
OOOTAG?= OOO310_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
@ -132,7 +132,6 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
USE_BISON= build
GNU_CONFIGURE= yes
WRKSRC?= ${WRKDIR}/${OOOTAG}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
TCSH?= /bin/tcsh
PKGMESSAGE= ${WRKDIR}/pkg-message
MAXPROCESSES?= 1
@ -176,7 +175,13 @@ pre-everything::
@${TOUCH} ${BUILD_COOKIE}
.endif
#issue XXXXXX not raised yet...
CRLFFILES=curl/curl*patch neon/neon*patch
post-extract:
for i in ${CRLFFILES}; do \
cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's# ##g' $$i ; \
done
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_CWS)
cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
@ -189,6 +194,7 @@ post-extract:
.if !defined(WITHOUT_MOZILLA)
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
.endif
pre-configure:
#Workaround for gperf. #i85469#
@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf

6
editors/openoffice.org-3/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 97923bc2f9d98ffec7863f1170ef4291
SHA256 (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = dcd6ca79fe264608a4d3089a7de06eaa57bd897f7071a546e40ac2b5ab951dce
SIZE (openoffice.org3/OOo_OOO300_m15_source.tar.bz2) = 335188535
MD5 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 7f8a9dd05f2bb8449447cca02a54891b
SHA256 (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 77a5c868b3dcfdfd4439727b491f6724d86fee318ae706e287bfb4159203dd55
SIZE (openoffice.org3/OOo_OOO310_m11_source.tar.bz2) = 407464693
MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org3/unowinreg.dll) = 6144

10
editors/openoffice.org-3/files/Makefile.knobs
View File

@ -23,10 +23,10 @@ CONFIGURE_ARGS+= --disable-mozilla
CONFIGURE_ARGS+= --enable-build-mozilla
.endif
.if defined(WITHOUT_GNOMEVFS)
CONFIGURE_ARGS+= --disable-gnome-vfs
.if defined(WITHOUT_GNOME)
CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs
.else
USE_GNOME+= gnomevfs2
USE_GNOME+= gconf2 gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
@ -69,10 +69,10 @@ pre-fetch:
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
.if !defined(WITHOUT_GNOMEVFS)
.if !defined(WITHOUT_GNOME)
@${ECHO}
@${ECHO} "You can compile OOo without gnome VFS support with"
@${ECHO} "make -DWITHOUT_GNOMEVFS"
@${ECHO} "make -DWITHOUT_GNOME"
.endif
.if !defined(WITH_SYSTEM_ICU)
@${ECHO}

11
editors/openoffice.org-3/files/patch-i101333 Normal file
View File

@ -0,0 +1,11 @@
--- openssl/makefile.mk~ 2009-04-25 09:42:18.000000000 +0900
+++ openssl/makefile.mk 2009-04-25 13:00:45.000000000 +0900
@@ -65,7 +65,7 @@
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILE_NAME=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8k.map \

43
editors/openoffice.org-3/files/patch-i84586
View File

@ -1,43 +0,0 @@
? sc/unxfbsdi.pro
Index: sc/source/ui/vba/vbaaxis.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
retrieving revision 1.2
diff -u -r1.2 vbaaxis.cxx
--- sc/source/ui/vba/vbaaxis.cxx 7 Dec 2007 10:43:48 -0000 1.2
+++ sc/source/ui/vba/vbaaxis.cxx 14 Dec 2007 23:40:31 -0000
@@ -47,8 +47,8 @@
const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
ScVbaChart*
ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
@@ -142,12 +142,12 @@
bCrossesAreCustomized = sal_False;
return;
case xlAxisCrossesMinimum: // The axis crosses at the minimum value.
- mxPropertySet->getPropertyValue(MIN) >>= fNum;
+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
setCrossesAt( fNum );
bCrossesAreCustomized = sal_False;
break;
case xlAxisCrossesMaximum: // The axis crosses at the maximum value.
- mxPropertySet->getPropertyValue(MAX) >>= fNum;
+ mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
setCrossesAt(fNum);
bCrossesAreCustomized = sal_False;
break;
@@ -182,7 +182,7 @@
mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
//obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
double fmin = 0.0;
- mxPropertySet->getPropertyValue(MIN) >>= fmin;
+ mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
if (forigin == fmin)
nCrosses = xlAxisCrossesMinimum;
else

1659
editors/openoffice.org-3/files/patch-i85127
View File

File diff suppressed because it is too large Load Diff

16
editors/openoffice.org-3/files/patch-i85972
View File

@ -31,23 +31,19 @@ diff -u -r1.4 lp_solve_5.5.patch
++fi
++
++rm *.o 2>/dev/null
Index: lpsolve/makefile.mk
===================================================================
RCS file: /cvs/external/lpsolve/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- lpsolve/makefile.mk 11 Apr 2008 07:18:41 -0000 1.5
+++ lpsolve/makefile.mk 3 Jul 2008 00:20:53 -0000
--- lpsolve/makefile.mk.orig 2008-12-24 09:40:11.000000000 +0900
+++ lpsolve/makefile.mk 2008-12-24 12:09:06.000000000 +0900
@@ -46,7 +46,7 @@
PATCH_FILE_NAME=lp_solve_5.5-windows.patch
.ELSE
PATCH_FILE_NAME=lp_solve_5.5.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
.ENDIF
CONFIGURE_DIR=
@@ -70,11 +70,16 @@
@@ -73,11 +73,16 @@
.IF "$(COMNAME)"=="sunpro5"
BUILD_ACTION=sh ccc.solaris
.ELSE

14
editors/openoffice.org-3/files/patch-i87583
View File

@ -1,17 +1,3 @@
--- configmgr/source/cmdtools/setofficelang.sh.orig 2008-06-09 08:42:48.000000000 -0400
+++ configmgr/source/cmdtools/setofficelang.sh 2008-06-27 15:47:37.000000000 -0400
@@ -75,6 +75,11 @@
export DYLD_LIBRARY_PATH
;;
+ FreeBSD)
+ LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ export LD_LIBRARY_PATH
+ ;;
+
HP-UX)
SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
export SHLIB_PATH
--- desktop/scripts/soffice.sh.orig 2008-06-09 08:57:10.000000000 -0400
+++ desktop/scripts/soffice.sh 2008-06-27 16:12:58.000000000 -0400
@@ -75,6 +75,15 @@

21
editors/openoffice.org-3/files/patch-i91318
View File

@ -1,16 +1,11 @@
Index: hunspell/hunspell-1.1.12.patch
===================================================================
RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
retrieving revision 1.12
diff -u -r1.12 hunspell-1.1.12.patch
--- hunspell/hunspell-1.1.12.patch 2 Jul 2008 09:46:59 -0000 1.12
+++ hunspell/hunspell-1.1.12.patch 10 Aug 2008 01:02:29 -0000
@@ -487,3 +487,11 @@
i68568utf.test \
1706659.test \
digits_in_words.test \
+--- misc/hunspell-1.1.12/tests/test.sh 2007-07-15 22:33:13.000000000 +0900
++++ misc/build/hunspell-1.1.12/tests/test.sh 2008-08-10 10:00:33.000000000 +0900
--- hunspell/hunspell-1.2.8.patch~ 2009-02-21 08:52:35.000000000 +0900
+++ hunspell/hunspell-1.2.8.patch 2009-03-05 09:30:33.000000000 +0900
@@ -619,3 +619,11 @@
p++;
}
if (i > 0 && buf[i - 1] == '\n') {
+--- misc/hunspell-1.2.8/tests/test.sh 2007-07-15 22:33:13.000000000 +0900
++++ misc/build/hunspell-1.2.8/tests/test.sh 2008-08-10 10:00:33.000000000 +0900
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash

88
editors/openoffice.org-3/files/patch-i93235
View File

@ -1,88 +0,0 @@
Add support for Diablo JDK 1.6.0 and above.
--- /dev/null 2008-08-27 17:05:37.000000000 -0400
+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 2008-08-27 17:20:55.000000000 -0400
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <updated>2008-08-27</updated>
+
+ <vendorInfos>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.3.1</minVersion>
+ </vendor>
+ <vendor name="The FreeBSD Foundation">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+ <vendor name="IBM Corporation">
+ <minVersion>1.3.1</minVersion>
+ <maxVersion>1.4.2</maxVersion>
+ </vendor>
+ <vendor name="Blackdown Java-Linux Team">
+ <minVersion>1.3.1</minVersion>
+ </vendor>
+ <vendor name="Free Software Foundation, Inc.">
+ <minVersion>1.4.2</minVersion>
+ </vendor>
+ <vendor name="BEA Systems, Inc.">
+ <minVersion>1.4.1</minVersion>
+ </vendor>
+ </vendorInfos>
+
+ <plugins>
+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ </plugins>
+</javaSelection>
--- jvmfwk/distributions/OpenOfficeorg/makefile.mk.orig 2008-04-11 06:16:59.000000000 -0400
+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk 2008-08-27 17:09:45.000000000 -0400
@@ -43,9 +43,11 @@
.IF "$(SOLAR_JAVA)"!=""
$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="FREEBSD"
+ -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
+.ELIF "$(OS)"=="MACOSX"
-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
+.ELIF "$(OS)"=="LINUX"
-$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
.ELSE
-$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig 2008-04-11 06:19:31.000000000 -0400
+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2008-08-27 17:19:35.000000000 -0400
@@ -128,13 +128,15 @@
rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
+ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
|| sVendor2.equals(pInfo->sVendor) == sal_True
|| sVendor3.equals(pInfo->sVendor) == sal_True
|| sVendor4.equals(pInfo->sVendor) == sal_True
|| sVendor5.equals(pInfo->sVendor) == sal_True
|| sVendor6.equals(pInfo->sVendor) == sal_True
- || sVendor7.equals(pInfo->sVendor) == sal_True))
+ || sVendor7.equals(pInfo->sVendor) == sal_True
+ || sVendor8.equals(pInfo->sVendor) == sal_True))
return 0;
rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
--- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx.orig 2008-04-11 06:24:39.000000000 -0400
+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 2008-08-27 17:13:00.000000000 -0400
@@ -56,6 +56,7 @@
VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
+ VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
END_VENDOR_MAP()