cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 2.2.1; mainly a bugfix release

Browse Source 
for more information please read the release notes:
http://development.openoffice.org/releases/2.2.1.html
This commit is contained in:
robert 2007-06-15 07:42:17 +00:00
parent 81bcd23cb9
commit 3c89757989
13 changed files with 121 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/openoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2007/06/09 10:42:56 steven Exp $
# $OpenBSD: Makefile,v 1.56 2007/06/15 07:42:17 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -6,11 +6,11 @@ COMMENT-main= "multi-platform productivity suite"
COMMENT-kde= "optional integration of OpenOffice to the KDE environment"
COMMENT-java= "optional integration of OpenOffice java features"
VERSION= 2.2.0
VERSION= 2.2.1
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOF680_m14
WRKDIST= ${WRKDIR}/OOF680_m18
PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}p2
PKGNAME-main= openoffice-${VERSION}
PKGNAME-kde= openoffice-kde-${VERSION}
PKGNAME-java= openoffice-java-${VERSION}
CATEGORIES= editors productivity

50
editors/openoffice/distinfo
View File

@ -1,40 +1,40 @@
MD5 (openoffice/OOo_2.2.0_src_binfilter.tar.bz2) = bgiC29Gj84fzyGR+W24R/w==
MD5 (openoffice/OOo_2.2.0_src_core.tar.bz2) = 2Rfn7szsYDdu706KkbcTbg==
MD5 (openoffice/OOo_2.2.0_src_l10n.tar.bz2) = vDifJRudmlTj5yQ1lt6+YA==
MD5 (openoffice/OOo_2.2.0_src_sdk.tar.bz2) = eeOxQ8xykw5jtTfEKIbrhA==
MD5 (openoffice/OOo_2.2.0_src_system.tar.bz2) = Laf3sc/suRU8S61spMsKQg==
MD5 (openoffice/OOo_2.2.1_src_binfilter.tar.bz2) = 0mdmWX7JLn45fX17b2RPfw==
MD5 (openoffice/OOo_2.2.1_src_core.tar.bz2) = NdQDfOOk0Zv1K6csaO9nVg==
MD5 (openoffice/OOo_2.2.1_src_l10n.tar.bz2) = IyZ9dLSiog08XqCYlTx65A==
MD5 (openoffice/OOo_2.2.1_src_sdk.tar.bz2) = 7OVydRWRYRmq3jcSNrv+1g==
MD5 (openoffice/OOo_2.2.1_src_system.tar.bz2) = E5Z7lZkzMGZGaBBWmobDZg==
MD5 (openoffice/build-java-target-2.2.0.diff) = 75jJnc/BjWIjVjSMTjSrIw==
MD5 (openoffice/go_oo_src680_20061105.diff) = YfG7glI95rL5raV1uFlP2w==
MD5 (openoffice/ooo-desktop.tar.gz) = 4fAWie5YsaKqfYL65jd4aw==
RMD160 (openoffice/OOo_2.2.0_src_binfilter.tar.bz2) = G7B/Aehy7QA9usPhG8VzKQQHauE=
RMD160 (openoffice/OOo_2.2.0_src_core.tar.bz2) = hOK/qtIXYMWpKnOqxGdl7QFjj/o=
RMD160 (openoffice/OOo_2.2.0_src_l10n.tar.bz2) = i2bU4F6/vGc+rDpTJviNW6Cj57I=
RMD160 (openoffice/OOo_2.2.0_src_sdk.tar.bz2) = Q8+3Vx3rqG+F4bzNzQel0QXf78g=
RMD160 (openoffice/OOo_2.2.0_src_system.tar.bz2) = kO86OYlqFa/HUJTFNm9yoKMjeRY=
RMD160 (openoffice/OOo_2.2.1_src_binfilter.tar.bz2) = phlISbuOITBwmn/3aajnUaQ/hsY=
RMD160 (openoffice/OOo_2.2.1_src_core.tar.bz2) = +md185e/CTrVvhnCjBjRebsQV7g=
RMD160 (openoffice/OOo_2.2.1_src_l10n.tar.bz2) = WPVvqrB58Xk0j0xkzb4XbiljRfc=
RMD160 (openoffice/OOo_2.2.1_src_sdk.tar.bz2) = SBHJUnE1Ju/n6YCQ/uWLdeGsp6M=
RMD160 (openoffice/OOo_2.2.1_src_system.tar.bz2) = BIcHGn8suSEimE5dkoste0tVuF8=
RMD160 (openoffice/build-java-target-2.2.0.diff) = E6z5l9W1NFqterrBSZM/uadbzaw=
RMD160 (openoffice/go_oo_src680_20061105.diff) = KbE/z2VyTW39APVfyfTdS5WSpAw=
RMD160 (openoffice/ooo-desktop.tar.gz) = oqo1JvA0o2pFs3Bctw+P/MM6zyY=
SHA1 (openoffice/OOo_2.2.0_src_binfilter.tar.bz2) = 0fqCfiwI1+PWeyWIsRNu2ed070I=
SHA1 (openoffice/OOo_2.2.0_src_core.tar.bz2) = o7M0xqhVNmlE6eHkQaX74vLXvLE=
SHA1 (openoffice/OOo_2.2.0_src_l10n.tar.bz2) = /bEg8YMQ77lZOM3zCghV74RW00Y=
SHA1 (openoffice/OOo_2.2.0_src_sdk.tar.bz2) = /Z9OTygQbHgK4Kb1neAqyJHvLkk=
SHA1 (openoffice/OOo_2.2.0_src_system.tar.bz2) = MRMxAWy8YRLgz5gp1u9ngqzMwBs=
SHA1 (openoffice/OOo_2.2.1_src_binfilter.tar.bz2) = qiwxbg+rE6JcB8LP0Or7elDJZng=
SHA1 (openoffice/OOo_2.2.1_src_core.tar.bz2) = 2thuo+jtKAWYbIIzPPehIEBpYmk=
SHA1 (openoffice/OOo_2.2.1_src_l10n.tar.bz2) = 98FZIhDGAxNGS38s7IjLhQV4rsE=
SHA1 (openoffice/OOo_2.2.1_src_sdk.tar.bz2) = CB5LlKAnrHbMuegqjmx/h86VDX0=
SHA1 (openoffice/OOo_2.2.1_src_system.tar.bz2) = KVxwqU03uBHErT9DfFjlZMl5rVE=
SHA1 (openoffice/build-java-target-2.2.0.diff) = tFDyynA/OMNn1nYB3HBk0iEsPgA=
SHA1 (openoffice/go_oo_src680_20061105.diff) = kHJRQFXm9OBMqC99r42TUlZuPTI=
SHA1 (openoffice/ooo-desktop.tar.gz) = 4WYmsMz8xRSY9raC3IsdH5IJmQo=
SHA256 (openoffice/OOo_2.2.0_src_binfilter.tar.bz2) = C8J7UXyjHlKUlvKQaCsP9SlpOBgy/JdvgcHqOK+Tmt8=
SHA256 (openoffice/OOo_2.2.0_src_core.tar.bz2) = S9Ym99IHb9+OSeFFMez1A4Kx1lfXde22mcW5TGSAHM4=
SHA256 (openoffice/OOo_2.2.0_src_l10n.tar.bz2) = Jm2tXVqF1Wp/wWCS8S8FIeIZ0kPaHIWbTWbIKIrDpus=
SHA256 (openoffice/OOo_2.2.0_src_sdk.tar.bz2) = 7mgMLMzzknazb1H8rdbcYxICVvXSXSILrWxk7y8xy3g=
SHA256 (openoffice/OOo_2.2.0_src_system.tar.bz2) = zDv7Zz857E6h0nr5mkRM7Bz45477Zznf+WRZe4/TK68=
SHA256 (openoffice/OOo_2.2.1_src_binfilter.tar.bz2) = E/L22tgqCFpgck+m28WMVkqMSWzCcYmvPNcoam5q3rg=
SHA256 (openoffice/OOo_2.2.1_src_core.tar.bz2) = rcVMiIkvXO2Yh5RXCYVu/rYo/l97Wy8qp3l8U5G5x9Y=
SHA256 (openoffice/OOo_2.2.1_src_l10n.tar.bz2) = 0jzB1dyXUzsDsEM24qE27ko1myvYI5oAi9PkUI6uKyU=
SHA256 (openoffice/OOo_2.2.1_src_sdk.tar.bz2) = fZ4ozkPFKwiGTpF3CbWmVnVDwlOLBp/n49+x3XF5ZBU=
SHA256 (openoffice/OOo_2.2.1_src_system.tar.bz2) = 0HDqMSH6khKeyNe7a7gOnJN9heD+4J1CH4CgC1PdF00=
SHA256 (openoffice/build-java-target-2.2.0.diff) = ndLsTYPhU1uyWRELZ+K7jISioJw1bbFUZ5me1Er70ms=
SHA256 (openoffice/go_oo_src680_20061105.diff) = yw5PFfWzxX5yqwXzkLhJh56FMEe9xC21KU0LRbDjcD0=
SHA256 (openoffice/ooo-desktop.tar.gz) = r9RdGYqZDebbPNNGvG2dH86U6J7+PQWrc8Z4pEPQ7KE=
SIZE (openoffice/OOo_2.2.0_src_binfilter.tar.bz2) = 7763249
SIZE (openoffice/OOo_2.2.0_src_core.tar.bz2) = 123160673
SIZE (openoffice/OOo_2.2.0_src_l10n.tar.bz2) = 76592096
SIZE (openoffice/OOo_2.2.0_src_sdk.tar.bz2) = 29291964
SIZE (openoffice/OOo_2.2.0_src_system.tar.bz2) = 30976956
SIZE (openoffice/OOo_2.2.1_src_binfilter.tar.bz2) = 7756778
SIZE (openoffice/OOo_2.2.1_src_core.tar.bz2) = 123479583
SIZE (openoffice/OOo_2.2.1_src_l10n.tar.bz2) = 76560727
SIZE (openoffice/OOo_2.2.1_src_sdk.tar.bz2) = 29291551
SIZE (openoffice/OOo_2.2.1_src_system.tar.bz2) = 31149966
SIZE (openoffice/build-java-target-2.2.0.diff) = 40685
SIZE (openoffice/go_oo_src680_20061105.diff) = 9928
SIZE (openoffice/ooo-desktop.tar.gz) = 43479

