diff options
| author | maho <maho@FreeBSD.org> | 2006-09-17 05:34:56 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2006-09-17 05:34:56 +0800 |
| commit | b7f5ed5a08627c9e69a93009655789490eebb7c8 (patch) | |
| tree | 5434b8ba4d30051020afdf260cf159fd6cb2853c /editors/openoffice-3 | |
| parent | e2f5df6f166ced186594750e2a8a20103b1b20db (diff) | |
| download | freebsd-ports-gnome-b7f5ed5a08627c9e69a93009655789490eebb7c8.tar.gz freebsd-ports-gnome-b7f5ed5a08627c9e69a93009655789490eebb7c8.tar.zst freebsd-ports-gnome-b7f5ed5a08627c9e69a93009655789490eebb7c8.zip | |
Update to 2.0.4rc2 and an amd64 fix[1]
Submitted by: jkim[1]
Diffstat (limited to 'editors/openoffice-3')
| -rw-r--r-- | editors/openoffice-3/Makefile | 8 | ||||
| -rw-r--r-- | editors/openoffice-3/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice-3/files/patch-i69469 | 20 |
3 files changed, 27 insertions, 7 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 257fd9bda193..680d85eec9cd 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -17,7 +17,7 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc #DISTFILES+= OOo_${OOOVERSION}_src.tar.gz -DISTFILES+= OOo_2.0.4rc1_src.tar.gz +DISTFILES+= OOo_2.0.4rc2_src.tar.gz DISTFILES+= unowinreg.dll:unowinreg .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc @@ -26,12 +26,12 @@ DISTFILES+= gpc231.tar.Z:gpc DISTFILES+= ${ANT_DISTFILE}:antbin .endif #EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz -EXTRACT_ONLY= OOo_2.0.4rc1_src.tar.gz +EXTRACT_ONLY= OOo_2.0.4rc2_src.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser -OOOVERSION= 2.0.4.rc1 +OOOVERSION= 2.0.4.rc2 NO_LATEST_LINK= yes USE_GNOME= gtk20 MOZILLA_VERSION= 1.7.5 @@ -75,7 +75,7 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOD680_m3 +OOOTAG?= OOD680_m4 INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION} EXECBASE?= openoffice.org-${OOOVERSION} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index e6971072cddb..b50505f57cba 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.4rc1_src.tar.gz) = 46f465827d5c0d4a6e2eaf598e9575b1 -SHA256 (openoffice.org2.0/OOo_2.0.4rc1_src.tar.gz) = 5192793c172ddf248447879ecbad47b94ad317fe6b8716050f9eb45faebe59c7 -SIZE (openoffice.org2.0/OOo_2.0.4rc1_src.tar.gz) = 333848714 +MD5 (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = bbc1786e29f4b8de8e70d347b7bfc812 +SHA256 (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = e5ae257bdead899ac369bab3f8d8b7ce902d45013175ee5827745256fb156e45 +SIZE (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = 333859530 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3/files/patch-i69469 b/editors/openoffice-3/files/patch-i69469 new file mode 100644 index 000000000000..6647873ca657 --- /dev/null +++ b/editors/openoffice-3/files/patch-i69469 @@ -0,0 +1,20 @@ +--- sw/source/core/doc/docfld.cxx.orig Wed Oct 19 17:23:17 2005 ++++ sw/source/core/doc/docfld.cxx Sun Sep 17 06:24:22 2006 +@@ -1197,7 +1197,7 @@ + pMgr->CloseAll(FALSE); + } + +-void SwDoc::FldsToCalc( SwCalc& rCalc, ULONG nLastNd, USHORT nLastCnt ) ++void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uInt32 nLastNd, sal_uInt16 nLastCnt ) + { + // erzeuge die Sortierteliste aller SetFelder + pUpdtFlds->MakeFldList( *this, bNewFldLst, GETFLD_CALC ); +@@ -2217,7 +2217,7 @@ + ResetModified(); + } + +-BOOL SwDoc::SetFieldsDirty( BOOL b, const SwNode* pChk, ULONG nLen ) ++BOOL SwDoc::SetFieldsDirty( BOOL b, const SwNode* pChk, sal_uInt32 nLen ) + { + // teste ggfs. mal, ob die angegbenen Nodes ueberhaupt Felder beinhalten. + // wenn nicht, braucht das Flag nicht veraendert werden. |