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

update to version 2.3.1;

Browse Source 
This is a minor bug fix release with no new features for users.
However, as this release also fixes a security vulnerability with
database files.
This commit is contained in:
robert 2007-12-07 11:30:55 +00:00
parent 13cb3f4d17
commit fc8a8694fe
8 changed files with 356 additions and 404 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.66 2007/11/27 14:19:52 robert Exp $
# $OpenBSD: Makefile,v 1.67 2007/12/07 11:30:55 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -6,9 +6,9 @@ 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.3.0
VERSION= 2.3.1
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOG680_m5
WRKDIST= ${WRKDIR}/OOG680_m9
PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}
PKGNAME-kde= openoffice-kde-${VERSION}
@ -63,7 +63,7 @@ LANGS= bg br-pt ca de es fa fi fr hu it ja ko \
.for l in ${LANGS}
MULTI_PACKAGES+= -i18n-$l
PKGNAME-i18n-$l= openoffice-i18n-$l-${VERSION}p0
PKGNAME-i18n-$l= openoffice-i18n-$l-${VERSION}
COMMENT-i18n-$l= $l language pack for OpenOffice.Org
RUN_DEPENDS-i18n-$l= ::editors/openoffice
WANTLIB-i18n-$l=

55
editors/openoffice/distinfo
View File