36
editors/openoffice/patches/patch-desktop_source_deployment_registry_package_dp_package_cxx
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-desktop_source_deployment_registry_package_dp_package_cxx,v 1.2 2007/04/18 13:20:48 kurt Exp $
--- desktop/source/deployment/registry/package/dp_package.cxx.orig.port Wed Dec 20 09:30:48 2006
+++ desktop/source/deployment/registry/package/dp_package.cxx Wed Apr 18 03:46:24 2007
@@ -660,9 +660,9 @@ bool BackendImpl::PackageImpl::checkDependencies(
try
{
css::uno::Reference<css::xml::dom::XNode> xRoot = desc.getRootElement();
- css::uno::Reference<css::xml::xpath::XXPathAPI> xPath(
- DescriptionInfoset(getMyBackend()->getComponentContext(), xRoot).
- getXpath());
+ css::uno::Reference<css::xml::xpath::XXPathAPI> xPath =
+ DescriptionInfoset(getMyBackend()->getComponentContext(), xRoot).
+ getXpath();
css::uno::Reference<css::xml::dom::XNode> nodeSimpleLic =
xPath->selectSingleNode(xRoot,
@@ -688,7 +688,8 @@ bool BackendImpl::PackageImpl::checkDependencies(
OSL_ASSERT(aContextName.getLength());
if (sAccept.equals(OUSTR("user")) && aContextName.equals(OUSTR("shared")))
{
- css::deployment::LicenseIndividualAgreementException exc(OUString(), 0, m_name);
+ css::deployment::LicenseIndividualAgreementException exc =
+ css::deployment::LicenseIndividualAgreementException(OUString(), 0, m_name);
bool approve = false;
bool abort = false;
@@ -722,7 +723,8 @@ bool BackendImpl::PackageImpl::checkDependencies(
if ( !(bInstalled && bSuppress))
{
- css::deployment::LicenseException licExc(OUString(), 0, m_name, sLicense);
+ css::deployment::LicenseException licExc =
+ css::deployment::LicenseException(OUString(), 0, m_name, sLicense);
bool approve = false;
bool abort = false;
if (! interactContinuation(

29
editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_language_txt
View File

@ -1,37 +1,36 @@
$OpenBSD: patch-instsetoo_native_inc_openoffice_unix_packagelist_language_txt,v 1.1 2007/05/14 17:13:01 kurt Exp $
--- instsetoo_native/inc_openoffice/unix/packagelist_language.txt.orig.port Tue May 8 10:05:04 2007
+++ instsetoo_native/inc_openoffice/unix/packagelist_language.txt Tue May 8 10:05:51 2007
@@ -28,7 +28,7 @@ copyright = "1999-2006 by OpenOffice.org"
--- instsetoo_native/inc_openoffice/unix/packagelist_language.txt.orig.port Tue May 8 13:49:46 2007
+++ instsetoo_native/inc_openoffice/unix/packagelist_language.txt Fri Jun 15 09:31:34 2007
@@ -28,7 +28,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -43,7 +43,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -43,7 +43,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -58,7 +58,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -58,7 +58,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Language resource module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -73,5 +73,5 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -73,5 +73,5 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End

120
editors/openoffice/patches/patch-instsetoo_native_inc_openoffice_unix_packagelist_txt
View File

@ -1,152 +1,152 @@
--- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig.port Fri Jan 19 09:05:40 2007
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt Wed Apr 18 03:46:25 2007
@@ -29,7 +29,7 @@ copyright = "1999-2006 by OpenOffice.org"
--- instsetoo_native/inc_openoffice/unix/packagelist.txt.orig.port Tue May 8 13:49:33 2007
+++ instsetoo_native/inc_openoffice/unix/packagelist.txt Fri Jun 15 09:31:34 2007
@@ -29,7 +29,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -44,7 +44,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -44,7 +44,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -59,7 +59,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -59,7 +59,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -75,7 +75,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -75,7 +75,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -91,7 +91,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -91,7 +91,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -107,7 +107,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -107,7 +107,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -123,7 +123,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -123,7 +123,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -139,7 +139,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -139,7 +139,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -155,7 +155,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -155,7 +155,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -170,7 +170,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -170,7 +170,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -185,7 +185,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -185,7 +185,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -200,7 +200,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -200,7 +200,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -215,7 +215,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -215,7 +215,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -230,7 +230,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -230,7 +230,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -245,7 +245,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -245,7 +245,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -260,7 +260,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -260,7 +260,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -275,7 +275,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -275,7 +275,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
@ -162,108 +162,108 @@
End
Start
@@ -303,7 +303,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -303,7 +303,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -318,7 +318,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -318,7 +318,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -333,7 +333,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -333,7 +333,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -349,7 +349,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -349,7 +349,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -364,7 +364,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -364,7 +364,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -379,7 +379,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -379,7 +379,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -394,7 +394,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -394,7 +394,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -409,7 +409,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -409,7 +409,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -424,7 +424,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -424,7 +424,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -439,7 +439,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -439,7 +439,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -454,7 +454,7 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -454,7 +454,7 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -470,5 +470,5 @@ copyright = "1999-2006 by OpenOffice.org"
@@ -470,5 +470,5 @@ copyright = "1999-2006 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
vendor = "%PRODUCTNAME"
description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+destpath = "openoffice"

10
editors/openoffice/patches/patch-instsetoo_native_util_makefile_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.8 2007/05/14 17:13:01 kurt Exp $
--- instsetoo_native/util/makefile.mk.orig.port Thu Mar 1 06:46:53 2007
+++ instsetoo_native/util/makefile.mk Tue May 8 08:42:19 2007
$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.9 2007/06/15 07:42:17 robert Exp $
--- instsetoo_native/util/makefile.mk.orig.port Tue May 8 13:50:23 2007
+++ instsetoo_native/util/makefile.mk Fri Jun 15 09:31:34 2007
@@ -54,12 +54,14 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDI
.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
@ -25,7 +25,7 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.8 2007/05/14 17:13:01 kurt
openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
@@ -199,7 +201,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
@@ -219,7 +221,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
openoffice_% :
.ENDIF # "$(PKGFORMAT)"!=""
.IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable"
@ -34,7 +34,7 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.8 2007/05/14 17:13:01 kurt
$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH).update.xml
.ELSE # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!=""
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging
@@ -410,11 +412,11 @@ hack_msitemplates .PHONY:
@@ -496,11 +498,11 @@ hack_msitemplates .PHONY:
+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
+-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
+-$(MKDIRHIER) $(MSIURETEMPLATEDIR)

8
editors/openoffice/patches/patch-sal_osl_unx_process_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sal_osl_unx_process_c,v 1.2 2006/08/20 03:36:52 kurt Exp $
--- sal/osl/unx/process.c.orig.port Tue Jun 20 00:18:45 2006
+++ sal/osl/unx/process.c Fri Aug 18 15:47:44 2006
@@ -491,7 +491,7 @@ static void ChildStatusProc(void *pData)
$OpenBSD: patch-sal_osl_unx_process_c,v 1.3 2007/06/15 07:42:17 robert Exp $
--- sal/osl/unx/process.c.orig.port Thu Apr 12 19:21:41 2007
+++ sal/osl/unx/process.c Fri Jun 15 09:31:34 2007
@@ -487,7 +487,7 @@ static void ChildStatusProc(void *pData)
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));

16
editors/openoffice/patches/patch-sal_osl_unx_security_c
View File

@ -1,16 +1,6 @@
$OpenBSD: patch-sal_osl_unx_security_c,v 1.5 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/security.c.orig.port Wed Jul 19 05:55:41 2006
+++ sal/osl/unx/security.c Wed Apr 18 03:46:26 2007
@@ -76,7 +76,7 @@ static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurit
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#if defined (MACOSX) || defined (FREEBSD)
+#if defined (MACOSX) || defined (FREEBSD) || defined(OPENBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */
size_t n = 1024;
#else
@@ -474,7 +474,7 @@ osl_psz_loginUser(const sal_Char* pszUserName, const s
--- sal/osl/unx/security.c.orig.port Tue May 8 12:15:10 2007
+++ sal/osl/unx/security.c Fri Jun 15 09:31:34 2007
@@ -509,7 +509,7 @@ osl_psz_loginUser(const sal_Char* pszUserName, const s
oslSecurity* pSecurity)
{
#if defined NETBSD || defined SCO || defined AIX || defined FREEBSD || \

8
editors/openoffice/patches/patch-sal_osl_unx_system_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sal_osl_unx_system_h,v 1.5 2007/04/18 13:20:48 kurt Exp $
--- sal/osl/unx/system.h.orig.port Wed Jul 19 05:39:50 2006
+++ sal/osl/unx/system.h Wed Apr 18 03:46:26 2007
$OpenBSD: patch-sal_osl_unx_system_h,v 1.6 2007/06/15 07:42:17 robert Exp $
--- sal/osl/unx/system.h.orig.port Tue May 8 12:06:37 2007
+++ sal/osl/unx/system.h Fri Jun 15 09:31:34 2007
@@ -198,6 +198,32 @@
# define NO_PTHREAD_RTL
#endif
@ -34,7 +34,7 @@ $OpenBSD: patch-sal_osl_unx_system_h,v 1.5 2007/04/18 13:20:48 kurt Exp $
#ifdef SCO
# define AF_IPX -1
# include <strings.h>
@@ -386,7 +412,7 @@ int macxp_resolveAlias(char *path, int buflen);
@@ -382,7 +408,7 @@ int macxp_resolveAlias(char *path, int buflen);
!defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \
!defined(AIX) && !defined(HPUX) && \
!defined(SOLARIS) && !defined(IRIX) && !defined(MAC) && \

12
editors/openoffice/patches/patch-sd_source_ui_dlg_docprev_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sd_source_ui_dlg_docprev_cxx,v 1.2 2007/04/18 13:20:48 kurt Exp $
--- sd/source/ui/dlg/docprev.cxx.orig.port Tue Dec 12 12:04:46 2006
+++ sd/source/ui/dlg/docprev.cxx Wed Apr 18 03:46:27 2007
@@ -336,7 +336,7 @@ void SdDocPreviewWin::updateViewSettings()
// Use new StandardCheckVisisbilityRedirector
StandardCheckVisisbilityRedirector aRedirector;
- const Rectangle aRedrawRectangle( Point(), aNewSize );
+ const Rectangle aRedrawRectangle = Rectangle( Point(), aNewSize );
Region aRedrawRegion(aRedrawRectangle);
pView->SdrPaintView::CompleteRedraw(&aVDev,aRedrawRegion,0,&aRedirector);

65
editors/openoffice/patches/patch-sd_source_ui_dlg_sdtreelb_cxx
View File

@ -1,65 +0,0 @@
$OpenBSD: patch-sd_source_ui_dlg_sdtreelb_cxx,v 1.2 2007/04/18 13:20:48 kurt Exp $
--- sd/source/ui/dlg/sdtreelb.cxx.orig.port Fri Jan 19 07:59:12 2007
+++ sd/source/ui/dlg/sdtreelb.cxx Wed Apr 18 03:46:27 2007
@@ -350,17 +350,17 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc
SdPage* pPage = NULL;
SvLBoxEntry* pEntry = NULL;
- Image aImgPage( BitmapEx( SdResId( BMP_PAGE ) ) );
- Image aImgPageExcl( BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) ) );
- Image aImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) );
- Image aImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
- Image aImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) );
+ Image aImgPage = BitmapEx( SdResId( BMP_PAGE ) );
+ Image aImgPageExcl = BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) );
+ Image aImgPageObjsExcl = BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) );
+ Image aImgPageObjs = BitmapEx( SdResId( BMP_PAGEOBJS ) );
+ Image aImgObjects = BitmapEx( SdResId( BMP_OBJECTS ) );
- Image aImgPageH( BitmapEx( SdResId( BMP_PAGE_H ) ) );
- Image aImgPageExclH( BitmapEx( SdResId( BMP_PAGE_EXCLUDED_H ) ) );
- Image aImgPageObjsExclH( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED_H ) ) );
- Image aImgPageObjsH( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) );
- Image aImgObjectsH( BitmapEx( SdResId( BMP_OBJECTS_H ) ) );
+ Image aImgPageH = BitmapEx( SdResId( BMP_PAGE_H ) );
+ Image aImgPageExclH = BitmapEx( SdResId( BMP_PAGE_EXCLUDED_H ) );
+ Image aImgPageObjsExclH = BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED_H ) );
+ Image aImgPageObjsH = BitmapEx( SdResId( BMP_PAGEOBJS_H ) );
+ Image aImgObjectsH = BitmapEx( SdResId( BMP_OBJECTS_H ) );
// first insert all pages including objects
USHORT nPage = 0;
@@ -510,10 +510,10 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc
mpMedium = pInMedium;
maDocName = rDocName;
- Image aImgDocOpen( BitmapEx( SdResId( BMP_DOC_OPEN ) ) );
- Image aImgDocClosed( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
- Image aImgDocOpenH( BitmapEx( SdResId( BMP_DOC_OPEN_H ) ) );
- Image aImgDocClosedH( BitmapEx( SdResId( BMP_DOC_CLOSED_H ) ) );
+ Image aImgDocOpen = BitmapEx( SdResId( BMP_DOC_OPEN ) );
+ Image aImgDocClosed = BitmapEx( SdResId( BMP_DOC_CLOSED ) );
+ Image aImgDocOpenH = BitmapEx( SdResId( BMP_DOC_OPEN_H ) );
+ Image aImgDocClosedH = BitmapEx( SdResId( BMP_DOC_CLOSED_H ) );
// Dokumentnamen einfuegen
SvLBoxEntry* pFileEntry = InsertEntry( maDocName,
@@ -709,12 +709,12 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFi
SdPage* pPage = NULL;
SvLBoxEntry* pPageEntry = NULL;
- Image aImgPage( BitmapEx( SdResId( BMP_PAGE ) ) );
- Image aImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
- Image aImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) );
- Image aImgPageH( BitmapEx( SdResId( BMP_PAGE_H ) ) );
- Image aImgPageObjsH( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) );
- Image aImgObjectsH( BitmapEx( SdResId( BMP_OBJECTS_H ) ) );
+ Image aImgPage = BitmapEx( SdResId( BMP_PAGE ) );
+ Image aImgPageObjs = BitmapEx( SdResId( BMP_PAGEOBJS ) );
+ Image aImgObjects = BitmapEx( SdResId( BMP_OBJECTS ) );
+ Image aImgPageH = BitmapEx( SdResId( BMP_PAGE_H ) );
+ Image aImgPageObjsH = BitmapEx( SdResId( BMP_PAGEOBJS_H ) );
+ Image aImgObjectsH = BitmapEx( SdResId( BMP_OBJECTS_H ) );
// document name already inserted