@ -1,40 +1,35 @@
MD5 (openoffice/OOo_2.3.0_src_binfilter.tar.bz2) = J6FAaoJe1GXHHDnzq/1iKg==
MD5 (openoffice/OOo_2.3.0_src_core.tar.bz2) = 1EcFeyr1gCAjTLnbbHgr+g==
MD5 (openoffice/OOo_2.3.0_src_l10n.tar.bz2) = 9HOEv9eVnJ3g1HsrI1RFVw==
MD5 (openoffice/OOo_2.3.0_src_sdk.tar.bz2) = Bii6bTaSP+V2r20d2QuLJQ==
MD5 (openoffice/OOo_2.3.0_src_system.tar.bz2) = YMVrmYVRQ/wMj35YHyFLWw==
MD5 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = pWz27ZvZdZ+uxXYLrLhIzQ==
MD5 (openoffice/OOo_2.3.1_src_core.tar.bz2) = lVWi1frpolx4jMcykh71eg==
MD5 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = O7gKLJbjNjGGN396rp98Ew==
MD5 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = nPDdu1XwtDtJxZxpYupWfA==
MD5 (openoffice/OOo_2.3.1_src_system.tar.bz2) = HiC+/i/bZcAL4R8fXZ69yg==
MD5 (openoffice/build-java-target-2.2.0.diff) = 75jJnc/BjWIjVjSMTjSrIw==
MD5 (openoffice/go_oo_src680_20071025.diff) = XEjJBNJv6ES9hqIrDv/hdw==
MD5 (openoffice/ooo-desktop.tar.gz) = 4fAWie5YsaKqfYL65jd4aw==
RMD160 (openoffice/OOo_2.3.0_src_binfilter.tar.bz2) = RBpDwqLVQYydO1Wol5DzFZgAC94=
RMD160 (openoffice/OOo_2.3.0_src_core.tar.bz2) = Z8epeqxGUvipz7MBm5ZJaJl3sHY=
RMD160 (openoffice/OOo_2.3.0_src_l10n.tar.bz2) = qEZ4wL94aGlGSBSw+iETessyUKk=
RMD160 (openoffice/OOo_2.3.0_src_sdk.tar.bz2) = V6lTjNByJ0exlQUHirLZL4tsfmo=
RMD160 (openoffice/OOo_2.3.0_src_system.tar.bz2) = W1V7Se7JFRJ1Fcdq2SHuo1gKiTw=
RMD160 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = SXrsHeSeqUGrgwUzGp/J6OBKUWI=
RMD160 (openoffice/OOo_2.3.1_src_core.tar.bz2) = q3XAItAO1iaeuUN/nAIuRBgcbTo=
RMD160 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = vBCx4FV0rO15Uy++8xbmbcuBD78=
RMD160 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = WbJFyB6cxtQ8YAcP1dx4w42AbbY=
RMD160 (openoffice/OOo_2.3.1_src_system.tar.bz2) = +TsPxSOjnSnnNGa+TVktWp/N5o4=
RMD160 (openoffice/build-java-target-2.2.0.diff) = E6z5l9W1NFqterrBSZM/uadbzaw=
RMD160 (openoffice/go_oo_src680_20071025.diff) = AN5koKAF5SDi6pnd3zzDfQRoG2M=
RMD160 (openoffice/ooo-desktop.tar.gz) = oqo1JvA0o2pFs3Bctw+P/MM6zyY=
SHA1 (openoffice/OOo_2.3.0_src_binfilter.tar.bz2) = pFs1YJL8YaumjQt1Nrs/cjzWKTc=
SHA1 (openoffice/OOo_2.3.0_src_core.tar.bz2) = M5RT8WnmP1MeJPPVd05qXaZbJsE=
SHA1 (openoffice/OOo_2.3.0_src_l10n.tar.bz2) = yn3NTRnR9d8h+5Mf4xzdd5Eo9Jw=
SHA1 (openoffice/OOo_2.3.0_src_sdk.tar.bz2) = b0O+nAE0afX+QJWCb2d3b7U9low=
SHA1 (openoffice/OOo_2.3.0_src_system.tar.bz2) = psKvQk96wmrfdbOEVy/hmXXvNV0=
SHA1 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = BkPFLaOFChZJKDQudlGJe3p2yh8=
SHA1 (openoffice/OOo_2.3.1_src_core.tar.bz2) = 3hieA6MpzdM0gjpSuAD60MAzq00=
SHA1 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = AE3vrhSWz0uVOiM6uyD9TH4WJCM=
SHA1 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = ZQk9yCJNW5dxxYZR9a5sbfGlh0g=
SHA1 (openoffice/OOo_2.3.1_src_system.tar.bz2) = 68g1+cAO9gudjaEASo8x+KiK728=
SHA1 (openoffice/build-java-target-2.2.0.diff) = tFDyynA/OMNn1nYB3HBk0iEsPgA=
SHA1 (openoffice/go_oo_src680_20071025.diff) = STYgWcjQhLW24gGEb/V1abtQxvg=
SHA1 (openoffice/ooo-desktop.tar.gz) = 4WYmsMz8xRSY9raC3IsdH5IJmQo=
SHA256 (openoffice/OOo_2.3.0_src_binfilter.tar.bz2) = sqVNkjiloxYVEobwB1SbneYz1hshbvJYzAOSxWlOlYU=
SHA256 (openoffice/OOo_2.3.0_src_core.tar.bz2) = gwVV1HN2tvyELDKt3y1MgnCR3xmJsF6nzAO4IXGyfVY=
SHA256 (openoffice/OOo_2.3.0_src_l10n.tar.bz2) = 1X0D5sW6jhYPo9/UFqxM07qqFNFYhgRFJVGz1CAmESA=
SHA256 (openoffice/OOo_2.3.0_src_sdk.tar.bz2) = C5Zjt9uJO83ja/RiBTYRUCN6448XgVBkWw114gvzD8c=
SHA256 (openoffice/OOo_2.3.0_src_system.tar.bz2) = pxDaFkVSy4vLbQVeb8qNAeC454EZmyrNJS0Nsd0O8oc=
SHA256 (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = mnb46uPdVG9C24g8EvjyGCPg4o7W1D6Dhx3RweB//1c=
SHA256 (openoffice/OOo_2.3.1_src_core.tar.bz2) = TIB90mLrcUOX3p540kTVh5aKkhQqkX27R/UYDEDbZ1M=
SHA256 (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = xINAdLl8ObFLidNb+Hzwa/1pDNv11Ec9ThX4oj6722Q=
SHA256 (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = Ef7YMrWjI5CIWjh8v5zi0xtlKvje3ryESrlagLWqUGY=
SHA256 (openoffice/OOo_2.3.1_src_system.tar.bz2) = YkYDT2/zzRl23rg6BpR4DnO458MBxEIBP34/Lc0X+24=
SHA256 (openoffice/build-java-target-2.2.0.diff) = ndLsTYPhU1uyWRELZ+K7jISioJw1bbFUZ5me1Er70ms=
SHA256 (openoffice/go_oo_src680_20071025.diff) = Dyhdxzs5qcHS/NVcXInlKFQzof1PyihPe0TpPyhG54g=
SHA256 (openoffice/ooo-desktop.tar.gz) = r9RdGYqZDebbPNNGvG2dH86U6J7+PQWrc8Z4pEPQ7KE=
SIZE (openoffice/OOo_2.3.0_src_binfilter.tar.bz2) = 6477306
SIZE (openoffice/OOo_2.3.0_src_core.tar.bz2) = 145104450
SIZE (openoffice/OOo_2.3.0_src_l10n.tar.bz2) = 78634672
SIZE (openoffice/OOo_2.3.0_src_sdk.tar.bz2) = 24033163
SIZE (openoffice/OOo_2.3.0_src_system.tar.bz2) = 36640242
SIZE (openoffice/OOo_2.3.1_src_binfilter.tar.bz2) = 6476673
SIZE (openoffice/OOo_2.3.1_src_core.tar.bz2) = 144156134
SIZE (openoffice/OOo_2.3.1_src_l10n.tar.bz2) = 79077332
SIZE (openoffice/OOo_2.3.1_src_sdk.tar.bz2) = 24032680
SIZE (openoffice/OOo_2.3.1_src_system.tar.bz2) = 36879908
SIZE (openoffice/build-java-target-2.2.0.diff) = 40685
SIZE (openoffice/go_oo_src680_20071025.diff) = 4937
SIZE (openoffice/ooo-desktop.tar.gz) = 43479

20
editors/openoffice/patches/patch-config_office_configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp $
--- config_office/configure.in.orig.port Thu Oct 25 16:21:59 2007
+++ config_office/configure.in Thu Oct 25 16:55:33 2007
$OpenBSD: patch-config_office_configure_in,v 1.15 2007/12/07 11:30:55 robert Exp $
--- config_office/configure.in.orig.port Thu Dec 6 16:36:06 2007
+++ config_office/configure.in Thu Dec 6 16:36:08 2007
@@ -831,6 +831,16 @@ case "$build_os" in
AC_MSG_RESULT([$PTHREAD_LIBS])
_os=FreeBSD
@ -66,7 +66,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp
fi
dnl check if the headers really work:
@@ -3194,15 +3208,12 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
@@ -3195,15 +3209,12 @@ if test -n "$with_system_db" -o -n "$with_system_libs"
test "$with_system_db" != "no"; then
SYSTEM_DB=YES
AC_MSG_RESULT([external])
@ -86,7 +86,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp
for v in 1 2 3 4 5; do
AC_TRY_RUN([
#include <db.h>
@@ -3213,6 +3224,7 @@ int main(int argc, char **argv) {
@@ -3214,6 +3225,7 @@ int main(int argc, char **argv) {
}
], [DB_VERSION_MINOR=$v], [])
done
@ -94,7 +94,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp
if test "$DB_VERSION_MINOR" -gt "1"; then
AC_MSG_RESULT([OK])
DB_VERSION=4.$DB_VERSION_MINOR
@@ -3893,7 +3905,7 @@ elif test "$_os" != "WINNT" ; then
@@ -3908,7 +3920,7 @@ elif test "$_os" != "WINNT" ; then
AC_MSG_ERROR([No X includes found]) # Exit
fi
CFLAGS=$X_CFLAGS
@ -103,7 +103,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp
AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
dnl Check if the XauDisposeAuth symbol is provided by libXau.
AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
@@ -4088,7 +4100,6 @@ if test -n "$with_system_neon" -o -n "$with_system_lib
@@ -4103,7 +4115,6 @@ if test -n "$with_system_neon" -o -n "$with_system_lib
test "$with_system_neon" != "no"; then
AC_MSG_RESULT([external])
PKG_CHECK_MODULES(NEON, neon >= 0.26.0)
@ -111,7 +111,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES
@@ -4832,42 +4843,24 @@ KDE_LIBS=""
@@ -4852,42 +4863,24 @@ KDE_LIBS=""
MOC="moc"
if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
dnl Search paths for Qt and KDE
@ -162,7 +162,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp
dnl Check for Qt headers
AC_MSG_CHECKING([for Qt headers])
@@ -4888,7 +4881,7 @@ your Qt installation by exporting QTDIR before running
@@ -4908,7 +4901,7 @@ your Qt installation by exporting QTDIR before running
AC_MSG_CHECKING([for Qt libraries])
qt_libdir="no"
for qt_check in $qt_libdirs ; do
@ -171,7 +171,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.14 2007/11/13 09:46:28 robert Exp
qt_libdir="$qt_check"
break
fi
@@ -4924,7 +4917,7 @@ your KDE installation by exporting KDEDIR before runni
@@ -4944,7 +4937,7 @@ your KDE installation by exporting KDEDIR before runni
AC_MSG_CHECKING([for KDE libraries])
kde_libdir="no"
for kde_check in $kde_libdirs ; do

22
editors/openoffice/patches/patch-config_office_set_soenv_in
View File

@ -1,5 +1,5 @@
--- config_office/set_soenv.in.orig.port Thu Oct 25 16:21:59 2007
+++ config_office/set_soenv.in Thu Oct 25 16:23:46 2007
--- config_office/set_soenv.in.orig.port Thu Dec 6 16:36:06 2007
+++ config_office/set_soenv.in Thu Dec 6 16:36:08 2007
@@ -368,6 +368,46 @@ elsif ( $platform =~ m/freebsd/ )
$INPATH = $OUTPATH.$PROEXT;
$GVERDIR = $INPATH;
@ -47,7 +47,7 @@
elsif ( $platform =~ m/linux-gnu/ )
{
# General Linux settings:
@@ -973,7 +1013,7 @@ if ($platform =~ m/solaris/)
@@ -974,7 +1014,7 @@ if ($platform =~ m/solaris/)
$ps.$JRETHREADDIR.
$ps.'$SOLARVER'.$ds.'$INPATH'.$LIB;
}
@ -56,7 +56,7 @@
{ $LD_LIBRARY_PATH = $cur_dir.
$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
$ps.$JRELIBDIR.
@@ -1015,7 +1055,7 @@ if ($platform =~ m/solaris/)
@@ -1016,7 +1056,7 @@ if ($platform =~ m/solaris/)
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB;
}
@ -65,7 +65,7 @@
{
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
@@ -1065,7 +1105,7 @@ if ($platform =~ m/cygwin/)
@@ -1066,7 +1106,7 @@ if ($platform =~ m/cygwin/)
}
# The general environment path.
@ -74,7 +74,7 @@
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1245,11 +1285,12 @@ if ($platform =~ m/solaris/)
@@ -1246,11 +1286,12 @@ if ($platform =~ m/solaris/)
$L_STLPORT_LIB.
$L.$XLIB;
}
@ -88,7 +88,7 @@
$L.'$JAVA_HOME'.$LIB64.
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
@@ -1257,6 +1298,19 @@ elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|
@@ -1258,6 +1299,19 @@ elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|
$L_STLPORT_LIB.
$L.$XLIB;
}
@ -108,7 +108,7 @@
elsif ($platform =~ m/cygwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
$L.$par_dir.$LIB.
@@ -1288,10 +1342,10 @@ $SOLARINC = $I.$cur_dir.
@@ -1289,10 +1343,10 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
@ -121,7 +121,7 @@
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1312,9 +1366,14 @@ if ($platform =~ m/linux-gnu/)
@@ -1313,9 +1367,14 @@ if ($platform =~ m/linux-gnu/)
$SOLARINC .= $STLPORT_inc_stlport;
}
@ -138,7 +138,7 @@
#include system dependent Java include directory
if (!($JDK eq "gcj"))
@@ -1331,6 +1390,10 @@ if ($platform =~ m/linux-gnu/)
@@ -1332,6 +1391,10 @@ if ($platform =~ m/linux-gnu/)
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
@ -149,7 +149,7 @@
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
}
@@ -1343,7 +1406,7 @@ if ($platform =~ m/linux-gnu/)
@@ -1344,7 +1407,7 @@ if ($platform =~ m/linux-gnu/)
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
}
#The tail, if needed

624
editors/openoffice/patches/patch-icu_icu-3_6_patch
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-icu_icu-3_6_patch,v 1.2 2007/11/13 09:46:28 robert Exp $
--- icu/icu-3.6.patch.orig.port Tue Jun 5 12:28:49 2007
+++ icu/icu-3.6.patch Mon Nov 5 16:59:57 2007
$OpenBSD: patch-icu_icu-3_6_patch,v 1.3 2007/12/07 11:30:55 robert Exp $
--- icu/icu-3.6.patch.orig.port Thu Dec 6 16:18:35 2007
+++ icu/icu-3.6.patch Thu Dec 6 16:20:25 2007
@@ -1,5 +1,5 @@
*** misc/icu/source/common/putil.c Mon Jul 31 20:14:28 2006
---- misc/build/icu/source/common/putil.c Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/common/putil.c Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/common/putil.c Tue Sep 18 19:30:30 2007
+--- misc/build/icu/source/common/putil.c Thu Dec 6 16:19:01 2007
***************
*** 48,54 ****
#endif
@ -12,185 +12,139 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.2 2007/11/13 09:46:28 robert Exp $
#endif
*** misc/icu/source/common/unicode/pwin32.h Tue Aug 29 23:34:38 2006
---- misc/build/icu/source/common/unicode/pwin32.h Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/common/unicode/pwin32.h Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/common/unicode/pwin32.h Tue Sep 18 19:30:30 2007
+--- misc/build/icu/source/common/unicode/pwin32.h Thu Dec 6 16:19:01 2007
***************
*** 266,273 ****
--- 266,278 ----
@@ -37,7 +37,7 @@
@@ -37,10 +37,10 @@
/*===========================================================================*/
/* Code alignment and C function inlining */
*** misc/icu/source/common/unicode/rbbi.h Fri Aug 11 07:46:40 2006
---- misc/build/icu/source/common/unicode/rbbi.h Tue Sep 18 19:35:01 2007
+--- misc/build/icu/source/common/unicode/rbbi.h Thu Dec 6 16:19:01 2007
***************
-*** 611,616 ****
---- 611,617 ----
+*** 611,622 ****
+--- 611,624 ----
virtual int32_t getBreakType() const;
#endif
@@ -48,9 +48,6 @@
/**
* Set the type of the break iterator.
* @internal
-***************
-*** 617,622 ****
---- 618,624 ----
*/
virtual void setBreakType(int32_t type);
@@ -59,7 +56,7 @@
* Common initialization function, used by constructors and bufferClone.
* (Also used by DictionaryBasedBreakIterator::createBufferClone().)
*** misc/icu/source/common/unicode/umachine.h Tue Feb 7 02:54:16 2006
---- misc/build/icu/source/common/unicode/umachine.h Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/common/unicode/umachine.h Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/common/unicode/umachine.h Tue Sep 18 19:30:30 2007
+--- misc/build/icu/source/common/unicode/umachine.h Thu Dec 6 16:19:01 2007
***************
*** 322,328 ****
*/
@@ -55,8 +55,112 @@
typedef wchar_t UChar;
@@ -78,7 +75,7 @@
#else
typedef uint16_t UChar;
+*** misc/icu/source/common/unicode/unistr.h Tue Aug 29 23:52:50 2006
+--- misc/build/icu/source/common/unicode/unistr.h Mon Nov 5 16:58:53 2007
+***************
+*** 3280,3286 ****
+ //========================================
+ inline int8_t
+ UnicodeString::doCompare(int32_t start,
+! int32_t length,
+ const UnicodeString& srcText,
+ int32_t srcStart,
+ int32_t srcLength) const
+--- 3280,3286 ----
+ //========================================
+ inline int8_t
+ UnicodeString::doCompare(int32_t start,
+! int32_t _length,
+ const UnicodeString& srcText,
+ int32_t srcStart,
+ int32_t srcLength) const
+***************
+*** 3289,3295 ****
+ return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
+ } else {
+ srcText.pinIndices(srcStart, srcLength);
+! return doCompare(start, length, srcText.fArray, srcStart, srcLength);
+ }
+ }
+
+--- 3289,3295 ----
+ return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
+ } else {
+ srcText.pinIndices(srcStart, srcLength);
+! return doCompare(start, _length, srcText.fArray, srcStart, srcLength);
+ }
+ }
+
+***************
+*** 3374,3380 ****
+
+ inline int8_t
+ UnicodeString::doCompareCodePointOrder(int32_t start,
+! int32_t length,
+ const UnicodeString& srcText,
+ int32_t srcStart,
+ int32_t srcLength) const
+--- 3374,3380 ----
+
+ inline int8_t
+ UnicodeString::doCompareCodePointOrder(int32_t start,
+! int32_t _length,
+ const UnicodeString& srcText,
+ int32_t srcStart,
+ int32_t srcLength) const
+***************
+*** 3383,3389 ****
+ return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
+ } else {
+ srcText.pinIndices(srcStart, srcLength);
+! return doCompareCodePointOrder(start, length, srcText.fArray, srcStart, srcLength);
+ }
+ }
+
+--- 3383,3389 ----
+ return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
+ } else {
+ srcText.pinIndices(srcStart, srcLength);
+! return doCompareCodePointOrder(start, _length, srcText.fArray, srcStart, srcLength);
+ }
+ }
+
+***************
+*** 3435,3441 ****
+
+ inline int8_t
+ UnicodeString::doCaseCompare(int32_t start,
+! int32_t length,
+ const UnicodeString &srcText,
+ int32_t srcStart,
+ int32_t srcLength,
+--- 3435,3441 ----
+
+ inline int8_t
+ UnicodeString::doCaseCompare(int32_t start,
+! int32_t _length,
+ const UnicodeString &srcText,
+ int32_t srcStart,
+ int32_t srcLength,
+***************
+*** 3445,3451 ****
+ return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
+ } else {
+ srcText.pinIndices(srcStart, srcLength);
+! return doCaseCompare(start, length, srcText.fArray, srcStart, srcLength, options);
+ }
+ }
+
+--- 3445,3451 ----
+ return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
+ } else {
+ srcText.pinIndices(srcStart, srcLength);
+! return doCaseCompare(start, _length, srcText.fArray, srcStart, srcLength, options);
+ }
+ }
+
*** misc/icu/source/common/unicode/unistr.h Tue Aug 29 23:52:50 2006
---- misc/build/icu/source/common/unicode/unistr.h Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/common/unicode/unistr.h Thu Dec 6 16:19:01 2007
***************
*** 3280,3286 ****
//========================================
@@ -182,7 +179,7 @@
}
*** misc/icu/source/common/unicode/ustring.h Tue Aug 29 23:52:50 2006
---- misc/build/icu/source/common/unicode/ustring.h Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/common/unicode/ustring.h Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/common/unicode/ustring.h Tue Sep 18 19:30:30 2007
+--- misc/build/icu/source/common/unicode/ustring.h Thu Dec 6 16:19:01 2007
***************
*** 918,924 ****
* </pre>
@@ -75,7 +179,7 @@
@@ -201,7 +198,7 @@
/**@stable ICU 2.0 */
# define U_STRING_INIT(var, cs, length)
*** misc/icu/source/config/mh-darwin Wed Feb 1 08:52:42 2006
---- misc/build/icu/source/config/mh-darwin Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/config/mh-darwin Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/config/mh-darwin Tue Sep 18 19:30:30 2007
+--- misc/build/icu/source/config/mh-darwin Thu Dec 6 16:19:01 2007
***************
*** 25,31 ****
SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
@@ -94,7 +198,7 @@
@@ -220,7 +217,7 @@
## Compiler switch to embed a runtime search path
LD_RPATH=
*** misc/icu/source/config/mh-irix Thu Mar 23 19:51:52 2006
---- misc/build/icu/source/config/mh-irix Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/config/mh-irix Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/config/mh-irix Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/config/mh-irix Thu Dec 6 16:19:01 2007
***************
*** 23,28 ****
--- 23,31 ----
@@ -108,7 +212,7 @@
@@ -234,7 +231,7 @@
THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
LIBCPPFLAGS =
*** misc/icu/source/config/mh-linux Thu Mar 23 19:51:52 2006
---- misc/build/icu/source/config/mh-linux Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/config/mh-linux Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/config/mh-linux Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/config/mh-linux Thu Dec 6 16:19:01 2007
***************
*** 20,25 ****
--- 20,32 ----
@@ -126,7 +230,7 @@
@@ -252,7 +249,7 @@
LDFLAGSICUDT=-nodefaultlibs -nostdlib
*** misc/icu/source/config/mh-mingw Tue Aug 15 10:24:14 2006
---- misc/build/icu/source/config/mh-mingw Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/config/mh-mingw Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/config/mh-mingw Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/config/mh-mingw Thu Dec 6 16:19:01 2007
***************
*** 54,59 ****
--- 54,62 ----
@@ -157,7 +261,7 @@
@@ -283,9 +280,9 @@
CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
*** misc/icu/source/config/mh-solaris Fri Feb 24 20:31:14 2006
---- misc/build/icu/source/config/mh-solaris Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/config/mh-solaris Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/config/mh-solaris Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/config/mh-solaris Thu Dec 6 16:19:01 2007
***************
*** 18,33 ****
-*** 18,34 ****
+*** 18,33 ****
@@ -201,8 +305,27 @@
## Commands to link
## For Sun Workshop, use CC to link to bring in C++ runtime
@@ -302,8 +299,7 @@
#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
- ## Compiler switch to embed a library name
---- 18,42 ----
+--- 18,41 ----
## Commands to link
## For Sun Workshop, use CC to link to bring in C++ runtime
@@ -318,19 +314,37 @@
## Compiler switch to embed a runtime search path
LD_RPATH= -R
LD_RPATH_PRE=
-
++
+ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
+ ENABLE_RPATH=YES
+ RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN'
+
+ #SH# ENABLE_RPATH=YES
+ #SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'"
-+
+
#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
- ## Compiler switch to embed a library name
+*** misc/icu/source/configure Tue Aug 15 10:24:14 2006
+--- misc/build/icu/source/configure Mon Nov 5 16:58:53 2007
+--- misc/build/icu/source/configure Thu Dec 6 16:20:07 2007
+***************
+*** 4400,4406 ****
+
@ -209,149 +163,255 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.2 2007/11/13 09:46:28 robert Exp $
+ GENCCODE_ASSEMBLY="-a gcc"
+ fi ;;
*** misc/icu/source/data/Makefile.in Sat Aug 12 00:22:24 2006
---- misc/build/icu/source/data/Makefile.in Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/data/Makefile.in Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/data/Makefile.in Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/data/Makefile.in Thu Dec 6 16:19:01 2007
***************
*** 344,350 ****
ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
@@ -221,7 +344,7 @@
@@ -349,9 +363,9 @@
@echo "$@" > $@
endif
*** misc/icu/source/i18n/windtfmt.cpp Tue Aug 15 08:48:02 2006
---- misc/build/icu/source/i18n/windtfmt.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/i18n/windtfmt.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/i18n/windtfmt.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/i18n/windtfmt.cpp Thu Dec 6 16:19:01 2007
***************
*** 232,249 ****
-*** 232,238 ****
+*** 232,249 ****
UChar stackBuffer[STACK_BUFFER_SIZE];
@@ -301,7 +424,7 @@
UChar *buffer = stackBuffer;
@@ -359,16 +373,6 @@
if (result == 0) {
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
---- 232,238 ----
- UChar stackBuffer[STACK_BUFFER_SIZE];
- UChar *buffer = stackBuffer;
-
-! result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-
- if (result == 0) {
- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-***************
-*** 239,249 ****
int newLength = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, NULL, 0);
buffer = NEW_ARRAY(UChar, newLength);
@@ -380,7 +384,14 @@
if (buffer != stackBuffer) {
DELETE_ARRAY(buffer);
---- 239,249 ----
+--- 232,249 ----
+ UChar stackBuffer[STACK_BUFFER_SIZE];
+ UChar *buffer = stackBuffer;
+
+! result = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
+
+ if (result == 0) {
+ if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
int newLength = GetDateFormatW(fLCID, dfFlags[fDateStyle - kDateOffset], st, NULL, NULL, 0);
buffer = NEW_ARRAY(UChar, newLength);
@@ -393,7 +404,7 @@
if (buffer != stackBuffer) {
DELETE_ARRAY(buffer);
***************
-*** 258,264 ****
+*** 258,275 ****
UChar stackBuffer[STACK_BUFFER_SIZE];
UChar *buffer = stackBuffer;
@@ -401,16 +412,6 @@
if (result == 0) {
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
---- 258,264 ----
- UChar stackBuffer[STACK_BUFFER_SIZE];
- UChar *buffer = stackBuffer;
-
-! result = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
-
- if (result == 0) {
- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-***************
-*** 265,275 ****
int newLength = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, NULL, 0);
buffer = NEW_ARRAY(UChar, newLength);
@@ -422,7 +423,14 @@
if (buffer != stackBuffer) {
DELETE_ARRAY(buffer);
---- 265,275 ----
+--- 258,275 ----
+ UChar stackBuffer[STACK_BUFFER_SIZE];
+ UChar *buffer = stackBuffer;
+
+! result = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, reinterpret_cast<LPWSTR>(buffer), STACK_BUFFER_SIZE);
+
+ if (result == 0) {
+ if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
int newLength = GetTimeFormatW(fLCID, tfFlags[fTimeStyle], st, NULL, NULL, 0);
buffer = NEW_ARRAY(UChar, newLength);
@@ -435,7 +443,7 @@
if (buffer != stackBuffer) {
DELETE_ARRAY(buffer);
*** misc/icu/source/i18n/winnmfmt.cpp Thu Aug 17 07:21:06 2006
---- misc/build/icu/source/i18n/winnmfmt.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/i18n/winnmfmt.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/i18n/winnmfmt.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/i18n/winnmfmt.cpp Thu Dec 6 16:19:01 2007
***************
*** 86,95 ****
GetLocaleInfoA(lcid, LOCALE_SGROUPING, buf, 10);
@@ -439,7 +562,7 @@
@@ -573,7 +581,7 @@
if (buffer != stackBuffer) {
DELETE_ARRAY(buffer);
*** misc/icu/source/layout/CoverageTables.cpp Sat May 8 01:28:42 2004
---- misc/build/icu/source/layout/CoverageTables.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/CoverageTables.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/CoverageTables.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/CoverageTables.cpp Thu Dec 6 16:19:01 2007
***************
*** 44,49 ****
--- 44,53 ----
@@ -454,7 +577,7 @@
@@ -588,7 +596,7 @@
le_uint16 probe = power;
le_uint16 index = 0;
*** misc/icu/source/layout/DeviceTables.cpp Fri Jan 14 18:25:12 2005
---- misc/build/icu/source/layout/DeviceTables.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/DeviceTables.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/DeviceTables.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/DeviceTables.cpp Thu Dec 6 16:19:01 2007
***************
*** 22,28 ****
le_uint16 format = SWAPW(deltaFormat) - 1;
@@ -474,7 +597,7 @@
@@ -608,7 +616,7 @@
le_uint16 bits = fieldBits[format];
le_uint16 count = 16 / bits;
*** misc/icu/source/layout/GXLayoutEngine.cpp Fri Sep 2 20:22:10 2005
---- misc/build/icu/source/layout/GXLayoutEngine.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/GXLayoutEngine.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/GXLayoutEngine.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/GXLayoutEngine.cpp Thu Dec 6 16:19:01 2007
***************
*** 39,45 ****
return 0;
@@ -493,7 +616,7 @@
@@ -627,7 +635,7 @@
if (LE_FAILURE(success)) {
return 0;
*** misc/icu/source/layout/IndicClassTables.cpp Wed Aug 23 02:12:40 2006
---- misc/build/icu/source/layout/IndicClassTables.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/IndicClassTables.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/IndicClassTables.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/IndicClassTables.cpp Thu Dec 6 16:19:01 2007
***************
*** 94,100 ****
_dr, _db, _db, _db, _db, _xx, _xx, _l1, _dl, _xx, _xx, _s1, _s2, _vr, _xx, _xx, // 09C0 - 09CF
@@ -512,14 +635,14 @@
static const IndicClassTable::CharClass punjCharClasses[] =
***************
-*** 120,125 ****
---- 120,138 ----
+*** 120,127 ****
+--- 120,140 ----
_iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0AE0 - 0AEF
};
+ #if 1
-+ static const IndicClassTable::CharClass oryaCharClasses[] =
-+ {
+ static const IndicClassTable::CharClass oryaCharClasses[] =
+ {
+ _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, /* 0B00 - 0B0F */
+ _iv, _xx, _xx, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _ct, _bb, /* 0B10 - 0B1F */
+ _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _pb, /* 0B20 - 0B2F */
@@ -530,9 +653,11 @@
+ _xx, _bb /* 0B70 - 0B71 */
+ };
+ #else
- static const IndicClassTable::CharClass oryaCharClasses[] =
- {
++ static const IndicClassTable::CharClass oryaCharClasses[] =
++ {
_xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, // 0B00 - 0B0F
+ _iv, _xx, _xx, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, // 0B10 - 0B1F
+ _ct, _ct, _ct, _ct, _bb, _ct, _ct, _ct, _bb, _xx, _ct, _ct, _bb, _bb, _bb, _pb, // 0B20 - 0B2F
***************
*** 131,136 ****
--- 144,150 ----
@@ -627,7 +752,7 @@
@@ -763,7 +771,7 @@
//
// IndicClassTable addresses
*** misc/icu/source/layout/IndicReordering.cpp Tue Apr 25 21:08:12 2006
---- misc/build/icu/source/layout/IndicReordering.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/IndicReordering.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/IndicReordering.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/IndicReordering.cpp Thu Dec 6 16:19:01 2007
***************
*** 50,55 ****
--- 50,63 ----
@@ -732,7 +857,7 @@
@@ -845,11 +853,13 @@
{-1, -1, -1, -1, -1, -1, 3, 2, -1, -1, -1, -1, -1, -1, -1}, // 7 - consonant virama ZWJ, consonant ZWJ virama
{-1, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1}, // 8 - independent vowels that can take a virama
***************
-*** 629,634 ****
---- 651,670 ----
+*** 627,632 ****
+--- 649,668 ----
+ // write base consonant
+ for (i = baseConsonant; i < bcSpan; i += 1) {
output.writeChar(chars[i], i, tagArray4);
- }
-
++ }
++
+ /* for the special conjuction of Cons+0x0d4d+0x0d31 or Cons+0x0d4d+0x0d30 of Malayalam */
+ if ((baseConsonant - 2 >= 0) &&
+ (chars[baseConsonant - 1] == 0x0d4d) &&
@@ -862,13 +872,11 @@
+
+ if (mpreFixups)
+ mpreFixups->reduce();
-+ }
-+
+ }
+
if ((classTable->scriptFlags & SF_MATRAS_AFTER_BASE) != 0) {
- output.writeMbelow();
- output.writeSMbelow(); // FIXME: there are no SMs in these scripts...
*** misc/icu/source/layout/LESwaps.h Thu Jun 23 00:39:36 2005
---- misc/build/icu/source/layout/LESwaps.h Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/LESwaps.h Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/LESwaps.h Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/LESwaps.h Thu Dec 6 16:19:01 2007
***************
*** 2,7 ****
--- 2,8 ----
@@ -808,7 +933,7 @@
@@ -916,11 +924,12 @@
#if U_IS_BIG_ENDIAN
#define SWAPW(value) (value)
***************
-*** 49,54 ****
---- 59,83 ----
+*** 48,53 ****
+--- 58,82 ----
+ #else
#define SWAPL(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapLong(value))
#endif
-
++
+ #else // ALLOW_UNALIGNED_HACK
+
+ #define SWAPW(rValue) loadBigEndianWord(reinterpret_cast<const le_uint16&>(rValue))
@@ -939,12 +948,11 @@
+ }
+
+ #endif // ALLOW_UNALIGNED_HACK
-+
+
/**
* This class is used to access data which stored in big endian order
- * regardless of the conventions of the platform. It has been designed
*** misc/icu/source/layout/MPreFixups.cpp Sat May 8 01:28:44 2004
---- misc/build/icu/source/layout/MPreFixups.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/MPreFixups.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/MPreFixups.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/MPreFixups.cpp Thu Dec 6 16:19:01 2007
***************
*** 40,45 ****
--- 40,51 ----
@@ -825,7 +950,7 @@
@@ -961,7 +969,7 @@
{
for (le_int32 fixup = 0; fixup < fFixupCount; fixup += 1) {
*** misc/icu/source/layout/MPreFixups.h Mon Apr 12 20:51:32 2004
---- misc/build/icu/source/layout/MPreFixups.h Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/layout/MPreFixups.h Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/layout/MPreFixups.h Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/layout/MPreFixups.h Thu Dec 6 16:19:01 2007
***************
*** 31,36 ****
--- 31,38 ----
@@ -838,7 +963,7 @@
@@ -974,10 +982,10 @@
FixupData *fFixupData;
le_int32 fFixupCount;
*** misc/icu/source/stubdata/Makefile.in Fri Dec 2 11:21:34 2005
---- misc/build/icu/source/stubdata/Makefile.in Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/stubdata/Makefile.in Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/stubdata/Makefile.in Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/stubdata/Makefile.in Thu Dec 6 16:19:01 2007
***************
*** 25,30 ****
--- 25,36 ----
@@ -854,8 +979,60 @@
-*** 25,31 ****
---- 25,37 ----
+*** 25,30 ****
+--- 25,36 ----
## Target information
TARGET_STUBNAME=$(DATA_STUBNAME)
@@ -985,14 +993,65 @@
+ FINAL_SO_TARGET=$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)$(STUB_SUFFIX).$(SO)
+ %$(STUB_SUFFIX).$(SO): %$(SO_TARGET_VERSION_MAJOR)$(STUB_SUFFIX).$(SO)
+ $(RM) $@ && ln $< $@
-
-+ endif
+
++ endif
+
ifneq ($(ENABLE_STATIC),)
TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
- endif
+*** misc/icu/source/stubdata/stubdata.c Wed Nov 21 03:28:14 2001
+--- misc/build/icu/source/stubdata/stubdata.c Mon Nov 5 16:59:05 2007
+--- misc/build/icu/source/stubdata/stubdata.c Thu Dec 6 16:19:01 2007
+***************
+*** 28,41 ****
+ UDataInfo info;
@ -375,7 +435,7 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.2 2007/11/13 09:46:28 robert Exp $
+ const struct {
+ const char *const name;
+ const void *const data;
+! } toc[537]; /* set to real toc size to avoid symbol size mismatch runtime link errors */
+! } toc[537]; /* set to real toc size to avoid symbol size mismatch runtime link errors */
+ } ICU_Data_Header;
+
+ U_EXPORT const ICU_Data_Header U_ICUDATA_ENTRY_POINT = {
@ -395,160 +455,52 @@ $OpenBSD: patch-icu_icu-3_6_patch,v 1.2 2007/11/13 09:46:28 robert Exp $
+ 0, /* count */
+ 0, /* Reserved */
+ { /* TOC structure */
+! {
+! {0, 0} /* name and data entries. Count says there are none, */
+! {
+! { 0 , 0 } /* name and data entries. Count says there are none, */
+ /* but put one in just in case. */
+! }
+! }
+ }
+ };
+
*** misc/icu/source/test/intltest/loctest.cpp Thu Jul 6 03:50:04 2006
---- misc/build/icu/source/test/intltest/loctest.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/test/intltest/loctest.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/test/intltest/loctest.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/test/intltest/loctest.cpp Thu Dec 6 16:19:01 2007
***************
*** 4,9 ****
--- 4,10 ----
@@ -867,7 +1044,7 @@
@@ -1004,7 +1063,7 @@
#include "unicode/decimfmt.h"
#include "unicode/ucurr.h"
*** misc/icu/source/test/intltest/tsputil.cpp Wed Jul 19 00:18:10 2006
---- misc/build/icu/source/test/intltest/tsputil.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/test/intltest/tsputil.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/test/intltest/tsputil.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/test/intltest/tsputil.cpp Thu Dec 6 16:19:01 2007
***************
*** 4,9 ****
--- 4,10 ----
@@ -879,7 +1056,7 @@
@@ -1016,7 +1075,7 @@
#include <float.h> // DBL_MAX, DBL_MIN
*** misc/icu/source/test/intltest/uobjtest.cpp Thu Mar 23 01:54:12 2006
---- misc/build/icu/source/test/intltest/uobjtest.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/test/intltest/uobjtest.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/test/intltest/uobjtest.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/test/intltest/uobjtest.cpp Thu Dec 6 16:19:01 2007
***************
*** 4,9 ****
--- 4,10 ----
@@ -891,7 +1068,7 @@
@@ -1028,7 +1087,7 @@
#include "cmemory.h" // UAlignedMemory
#include <string.h>
*** misc/icu/source/test/intltest/ustrtest.cpp Tue Dec 28 22:13:54 2004
---- misc/build/icu/source/test/intltest/ustrtest.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/test/intltest/ustrtest.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/test/intltest/ustrtest.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/test/intltest/ustrtest.cpp Thu Dec 6 16:19:01 2007
***************
*** 4,9 ****
--- 4,10 ----
@@ -903,7 +1080,7 @@
@@ -1040,7 +1099,7 @@
#include "unicode/unistr.h"
#include "unicode/uchar.h"
*** misc/icu/source/tools/icupkg/icupkg.cpp Fri Jul 21 23:17:52 2006
---- misc/build/icu/source/tools/icupkg/icupkg.cpp Mon Apr 30 17:32:58 2007
+--- misc/build/icu/source/tools/icupkg/icupkg.cpp Mon Nov 5 16:58:53 2007
---- misc/build/icu/source/tools/icupkg/icupkg.cpp Tue Sep 18 19:30:31 2007
+--- misc/build/icu/source/tools/icupkg/icupkg.cpp Thu Dec 6 16:19:01 2007
***************
*** 332,337 ****
--- 332,341 ----
@@ -917,107 +1094,3 @@
extern int
main(int argc, char *argv[]) {
const char *pname, *sourcePath, *destPath, *inFilename, *outFilename, *outComment;
-*** misc/icu/source/common/unicode/unistr.h 2007-05-20 08:40:31.000000000 -0400
---- misc/build/icu/source/common/unicode/unistr.h 2007-05-20 08:42:01.000000000 -0400
-***************
-*** 3280,3286 ****
- //========================================
- inline int8_t
- UnicodeString::doCompare(int32_t start,
-! int32_t length,
- const UnicodeString& srcText,
- int32_t srcStart,
- int32_t srcLength) const
---- 3280,3286 ----
- //========================================
- inline int8_t
- UnicodeString::doCompare(int32_t start,
-! int32_t _length,
- const UnicodeString& srcText,
- int32_t srcStart,
- int32_t srcLength) const
-***************
-*** 3289,3295 ****
- return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
- } else {
- srcText.pinIndices(srcStart, srcLength);
-! return doCompare(start, length, srcText.fArray, srcStart, srcLength);
- }
- }
-
---- 3289,3295 ----
- return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
- } else {
- srcText.pinIndices(srcStart, srcLength);
-! return doCompare(start, _length, srcText.fArray, srcStart, srcLength);
- }
- }
-
-***************
-*** 3374,3380 ****
-
- inline int8_t
- UnicodeString::doCompareCodePointOrder(int32_t start,
-! int32_t length,
- const UnicodeString& srcText,
- int32_t srcStart,
- int32_t srcLength) const
---- 3374,3380 ----
-
- inline int8_t
- UnicodeString::doCompareCodePointOrder(int32_t start,
-! int32_t _length,
- const UnicodeString& srcText,
- int32_t srcStart,
- int32_t srcLength) const
-***************
-*** 3383,3389 ****
- return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
- } else {
- srcText.pinIndices(srcStart, srcLength);
-! return doCompareCodePointOrder(start, length, srcText.fArray, srcStart, srcLength);
- }
- }
-
---- 3383,3389 ----
- return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
- } else {
- srcText.pinIndices(srcStart, srcLength);
-! return doCompareCodePointOrder(start, _length, srcText.fArray, srcStart, srcLength);
- }
- }
-
-***************
-*** 3435,3441 ****
-
- inline int8_t
- UnicodeString::doCaseCompare(int32_t start,
-! int32_t length,
- const UnicodeString &srcText,
- int32_t srcStart,
- int32_t srcLength,
---- 3435,3441 ----
-
- inline int8_t
- UnicodeString::doCaseCompare(int32_t start,
-! int32_t _length,
- const UnicodeString &srcText,
- int32_t srcStart,
- int32_t srcLength,
-***************
-*** 3445,3451 ****
- return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
- } else {
- srcText.pinIndices(srcStart, srcLength);
-! return doCaseCompare(start, length, srcText.fArray, srcStart, srcLength, options);
- }
- }
-
---- 3445,3451 ----
- return (int8_t)!isBogus(); // 0 if both are bogus, 1 otherwise
- } else {
- srcText.pinIndices(srcStart, srcLength);
-! return doCaseCompare(start, _length, srcText.fArray, srcStart, srcLength, options);
- }
- }
-

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.10 2007/11/13 09:46:28 robert Exp $
--- instsetoo_native/util/makefile.mk.orig.port Thu Oct 25 12:10:41 2007
+++ instsetoo_native/util/makefile.mk Thu Oct 25 12:12:29 2007
$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.11 2007/12/07 11:30:55 robert Exp $
--- instsetoo_native/util/makefile.mk.orig.port Thu Nov 1 12:03:38 2007
+++ instsetoo_native/util/makefile.mk Thu Dec 6 16:36:09 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.10 2007/11/13 09:46:28 rob
openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
@@ -222,7 +224,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
@@ -226,7 +228,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
openoffice_% :
.ENDIF # "$(PKGFORMAT)"!=""
.IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable"
@ -34,7 +34,7 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.10 2007/11/13 09:46:28 rob
$(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
@@ -511,11 +513,11 @@ hack_msitemplates .PHONY:
@@ -525,11 +527,11 @@ hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-$(MKDIRHIER) $(MSIURETEMPLATEDIR)

14
editors/openoffice/patches/patch-sw_source_core_unocore_unochart_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sw_source_core_unocore_unochart_cxx,v 1.1 2007/11/13 09:46:28 robert Exp $
--- sw/source/core/unocore/unochart.cxx.orig.port Sun Oct 28 00:17:02 2007
+++ sw/source/core/unocore/unochart.cxx Sun Oct 28 00:07:32 2007
@@ -1638,7 +1638,7 @@ void SwChartDataProvider::InvalidateTable( const SwTab
$OpenBSD: patch-sw_source_core_unocore_unochart_cxx,v 1.2 2007/12/07 11:30:55 robert Exp $
--- sw/source/core/unocore/unochart.cxx.orig.port Fri Oct 26 16:59:49 2007
+++ sw/source/core/unocore/unochart.cxx Thu Dec 6 16:36:13 2007
@@ -1640,7 +1640,7 @@ void SwChartDataProvider::InvalidateTable( const SwTab
Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{
@ -10,7 +10,7 @@ $OpenBSD: patch-sw_source_core_unocore_unochart_cxx,v 1.1 2007/11/13 09:46:28 ro
if (xRef.is())
{
// mark the sequence as 'dirty' and notify listeners
@@ -1671,7 +1671,7 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable
@@ -1673,7 +1673,7 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable
sal_Bool bNowEmpty = sal_False;
// check if weak reference is still valid...
@ -19,7 +19,7 @@ $OpenBSD: patch-sw_source_core_unocore_unochart_cxx,v 1.1 2007/11/13 09:46:28 ro
if (xRef.is())
{
// then delete that table box (check if implementation cursor needs to be adjusted)
@@ -1713,7 +1713,7 @@ void SwChartDataProvider::DisposeAllDataSequences( con
@@ -1715,7 +1715,7 @@ void SwChartDataProvider::DisposeAllDataSequences( con
Set_DataSequenceRef_t::iterator aEndIt( rSet.end() );
while (aIt != aEndIt)
{
@ -28,7 +28,7 @@ $OpenBSD: patch-sw_source_core_unocore_unochart_cxx,v 1.1 2007/11/13 09:46:28 ro
if (xRef.is())
{
xRef->dispose();
@@ -1792,7 +1792,7 @@ void SwChartDataProvider::AddRowCols(
@@ -1794,7 +1794,7 @@ void SwChartDataProvider::AddRowCols(
Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2007/11/13 09:46:28 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2007/12/07 11:30:55 robert Exp $
@pkgpath editors/openoffice
%%SHARED%%
bin/sbase
@ -1349,10 +1349,12 @@ openoffice/share/dict/ooo/README_hyph_de_DE.txt
openoffice/share/dict/ooo/README_hyph_et_EE.txt
openoffice/share/dict/ooo/README_hyph_hu_HU.txt
openoffice/share/dict/ooo/README_hyph_lt_LT.txt
openoffice/share/dict/ooo/README_hyph_pl_PL.txt
openoffice/share/dict/ooo/README_hyph_sl_SI.txt
openoffice/share/dict/ooo/README_it_IT.txt
openoffice/share/dict/ooo/README_lt_LT.txt
openoffice/share/dict/ooo/README_nl_NL.txt
openoffice/share/dict/ooo/README_pl_PL.txt
openoffice/share/dict/ooo/README_pt_BR.txt
openoffice/share/dict/ooo/README_sk_SK.txt
openoffice/share/dict/ooo/README_sl_SI.txt
@ -1390,6 +1392,7 @@ openoffice/share/dict/ooo/hyph_hu_HU.dic
openoffice/share/dict/ooo/hyph_it_IT.dic
openoffice/share/dict/ooo/hyph_lt_LT.dic
openoffice/share/dict/ooo/hyph_nl_NL.dic
openoffice/share/dict/ooo/hyph_pl_PL.dic
openoffice/share/dict/ooo/hyph_ru_RU.dic
openoffice/share/dict/ooo/hyph_sl_SI.dic
openoffice/share/dict/ooo/it_IT.aff
@ -1398,6 +1401,8 @@ openoffice/share/dict/ooo/lt_LT.aff
openoffice/share/dict/ooo/lt_LT.dic
openoffice/share/dict/ooo/nl_NL.aff
openoffice/share/dict/ooo/nl_NL.dic
openoffice/share/dict/ooo/pl_PL.aff
openoffice/share/dict/ooo/pl_PL.dic
openoffice/share/dict/ooo/pt_BR.aff
openoffice/share/dict/ooo/pt_BR.dic
openoffice/share/dict/ooo/sk_SK.aff