12
editors/openoffice/patches/patch-sw_source_core_view_viewimp_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sw_source_core_view_viewimp_cxx,v 1.1 2007/03/17 15:27:45 robert Exp $
--- sw/source/core/view/viewimp.cxx.orig.port Mon Feb 12 00:49:31 2007
+++ sw/source/core/view/viewimp.cxx Mon Feb 12 00:51:51 2007
@@ -394,7 +394,7 @@ void SwViewImp::MakeDrawView()
if(pWindow)
{
// #i72754# use correct region calculation now
- const Rectangle aRectPixel(Point(), pWindow->GetOutputSizePixel());
+ const Rectangle aRectPixel = Rectangle(Point(), pWindow->GetOutputSizePixel());
const Rectangle aRectLogic(pWindow->PixelToLogic(aRectPixel));
const Region aRegionLogic(aRectLogic);
ViewShell &rSh = *GetShell();

3
editors/openoffice/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.6 2007/03/19 13:15:30 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2007/06/15 07:42:17 robert Exp $
@pkgpath editors/openoffice
%%SHARED%%
bin/sbase
@ -188,6 +188,7 @@ openoffice/presets/gallery/sg100.thm
openoffice/presets/gallery/sg30.sdv
openoffice/presets/gallery/sg30.thm
openoffice/program/
openoffice/program/about.bmp
openoffice/program/bootstraprc
openoffice/program/cde-open-url
openoffice/program/configimport