--- a/icu/icu.copyright Mon Mar 21 16:06:50 2011 +0100
+++ b/icu/icu.copyright Fri Mar 25 10:41:20 2011 +0100
@@ -1,5 +1,3 @@
-Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-
This package may include technology covered by one or more of the
following additional notices:
@@ -38,5 +36,18 @@
of the copyright holder.
--------------------------------------------------------------------------------
+
+Unicode Data Files:
+
+Copyright C 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+
+--------------------------------------------------------------------------------
+
All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- a/icu/icu.spec Mon Mar 21 16:06:50 2011 +0100
+++ b/icu/icu.spec Fri Mar 25 10:41:20 2011 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
# Copyright (C) 2000-2005, International Business Machines
# Corporation and others. All Rights Reserved.
#
@@ -11,54 +11,42 @@
%define src_name icu
#%define src_url http://download.icu-project.org/files/icu4c
%define svn_url http://source.icu-project.org/repos/icu/icu
-#%define pkgversion 4_0_1
-%define svn_pkgversion 4-0-1
+%define pkgversion 4_6
+%define svn_pkgversion 4-6
+%define majorminor 4.6
%include Solaris.inc
Name: SUNWicu
SUNW_BaseDir: %{_basedir}
-Version: 4.0.1
+Version: 4.6.1
Release: 1
Summary: International Components for Unicode
-Copyright: X License
+Copyright: X License, Unicode License
IPS_Package_Name: library/icu
IPS_Component_Version: %{ipscompverdefault}
Meta(info.classification): %{ipsclass_sys_i18n}
#Source: %{src_url}/%{version}/icu4c-%{pkgversion}-src.tgz
Source1: old_libs.tar.gz
+Source2: libicui18n.3lib
+Source3: libicuuc.3lib
+Source4: libiculx.3lib
+Source5: libicule.3lib
+Source6: libicudata.3lib
+Source7: libicutu.3lib
+Source8: libicuio.3lib
+
#Sun patches
Patch0: source_data_mappings_johab.ucm.patch
-#Patch1: source_common_putil.c.patch
-#Patch2: source_common_ucase.c.patch
-#Patch3: source_common_uchar.c.patch
Patch4: source_common_ucnv2022.c.patch
Patch5: source_common_ucnv_u7.c.patch
-#Patch6: source_common_unicode_utypes.h.patch
-#Patch7: source_common_unicode_uversion.h.patch
-#Patch8: source_config_mh-solaris.patch
Patch6: source_config_mh_solaris.patch
Patch10: source_data_mappings_convrtrs.txt.patch
Patch11: source_data_mappings_ucmfiles.mk.patch
-Patch12: source_data_misc_zoneinfo.txt.patch
-Patch14: source_icudefs.mk.in.patch
-Patch15: source_io_Makefile.in.patch
-#Patch16: source_test_cintltst_udatatst.c.patch
-Patch17: source_test_intltest_regextst.cpp.patch
-Patch18: source_test_intltest_regextst.h.patch
-Patch19: source_tools_pkgdata_dllmode.c.patch
-#Patch20: source_i18n_Makefile.in.patch
Patch21: source_runConfigureICU.patch
-#Patch22: source_layoutex_Makefile.in.patch
-#Patch23: source_layout_Makefile.in.patch
-#Patch24: source_common_Makefile.in.patch
#patches 25, 26 align tests to previous Oracle modifications
Patch25: source_common_testdata_conversion.txt.patch
Patch26: source_test_ccapitst.c.patch
-#Studio 12.1 changed behaviour of 'CC -m64', this patch is needed for proper detection of 64 bit abolities of the compiler
-Patch27: source_configure_64.patch
-#backport upstream fix for http://bugs.icu-project.org/trac/ticket/6814 (australian timezone test failure)
-Patch28: source_test_intltest_tztest.patch
BuildRoot: %{_tmppath}/%{name}-%{version}
SUNW_Copyright: %{src_name}.copyright
@@ -102,12 +90,9 @@
}
}
[ ! -d %{src_name} ] && bunzip2 -c $HOME/packages/SOURCES/%{src_name}-%version.tar.bz2 | tar fxp -
-#Sun patches
+#Oracle patches
cd %{src_name}
%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
%patch4 -p1
%patch5 -p1
%ifarch sparc
@@ -115,26 +100,9 @@
%endif
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch14 -p1
-%patch15 -p1
-#%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-#%patch20 -p1
%patch21 -p1
-#%patch22 -p1
-#%patch23 -p1
-#%patch24 -p1
%patch25 -p1
%patch26 -p1
-%patch27
-%patch28
-
-#cat Makefile.config.in %{PATCH2} > Makefile.config
-#touch Makefile.depend
-
%ifarch amd64 sparcv9
cd ..
@@ -151,10 +119,8 @@
export CXX="${CXX} -norunpath"
export CFLAGS="%optflags"
export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%_ldflags -lCrun"
+export LDFLAGS="%_ldflags -lCrun -lCstd"
-#CFLAGS="%optflags" CXXFLAGS="%cxx_optflags" LDFLAGS="%_ldflags" ./configure --prefix=/usr --sysconfdir=/etc --with-data-packaging=files --enable-shared --enable-static --disable-samples --disable-64-bit-libs
-#./configure --prefix=%{_prefix} --libdir=%{_libdir} --sysconfdir=/etc --with-data-packaging=library --enable-shared --enable-static --disable-samples --disable-64bit-libs
%ifarch i386 amd64
OSTARGET=SolarisX86
%else
@@ -173,16 +139,14 @@
export CXX="${CXX} -norunpath"
export CFLAGS="%optflags"
export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%_ldflags -lCrun"
+export LDFLAGS="%_ldflags -lCrun -lCstd"
-#CFLAGS="%optflags64" CXXFLAGS="%cxx_optflags64" LDFLAGS="%_ldflags" ./configure --prefix=/usr/lib/%{_arch64} --sysconfdir=/etc/%{_arch64} --with-data-packaging=files --enable-shared --enable-static --disable-samples
-#./configure --prefix=%{_prefix}/%{_arch64} --libdir=%{_libdir}/%{_arch64} --sysconfdir=/etc/%{_arch64} --with-data-packaging=library --enable-shared --enable-static --disable-samples
%ifarch i386 amd64
OSTARGET=SolarisX86
%else
OSTARGET=Solaris
%endif
-./runConfigureICU ${OSTARGET} --prefix=%{_prefix}/%{_arch64} --libdir=%{_libdir}/%{_arch64} --sysconfdir=/etc/%{_arch64} --with-data-packaging=library --enable-shared --enable-static --disable-samples
+./runConfigureICU ${OSTARGET} --prefix=%{_prefix}/%{_arch64} --libdir=%{_libdir}/%{_arch64} --sysconfdir=/etc/%{_arch64} --with-data-packaging=library --enable-shared --enable-static --disable-samples --with-library-bits=64
echo 'CPPFLAGS += -DICU_DATA_DIR=\"/usr/share/icu/%{version}\"' >> icudefs.mk
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
@@ -199,7 +163,6 @@
OLD_LIBS=$RPM_BUILD_DIR/%{src_name}-%{version}/old_libs/`uname -p`
cp ${OLD_LIBS}/lib*.so.3 ${RPM_BUILD_ROOT}/%{_libdir}
cp ${OLD_LIBS}/lib*.so.2 ${RPM_BUILD_ROOT}/%{_libdir}
-cp -r ${RPM_BUILD_ROOT}/usr/man ${RPM_BUILD_ROOT}/usr/share/man
mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/icu/4
%ifarch amd64 sparcv9
@@ -219,12 +182,24 @@
rm -rf ${RPM_BUILD_ROOT}/usr/sparcv9
rm -rf ${RPM_BUILD_ROOT}/usr/lib/amd64/icu
rm -rf ${RPM_BUILD_ROOT}/usr/lib/sparcv9/icu
-rm -rf ${RPM_BUILD_ROOT}/usr/share/icu/%{version}/icudt40l
-rm -rf ${RPM_BUILD_ROOT}/usr/share/icu/%{version}/icudt40b
-rm -rf ${RPM_BUILD_ROOT}/usr/share/icu/%{version}/config/*
-rm -rf ${RPM_BUILD_ROOT}/usr/share/icu/%{version}/install-sh
-rm -rf ${RPM_BUILD_ROOT}/usr/share
-rm -rf ${RPM_BUILD_ROOT}/usr/man
+rm -rf ${RPM_BUILD_ROOT}/usr/share/icu
+
+mkdir ${RPM_BUILD_ROOT}/usr/share/man/man1m
+mv ${RPM_BUILD_ROOT}/usr/share/man/man8/genccode.8 ${RPM_BUILD_ROOT}/usr/share/man/man1m/genccode.1m
+mv ${RPM_BUILD_ROOT}/usr/share/man/man8/gencmn.8 ${RPM_BUILD_ROOT}/usr/share/man/man1m/gencmn.1m
+mv ${RPM_BUILD_ROOT}/usr/share/man/man8/gensprep.8 ${RPM_BUILD_ROOT}/usr/share/man/man1m/gensprep.1m
+mv ${RPM_BUILD_ROOT}/usr/share/man/man8/icupkg.8 ${RPM_BUILD_ROOT}/usr/share/man/man1m/icupkg.1m
+rmdir ${RPM_BUILD_ROOT}/usr/share/man/man8
+
+mkdir ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+cp %SOURCE2 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+cp %SOURCE3 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+cp %SOURCE4 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+cp %SOURCE5 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+cp %SOURCE6 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+cp %SOURCE7 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+cp %SOURCE8 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
+
%files
%defattr(-, root, bin)
@@ -240,12 +215,32 @@
%defattr(-, root, bin)
%dir %attr (0755, root, bin) /usr/include/unicode/*.h
%dir %attr (0755, root, bin) /usr/include/layout/*.h
-%dir %attr (0755, root, bin) %{_libdir}/icu/%{version}/Makefile.inc
+%dir %attr (0755, root, bin) %{_libdir}/icu/pkgdata.inc
+%dir %attr (0755, root, bin) %{_libdir}/icu/%{majorminor}/pkgdata.inc
+%dir %attr (0755, root, bin) %{_libdir}/icu/%{majorminor}/Makefile.inc
+
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig/icu-le.pc
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig/icu-io.pc
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig/icu-i18n.pc
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig/icu-uc.pc
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig/icu-lx.pc
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig/icu-le.pc
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig/icu-io.pc
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig/icu-i18n.pc
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig/icu-uc.pc
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig/icu-lx.pc
+%endif
+
%dir %attr (0755, root, bin) /usr/bin/derb
%dir %attr (0755, root, bin) /usr/bin/genbrk
+%dir %attr (0755, root, bin) /usr/bin/gencfu
%dir %attr (0755, root, bin) /usr/bin/gencnval
%dir %attr (0755, root, bin) /usr/bin/genrb
%dir %attr (0755, root, bin) /usr/bin/icu-config
+%dir %attr (0755, root, bin) /usr/bin/icuinfo
%dir %attr (0755, root, bin) /usr/bin/makeconv
%dir %attr (0755, root, bin) /usr/bin/pkgdata
%dir %attr (0755, root, bin) /usr/bin/uconv
@@ -253,13 +248,37 @@
%dir %attr (0755, root, bin) /usr/sbin/genccode
%dir %attr (0755, root, bin) /usr/sbin/gencmn
+%dir %attr (0755, root, bin) /usr/sbin/gennorm2
%dir %attr (0755, root, bin) /usr/sbin/gensprep
-%dir %attr (0755, root, bin) /usr/sbin/genuca
-%dir %attr (0755, root, bin) /usr/sbin/icuswap
%dir %attr (0755, root, bin) /usr/sbin/icupkg
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0444, root, bin) /usr/share/man/man1/derb.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/genbrk.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/gencnval.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/genctd.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/genrb.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/icu-config.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/makeconv.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/pkgdata.1
+%dir %attr (0444, root, bin) /usr/share/man/man1/uconv.1
+%dir %attr (0444, root, bin) /usr/share/man/man1m/genccode.1m
+%dir %attr (0444, root, bin) /usr/share/man/man1m/gencmn.1m
+%dir %attr (0444, root, bin) /usr/share/man/man1m/gensprep.1m
+%dir %attr (0444, root, bin) /usr/share/man/man1m/icupkg.1m
+%dir %attr (0444, root, bin) /usr/share/man/man3lib/libicudata.3lib
+%dir %attr (0444, root, bin) /usr/share/man/man3lib/libicui18n.3lib
+%dir %attr (0444, root, bin) /usr/share/man/man3lib/libicuio.3lib
+%dir %attr (0444, root, bin) /usr/share/man/man3lib/libicule.3lib
+%dir %attr (0444, root, bin) /usr/share/man/man3lib/libiculx.3lib
+%dir %attr (0444, root, bin) /usr/share/man/man3lib/libicutu.3lib
+%dir %attr (0444, root, bin) /usr/share/man/man3lib/libicuuc.3lib
%changelog
+* Thu Mar 24 2011 Pavel Heimlich <[email protected]>
+- ICU 4.6.1
+- delete unused patches
* Thu Oct 21 2010 Pavel Heimlich <[email protected]>
- fix 6966217 in the .so.3 libraries (old_libs)
- add JDS includes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/libicudata.3lib Fri Mar 25 10:41:20 2011 +0100
@@ -0,0 +1,107 @@
+'\" te
+.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
+
+.SH NAME
+libicudata \- ICU data library
+.SH SYNOPSIS
+.LP
+.nf
+cc [ \fIflag\fR... ] \fIfile\fR... \fB-licudata\fR [ \fIlibrary\fR... ]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This library provides data used by the ICU libraries through C++ and C API.
+.sp
+.LP
+The library is compiled with Oracle Studio 12.2 version of the C++ compiler. Therefore to use the C++ API and data from the library, users of the library must also use the same version or compatible version of Sun C++ 5.1 or later compilers to compile their program sources. There is no such restrictions on C API in terms of compatible compilers in general.
+.SH INTERFACES
+.sp
+.LP
+Refer to the following online document for the needed header files and interfaces available with the shared object library:
+.TP
+ICU 4.6 API Reference Usage:
+http://www.icu-project.org/apiref/icu4c/
+
+.SH FILES
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+shared object
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/64/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+64-bit shared object
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitylibrary/icu
+_
+Interface StabilityVolatile
+_
+MT-LevelSafe
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBIntro\fR(3), \fBlibicui18n\fR(3LIB), \fBlibicuio\fR(3LIB), \fBlibicule\fR(3LIB), \fBlibiculx\fR(3LIB), \fBlibicutu\fR(3LIB), \fBlibicuuc\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5)
+.TP
+\fBICU 4.6 API Reference Usage:\fR
+http://www.icu-project.org/apiref/icu4c/
+.TP
+\fBICU User Guide:\fR
+http://icu-project.org/userguide/
+
+.SH COPYRIGHT AND LICENSE
+.sp
+.LP
+ICU License - ICU 1.8.1 and later
+.sp
+.LP
+COPYRIGHT AND PERMISSION NOTICE
+.sp
+.LP
+LICENSE TERMS AND CONDITIONS
+.sp
+.LP
+Copyright (c) 1995-2010 International Business Machines Corporation and others
+All rights reserved.
+.LP
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+.LP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.LP
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+.LP
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/libicui18n.3lib Fri Mar 25 10:41:20 2011 +0100
@@ -0,0 +1,107 @@
+'\" te
+.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
+
+.SH NAME
+libicui18n \- ICU i18n library
+.SH SYNOPSIS
+.LP
+.nf
+cc [ \fIflag\fR... ] \fIfile\fR... \fB-licui18n\fR [ \fIlibrary\fR... ]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This library provides data used by the ICU libraries through C++ and C API.
+.sp
+.LP
+The library is compiled with Oracle Studio 12.2 version of the C++ compiler. Therefore to use the C++ API and data from the library, users of the library must also use the same version or compatible version of Sun C++ 5.1 or later compilers to compile their program sources. There is no such restrictions on C API in terms of compatible compilers in general.
+.SH INTERFACES
+.sp
+.LP
+Refer to the following online document for the needed header files and interfaces available with the shared object library:
+.TP
+ICU 4.6 API Reference Usage:
+http://www.icu-project.org/apiref/icu4c/
+
+.SH FILES
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+shared object
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/64/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+64-bit shared object
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitylibrary/icu
+_
+Interface StabilityVolatile
+_
+MT-LevelSafe
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBIntro\fR(3), \fBlibicudata\fR(3LIB), \fBlibicuio\fR(3LIB), \fBlibicule\fR(3LIB), \fBlibiculx\fR(3LIB), \fBlibicutu\fR(3LIB), \fBlibicuuc\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5)
+.TP
+\fBICU 4.6 API Reference Usage:\fR
+http://www.icu-project.org/apiref/icu4c/
+.TP
+\fBICU User Guide:\fR
+http://icu-project.org/userguide/
+
+.SH COPYRIGHT AND LICENSE
+.sp
+.LP
+ICU License - ICU 1.8.1 and later
+.sp
+.LP
+COPYRIGHT AND PERMISSION NOTICE
+.sp
+.LP
+LICENSE TERMS AND CONDITIONS
+.sp
+.LP
+Copyright (c) 1995-2010 International Business Machines Corporation and others
+All rights reserved.
+.LP
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+.LP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.LP
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+.LP
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/libicuio.3lib Fri Mar 25 10:41:20 2011 +0100
@@ -0,0 +1,107 @@
+'\" te
+.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
+
+.SH NAME
+libicuio \- ICU input/output library
+.SH SYNOPSIS
+.LP
+.nf
+cc [ \fIflag\fR... ] \fIfile\fR... \fB-licuio\fR [ \fIlibrary\fR... ]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This library provides data used by the ICU libraries through C++ and C API.
+.sp
+.LP
+The library is compiled with Oracle Studio 12.2 version of the C++ compiler. Therefore to use the C++ API and data from the library, users of the library must also use the same version or compatible version of Sun C++ 5.1 or later compilers to compile their program sources. There is no such restrictions on C API in terms of compatible compilers in general.
+.SH INTERFACES
+.sp
+.LP
+Refer to the following online document for the needed header files and interfaces available with the shared object library:
+.TP
+ICU 4.6 API Reference Usage:
+http://www.icu-project.org/apiref/icu4c/
+
+.SH FILES
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+shared object
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/64/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+64-bit shared object
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitylibrary/icu
+_
+Interface StabilityVolatile
+_
+MT-LevelSafe
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBIntro\fR(3), \fBlibicui18n\fR(3LIB), \fBlibicudata\fR(3LIB), \fBlibicule\fR(3LIB), \fBlibiculx\fR(3LIB), \fBlibicutu\fR(3LIB), \fBlibicuuc\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5)
+.TP
+\fBICU 4.6 API Reference Usage:\fR
+http://www.icu-project.org/apiref/icu4c/
+.TP
+\fBICU User Guide:\fR
+http://icu-project.org/userguide/
+
+.SH COPYRIGHT AND LICENSE
+.sp
+.LP
+ICU License - ICU 1.8.1 and later
+.sp
+.LP
+COPYRIGHT AND PERMISSION NOTICE
+.sp
+.LP
+LICENSE TERMS AND CONDITIONS
+.sp
+.LP
+Copyright (c) 1995-2010 International Business Machines Corporation and others
+All rights reserved.
+.LP
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+.LP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.LP
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+.LP
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/libicule.3lib Fri Mar 25 10:41:20 2011 +0100
@@ -0,0 +1,107 @@
+'\" te
+.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
+
+.SH NAME
+libicule \- ICU layout engine library
+.SH SYNOPSIS
+.LP
+.nf
+cc [ \fIflag\fR... ] \fIfile\fR... \fB-licule\fR [ \fIlibrary\fR... ]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This library provides data used by the ICU libraries through C++ and C API.
+.sp
+.LP
+The library is compiled with Oracle Studio 12.2 version of the C++ compiler. Therefore to use the C++ API and data from the library, users of the library must also use the same version or compatible version of Sun C++ 5.1 or later compilers to compile their program sources. There is no such restrictions on C API in terms of compatible compilers in general.
+.SH INTERFACES
+.sp
+.LP
+Refer to the following online document for the needed header files and interfaces available with the shared object library:
+.TP
+ICU 4.6 API Reference Usage:
+http://www.icu-project.org/apiref/icu4c/
+
+.SH FILES
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+shared object
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/64/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+64-bit shared object
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitylibrary/icu
+_
+Interface StabilityVolatile
+_
+MT-LevelSafe
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBIntro\fR(3), \fBlibicui18n\fR(3LIB), \fBlibicuio\fR(3LIB), \fBlibicudata\fR(3LIB), \fBlibiculx\fR(3LIB), \fBlibicutu\fR(3LIB), \fBlibicuuc\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5)
+.TP
+\fBICU 4.6 API Reference Usage:\fR
+http://www.icu-project.org/apiref/icu4c/
+.TP
+\fBICU User Guide:\fR
+http://icu-project.org/userguide/
+
+.SH COPYRIGHT AND LICENSE
+.sp
+.LP
+ICU License - ICU 1.8.1 and later
+.sp
+.LP
+COPYRIGHT AND PERMISSION NOTICE
+.sp
+.LP
+LICENSE TERMS AND CONDITIONS
+.sp
+.LP
+Copyright (c) 1995-2010 International Business Machines Corporation and others
+All rights reserved.
+.LP
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+.LP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.LP
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+.LP
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/libiculx.3lib Fri Mar 25 10:41:20 2011 +0100
@@ -0,0 +1,107 @@
+'\" te
+.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
+
+.SH NAME
+libiculx \- ICU layout extension library
+.SH SYNOPSIS
+.LP
+.nf
+cc [ \fIflag\fR... ] \fIfile\fR... \fB-liculx\fR [ \fIlibrary\fR... ]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This library provides data used by the ICU libraries through C++ and C API.
+.sp
+.LP
+The library is compiled with Oracle Studio 12.2 version of the C++ compiler. Therefore to use the C++ API and data from the library, users of the library must also use the same version or compatible version of Sun C++ 5.1 or later compilers to compile their program sources. There is no such restrictions on C API in terms of compatible compilers in general.
+.SH INTERFACES
+.sp
+.LP
+Refer to the following online document for the needed header files and interfaces available with the shared object library:
+.TP
+ICU 4.6 API Reference Usage:
+http://www.icu-project.org/apiref/icu4c/
+
+.SH FILES
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+shared object
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/64/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+64-bit shared object
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitylibrary/icu
+_
+Interface StabilityVolatile
+_
+MT-LevelSafe
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBIntro\fR(3), \fBlibicui18n\fR(3LIB), \fBlibicuio\fR(3LIB), \fBlibicule\fR(3LIB), \fBlibicudata\fR(3LIB), \fBlibicutu\fR(3LIB), \fBlibicuuc\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5)
+.TP
+\fBICU 4.6 API Reference Usage:\fR
+http://www.icu-project.org/apiref/icu4c/
+.TP
+\fBICU User Guide:\fR
+http://icu-project.org/userguide/
+
+.SH COPYRIGHT AND LICENSE
+.sp
+.LP
+ICU License - ICU 1.8.1 and later
+.sp
+.LP
+COPYRIGHT AND PERMISSION NOTICE
+.sp
+.LP
+LICENSE TERMS AND CONDITIONS
+.sp
+.LP
+Copyright (c) 1995-2010 International Business Machines Corporation and others
+All rights reserved.
+.LP
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+.LP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.LP
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+.LP
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/libicutu.3lib Fri Mar 25 10:41:20 2011 +0100
@@ -0,0 +1,107 @@
+'\" te
+.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
+
+.SH NAME
+libicutu \- ICU tool utilities library
+.SH SYNOPSIS
+.LP
+.nf
+cc [ \fIflag\fR... ] \fIfile\fR... \fB-licutu\fR [ \fIlibrary\fR... ]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This library provides data used by the ICU libraries through C++ and C API.
+.sp
+.LP
+The library is compiled with Oracle Studio 12.2 version of the C++ compiler. Therefore to use the C++ API and data from the library, users of the library must also use the same version or compatible version of Sun C++ 5.1 or later compilers to compile their program sources. There is no such restrictions on C API in terms of compatible compilers in general.
+.SH INTERFACES
+.sp
+.LP
+Refer to the following online document for the needed header files and interfaces available with the shared object library:
+.TP
+ICU 4.6 API Reference Usage:
+http://www.icu-project.org/apiref/icu4c/
+
+.SH FILES
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+shared object
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/64/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+64-bit shared object
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitylibrary/icu
+_
+Interface StabilityVolatile
+_
+MT-LevelSafe
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBIntro\fR(3), \fBlibicui18n\fR(3LIB), \fBlibicuio\fR(3LIB), \fBlibicule\fR(3LIB), \fBlibiculx\fR(3LIB), \fBlibicudata\fR(3LIB), \fBlibicuuc\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5)
+.TP
+\fBICU 4.6 API Reference Usage:\fR
+http://www.icu-project.org/apiref/icu4c/
+.TP
+\fBICU User Guide:\fR
+http://icu-project.org/userguide/
+
+.SH COPYRIGHT AND LICENSE
+.sp
+.LP
+ICU License - ICU 1.8.1 and later
+.sp
+.LP
+COPYRIGHT AND PERMISSION NOTICE
+.sp
+.LP
+LICENSE TERMS AND CONDITIONS
+.sp
+.LP
+Copyright (c) 1995-2010 International Business Machines Corporation and others
+All rights reserved.
+.LP
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+.LP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.LP
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+.LP
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/libicuuc.3lib Fri Mar 25 10:41:20 2011 +0100
@@ -0,0 +1,107 @@
+'\" te
+.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
+
+.SH NAME
+libicuuc \- ICU common library
+.SH SYNOPSIS
+.LP
+.nf
+cc [ \fIflag\fR... ] \fIfile\fR... \fB-licuuc\fR [ \fIlibrary\fR... ]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This library provides data used by the ICU libraries through C++ and C API.
+.sp
+.LP
+The library is compiled with Oracle Studio 12.2 version of the C++ compiler. Therefore to use the C++ API and data from the library, users of the library must also use the same version or compatible version of Sun C++ 5.1 or later compilers to compile their program sources. There is no such restrictions on C API in terms of compatible compilers in general.
+.SH INTERFACES
+.sp
+.LP
+Refer to the following online document for the needed header files and interfaces available with the shared object library:
+.TP
+ICU 4.6 API Reference Usage:
+http://www.icu-project.org/apiref/icu4c/
+
+.SH FILES
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+shared object
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/lib/64/libicudata.46.1\fR\fR
+.ad
+.RS 30n
+.rt
+64-bit shared object
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitylibrary/icu
+_
+Interface StabilityVolatile
+_
+MT-LevelSafe
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBIntro\fR(3), \fBlibicui18n\fR(3LIB), \fBlibicuio\fR(3LIB), \fBlibicule\fR(3LIB), \fBlibiculx\fR(3LIB), \fBlibicutu\fR(3LIB), \fBlibicudata\fR(3LIB), \fBattributes\fR(5), \fBenviron\fR(5)
+.TP
+\fBICU 4.6 API Reference Usage:\fR
+http://www.icu-project.org/apiref/icu4c/
+.TP
+\fBICU User Guide:\fR
+http://icu-project.org/userguide/
+
+.SH COPYRIGHT AND LICENSE
+.sp
+.LP
+ICU License - ICU 1.8.1 and later
+.sp
+.LP
+COPYRIGHT AND PERMISSION NOTICE
+.sp
+.LP
+LICENSE TERMS AND CONDITIONS
+.sp
+.LP
+Copyright (c) 1995-2010 International Business Machines Corporation and others
+All rights reserved.
+.LP
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+.LP
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.LP
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+.LP
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
--- a/icu/patches/source_common_Makefile.in.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- icu.orig/source/common/Makefile.in 2010-03-19 19:23:38.685887507 -0400
-+++ icu/source/common/Makefile.in 2010-03-19 19:25:33.597765947 -0400
-@@ -66,6 +66,13 @@
-
- # $(LIBICUDT) is either stub data or the real DLL common data.
- LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
-+## Sun modification:
-+OS = $(shell uname -s)
-+ifeq ($(OS), SunOS)
-+ifneq ($(COMPILER), 42)
-+LIBS += -lCstd
-+endif
-+endif
-
- OBJECTS = putil.o umath.o utypes.o uinvchar.o umutex.o ucln_cmn.o uinit.o uobject.o cmemory.o \
- udata.o ucmndata.o udatamem.o umapfile.o udataswp.o ucol_swp.o utrace.o \
--- a/icu/patches/source_common_putil.c.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- icu/source/common/putil.c.orig 2009-04-30 16:37:48.638273335 +0800
-+++ icu/source/common/putil.c 2009-04-30 16:38:07.082642169 +0800
-@@ -974,8 +974,14 @@
- /* ICU_DATA_DIR may be set as a compile option */
- # ifdef ICU_DATA_DIR
- if(path==NULL || *path==0) {
-- path=ICU_DATA_DIR;
-- }
-+ /* Sun modification:
-+ *
-+ * We hard-code the following instead of using the macro since
-+ * setting the macro without updating configure script isn't possible:
-+ path=ICU_DATA_DIR;
-+ */
-+ path="/usr/lib/icu/4";
-+ }
- # endif
-
- if(path==NULL) {
--- a/icu/patches/source_common_ucase.c.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
---- icu/source/common/ucase.c.orig 2009-04-30 16:54:34.557655719 +0800
-+++ icu/source/common/ucase.c 2009-04-30 17:59:21.954994744 +0800
-@@ -1552,42 +1552,6 @@
- #define GET_CASE_PROPS() &ucase_props_singleton
- #endif
-
--/* public API (see uchar.h) */
--
--U_CAPI UBool U_EXPORT2
--u_isULowercase(UChar32 c) {
-- return (UBool)(UCASE_LOWER==ucase_getType(GET_CASE_PROPS(), c));
--}
--
--U_CAPI UBool U_EXPORT2
--u_isUUppercase(UChar32 c) {
-- return (UBool)(UCASE_UPPER==ucase_getType(GET_CASE_PROPS(), c));
--}
--
--/* Transforms the Unicode character to its lower case equivalent.*/
--U_CAPI UChar32 U_EXPORT2
--u_tolower(UChar32 c) {
-- return ucase_tolower(GET_CASE_PROPS(), c);
--}
--
--/* Transforms the Unicode character to its upper case equivalent.*/
--U_CAPI UChar32 U_EXPORT2
--u_toupper(UChar32 c) {
-- return ucase_toupper(GET_CASE_PROPS(), c);
--}
--
--/* Transforms the Unicode character to its title case equivalent.*/
--U_CAPI UChar32 U_EXPORT2
--u_totitle(UChar32 c) {
-- return ucase_totitle(GET_CASE_PROPS(), c);
--}
--
--/* return the simple case folding mapping for c */
--U_CAPI UChar32 U_EXPORT2
--u_foldCase(UChar32 c, uint32_t options) {
-- return ucase_fold(GET_CASE_PROPS(), c, options);
--}
--
- U_CFUNC int32_t U_EXPORT2
- ucase_hasBinaryProperty(UChar32 c, UProperty which) {
- /* case mapping properties */
--- a/icu/patches/source_common_uchar.c.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
---- icu/source/common/uchar.c.orig 2009-04-30 18:01:03.553019868 +0800
-+++ icu/source/common/uchar.c 2009-04-30 18:03:57.598557863 +0800
-@@ -580,6 +580,79 @@
- u_isIDIgnorable(c));
- }
-
-+/* Transforms the Unicode character to its lower case equivalent.*/
-+U_CAPI UChar32 U_EXPORT2
-+u_tolower(UChar32 c) {
-+ uint32_t props;
-+ GET_PROPS(c, props);
-+ if(!PROPS_VALUE_IS_EXCEPTION(props)) {
-+ if(CAT_MASK(props)&(U_GC_LU_MASK|U_GC_LT_MASK)) {
-+ return c+GET_SIGNED_VALUE(props);
-+ }
-+ } else {
-+ const uint32_t *pe=GET_EXCEPTIONS(props);
-+ uint32_t firstExceptionValue=*pe;
-+ if(HAVE_EXCEPTION_VALUE(firstExceptionValue, EXC_LOWERCASE)) {
-+ int i=EXC_LOWERCASE;
-+ ++pe;
-+ ADD_EXCEPTION_OFFSET(firstExceptionValue, i, pe);
-+ return (UChar32)*pe;
-+ }
-+ }
-+ return c; /* no mapping - return c itself */
-+}
-+
-+/* Transforms the Unicode character to its upper case equivalent.*/
-+U_CAPI UChar32 U_EXPORT2
-+u_toupper(UChar32 c) {
-+ uint32_t props;
-+ GET_PROPS(c, props);
-+ if(!PROPS_VALUE_IS_EXCEPTION(props)) {
-+ if(GET_CATEGORY(props)==U_LOWERCASE_LETTER) {
-+ return c-GET_SIGNED_VALUE(props);
-+ }
-+ } else {
-+ const uint32_t *pe=GET_EXCEPTIONS(props);
-+ uint32_t firstExceptionValue=*pe;
-+ if(HAVE_EXCEPTION_VALUE(firstExceptionValue, EXC_UPPERCASE)) {
-+ int i=EXC_UPPERCASE;
-+ ++pe;
-+ ADD_EXCEPTION_OFFSET(firstExceptionValue, i, pe);
-+ return (UChar32)*pe;
-+ }
-+ }
-+ return c; /* no mapping - return c itself */
-+}
-+
-+/* Transforms the Unicode character to its title case equivalent.*/
-+U_CAPI UChar32 U_EXPORT2
-+u_totitle(UChar32 c) {
-+ uint32_t props;
-+ GET_PROPS(c, props);
-+ if(!PROPS_VALUE_IS_EXCEPTION(props)) {
-+ if(GET_CATEGORY(props)==U_LOWERCASE_LETTER) {
-+ /* here, titlecase is same as uppercase */
-+ return c-GET_SIGNED_VALUE(props);
-+ }
-+ } else {
-+ const uint32_t *pe=GET_EXCEPTIONS(props);
-+ uint32_t firstExceptionValue=*pe;
-+ if(HAVE_EXCEPTION_VALUE(firstExceptionValue, EXC_TITLECASE)) {
-+ int i=EXC_TITLECASE;
-+ ++pe;
-+ ADD_EXCEPTION_OFFSET(firstExceptionValue, i, pe);
-+ return (UChar32)*pe;
-+ } else if(HAVE_EXCEPTION_VALUE(firstExceptionValue, EXC_UPPERCASE)) {
-+ /* here, titlecase is same as uppercase */
-+ int i=EXC_UPPERCASE;
-+ ++pe;
-+ ADD_EXCEPTION_OFFSET(firstExceptionValue, i, pe);
-+ return (UChar32)*pe;
-+ }
-+ }
-+ return c; /* no mapping - return c itself */
-+}
-+
- U_CAPI int32_t U_EXPORT2
- u_charDigitValue(UChar32 c) {
- uint32_t props;
-@@ -977,3 +1050,79 @@
- utrie_enum(&propsVectorsTrie, NULL, _enumPropertyStartsRange, sa);
- }
- }
-+
-+/* return the simple case folding mapping for c */
-+U_CAPI UChar32 U_EXPORT2
-+u_foldCase(UChar32 c, uint32_t options) {
-+ uint32_t props;
-+ GET_PROPS(c, props);
-+ if(!PROPS_VALUE_IS_EXCEPTION(props)) {
-+ if(CAT_MASK(props)&(U_GC_LU_MASK|U_GC_LT_MASK)) {
-+ return c+GET_SIGNED_VALUE(props);
-+ }
-+ } else {
-+ const uint32_t *pe=GET_EXCEPTIONS(props);
-+ uint32_t firstExceptionValue=*pe;
-+ if(HAVE_EXCEPTION_VALUE(firstExceptionValue, EXC_CASE_FOLDING)) {
-+ const uint32_t *oldPE=pe;
-+ int i=EXC_CASE_FOLDING;
-+ ++pe;
-+ ADD_EXCEPTION_OFFSET(firstExceptionValue, i, pe);
-+ props=*pe;
-+ if(props!=0) {
-+ /* return the simple mapping, if there is one */
-+ const UChar *uchars=ucharsTable+(props&0xffff);
-+ UChar32 simple;
-+ i=0;
-+ UTF_NEXT_CHAR_UNSAFE(uchars, i, simple);
-+ if(simple!=0) {
-+ return simple;
-+ }
-+ /* fall through to use the lowercase exception value if there is no simple mapping */
-+ pe=oldPE;
-+ } else {
-+ /* special case folding mappings, hardcoded */
-+ if((options&_FOLD_CASE_OPTIONS_MASK)==U_FOLD_CASE_DEFAULT) {
-+ /* default mappings */
-+ if(c==0x49) {
-+ /* 0049; C; 0069; # LATIN CAPITAL LETTER I */
-+ return 0x69;
-+ } else if(c==0x130) {
-+ /* no simple default mapping for U+0130, use UnicodeData.txt */
-+ return 0x69;
-+ }
-+ } else {
-+ /* Turkic mappings */
-+ if(c==0x49) {
-+ /* 0049; T; 0131; # LATIN CAPITAL LETTER I */
-+ return 0x131;
-+ } else if(c==0x130) {
-+ /* 0130; T; 0069; # LATIN CAPITAL LETTER I WITH DOT ABOVE */
-+ return 0x69;
-+ }
-+ }
-+ /* return c itself because there is no special mapping for it */
-+ return c;
-+ }
-+ }
-+ /* not else! - allow to fall through from above */
-+ if(HAVE_EXCEPTION_VALUE(firstExceptionValue, EXC_LOWERCASE)) {
-+ int i=EXC_LOWERCASE;
-+ ++pe;
-+ ADD_EXCEPTION_OFFSET(firstExceptionValue, i, pe);
-+ return (UChar32)*pe;
-+ }
-+ }
-+ return c; /* no mapping - return c itself */
-+}
-+
-+U_CAPI UBool U_EXPORT2
-+u_isULowercase(UChar32 c) {
-+ return u_hasBinaryProperty(c, UCHAR_LOWERCASE);
-+}
-+
-+U_CAPI UBool U_EXPORT2
-+u_isUUppercase(UChar32 c) {
-+ return u_hasBinaryProperty(c, UCHAR_UPPERCASE);
-+}
-+
--- a/icu/patches/source_common_ucnv2022.c.patch Mon Mar 21 16:06:50 2011 +0100
+++ b/icu/patches/source_common_ucnv2022.c.patch Fri Mar 25 10:41:20 2011 +0100
@@ -1,18 +1,21 @@
---- icu/source/common/ucnv2022.c.orig 2009-05-22 15:45:08.437653452 +0800
-+++ icu/source/common/ucnv2022.c 2009-05-22 15:46:31.620400264 +0800
-@@ -166,7 +166,12 @@
- * - ICU does not distinguish between different versions of JIS X 0208.
+--- icu/source/common/ucnv2022.c.orig Thu Sep 9 01:18:15 2010
++++ icu/source/common/ucnv2022.c Mon Dec 6 15:47:18 2010
+@@ -167,8 +167,13 @@
*/
- static const uint16_t jpCharsetMasks[5]={
+ enum { MAX_JA_VERSION=4 };
+ static const uint16_t jpCharsetMasks[MAX_JA_VERSION+1]={
+ /*
-+ * Sun modification:
++ * Sun modification
+ * We support JISX212 at ISO-2022-JP too.
CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT),
+ */
+ CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212),
+ CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212),
- CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212),
CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7),
CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7),
+ CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7)
+--- icu/source/common/ucnv2022.c.orig 2009-05-22 15:45:08.437653452 +0800
++++ icu/source/common/ucnv2022.c 2009-05-22 15:46:31.620400264 +0800
@@ -1675,7 +1685,10 @@
choices[choiceCount++] = (int8_t)HWKANA_7BIT;
}
@@ -36,24 +39,24 @@
}
break;
case JISX201:
-@@ -2060,18 +2078,22 @@
+@@ -2085,18 +2085,21 @@
mySource--;
escape:
{
+ /* SUN modification
const char * mySourceBefore = mySource;
int8_t toULengthBefore = args->converter->toULength;
+-
+ */
-
changeState_2022(args->converter,&(mySource),
mySourceLimit, ISO_2022_JP,err);
/* If in ISO-2022-JP only and we successully completed an escape sequence, but previous segment was empty, create an error */
-+ /*SUN modificatio
++ /*
if(myData->version==0 && myData->key==0 && U_SUCCESS(*err) && myData->isEmptySegment) {
*err = U_ILLEGAL_ESCAPE_SEQUENCE;
args->converter->toUCallbackReason = UCNV_IRREGULAR;
- args->converter->toULength = toULengthBefore + (mySource - mySourceBefore);
+ args->converter->toULength = (int8_t)(toULengthBefore + (mySource - mySourceBefore));
}
+ */
}
--- a/icu/patches/source_common_unicode_utypes.h.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- icu/source/common/unicode/utypes.h.orig 2009-04-30 18:29:42.779906182 +0800
-+++ icu/source/common/unicode/utypes.h 2009-04-30 18:31:59.831222213 +0800
-@@ -182,7 +182,11 @@
- * ICU 1.8.x on EBCDIC, etc..
- * @stable ICU 2.0
- */
--#define U_ICUDATA_NAME "icudt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER
-+/*
-+ * Sun mofification:
-+ * #define U_ICUDATA_NAME "icudt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER
-+ */
-+#define U_ICUDATA_NAME "icudt" U_ICU_VERSION_SHORT_SUN U_ICUDATA_TYPE_LETTER
-
-
- /**
-@@ -207,7 +211,11 @@
- * Do not use.
- * @internal
- */
--#define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##major##minor##_dat
-+/*
-+ * Sun modification:
-+ * #define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##major##minor##_dat
-+ */
-+#define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##major##_dat
-
- /**
- * \def U_CALLCONV
--- a/icu/patches/source_common_unicode_uversion.h.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- icu/source/common/unicode/uversion.h.orig 2009-04-30 18:36:31.834472255 +0800
-+++ icu/source/common/unicode/uversion.h 2009-04-30 18:38:33.997588323 +0800
-@@ -103,6 +103,13 @@
- */
- #define U_ICU_VERSION_SHORT "40"
-
-+/*
-+ * Sun modification:
-+ *
-+ * We add the following to use at the utypes.h as the ICU data file name:
-+ */
-+#define U_ICU_VERSION_SHORT_SUN "4"
-+
- /** An ICU version consists of up to 4 numbers from 0..255.
- * @stable ICU 2.4
- */
--- a/icu/patches/source_config_mh-solaris.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
---- icu/source/config/mh-solaris.orig 2009-05-13 17:24:52.723051477 +0800
-+++ icu/source/config/mh-solaris 2009-05-13 17:24:06.433299572 +0800
-@@ -4,12 +4,24 @@
- ## others. All Rights Reserved.
-
- ## Flags for position independent code
-+## Sun modification:
-+##SHAREDLIBCFLAGS = -KPIC
-+##SHAREDLIBCXXFLAGS = -KPIC
-+##SHAREDLIBCPPFLAGS = -DPIC
-+SUN_SPARC=$(shell /usr/bin/uname -p)
-+ifeq ($(SUN_SPARC),sparc)
-+SHAREDLIBCFLAGS = -KPIC -xregs=no%appl
-+SHAREDLIBCXXFLAGS = -KPIC -xregs=no%appl
-+else
- SHAREDLIBCFLAGS = -KPIC
- SHAREDLIBCXXFLAGS = -KPIC
--SHAREDLIBCPPFLAGS = -DPIC
-+endif
-+SHAREDLIBCPPFLAGS = -DPIC -D_REENTRANT
-
- ## Commands to generate dependency files
--GEN_DEPS.c= $(CC) -xM $(DEFS) $(CPPFLAGS)
-+## Sun modification:
-+##GEN_DEPS.c= $(CC) -xM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.c= $(CC) -xM $(DEFS) $(CPPFLAGS) -xc99=%none
- GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)
-
- # -mt means 'compiles and links a multithreaded program'
-@@ -34,6 +46,15 @@
- ## Compiler switch to embed a library name
- LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
-
-+## The type of assembly needed when pkgdata is used for generating shared libraries.
-+## Sun modification:
-+SUN_X86=$(shell /usr/bin/uname -p)
-+ifeq ($(SUN_X86),i386)
-+GENCCODE_ASSEMBLY=-a sun-x86
-+else
-+GENCCODE_ASSEMBLY=-a sun
-+endif
-+
- ## Shared object suffix
- SO= so
- ## Non-shared intermediate object suffix
--- a/icu/patches/source_configure_64.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- source/configure.orig 2010-11-02 13:22:37.415676401 +0100
-+++ source/configure 2010-11-02 13:24:28.148510678 +0100
-@@ -3063,7 +3063,7 @@
- case "${host}" in
- sparc*-*-solaris*)
- SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
-- SOL64=`$CXX -m64 2>&1 && $CC -m64 2>&1 | grep -v usage:`
-+ SOL64=`$CXX -m64 2>&1 |grep -v Usage && $CC -m64 2>&1 | grep -v usage:`
- if test -n "$SOL64"; then
- SOL64=`$CXX -xarch=v9 2>&1 && $CC -xarch=v9 2>&1 | grep -v usage:`
- if test -z "$SOL64" && test -n "$SPARCV9"; then
-@@ -3086,7 +3086,7 @@
- i386-*-solaris*)
- AMD64=`isainfo -n 2>&1 | grep amd64`
- # The new compiler option
-- SOL64=`$CXX -m64 2>&1 && $CC -m64 2>&1 | grep -v usage:`
-+ SOL64=`$CXX -m64 2>&1 | grep -v Usage && $CC -m64 2>&1 | grep -v usage:`
- if test -z "$SOL64" && test -n "$AMD64"; then
- CFLAGS="${CFLAGS} -m64"
- CXXFLAGS="${CXXFLAGS} -m64"
--- a/icu/patches/source_data_mappings_convrtrs.txt.patch Mon Mar 21 16:06:50 2011 +0100
+++ b/icu/patches/source_data_mappings_convrtrs.txt.patch Fri Mar 25 10:41:20 2011 +0100
@@ -1,6 +1,6 @@
---- icu/source/data/mappings/convrtrs.txt.orig 2009-05-02 15:10:51.035931200 +0800
-+++ icu/source/data/mappings/convrtrs.txt 2009-05-02 15:07:17.061312558 +0800
-@@ -133,6 +133,7 @@
+--- icu/source/data/mappings/convrtrs.txt Fri Sep 17 07:04:39 2010
++++ icu/source/data/mappings/convrtrs.txt Thu Dec 9 01:53:56 2010
+@@ -137,6 +137,7 @@
# Fully algorithmic converters
@@ -8,18 +8,19 @@
UTF-8 { IANA* MIME* JAVA* WINDOWS }
ibm-1208 { IBM* } # UTF-8 with IBM PUA
ibm-1209 { IBM } # UTF-8
-@@ -144,7 +145,10 @@
+@@ -148,8 +149,11 @@
ibm-17593 { IBM } # Unicode 4.0, UTF-8
windows-65001 { WINDOWS* }
cp1208
-+ UNICODE-1-1-UTF-8
-+ unicode-2-0-utf-8
++ UNICODE-1-1-UTF-8
++ unicode-2-0-utf-8
+ x-UTF_8J
+# Sun modification: csUnicode11 csUnicodeASCII csUnicodeLatin1 ISO-10646 ISO-10646-J-1 ISO-10646-UCS-BASIC ISO-10646-Unicode-Latin1
# The ICU 2.2 UTF-16/32 converters detect and write a BOM.
UTF-16 { IANA* MIME* JAVA* } ISO-10646-UCS-2 { IANA }
ibm-1204 { IBM* } # UTF-16 with IBM PUA and BOM sensitive
-@@ -152,6 +156,14 @@
+@@ -157,6 +161,14 @@
unicode
csUnicode
ucs-2
@@ -34,18 +35,19 @@
# The following Unicode CCSIDs (IBM) are not valid in ICU because they are
# considered pure DBCS (exactly 2 bytes) of Unicode,
# and they are a subset of Unicode. ICU does not support their encoding structures.
-@@ -226,7 +238,9 @@
+@@ -301,8 +313,10 @@
# utf7Converter=ucnv_open("UTF-7,version=1");
#
# For details about email headers see RFC 2047.
-UTF-7 { IANA* MIME* WINDOWS } windows-65000 { WINDOWS* }
+# Sun modification: csUnicode11UTF7 UNICODE-1-1-URF-7 UNICODE-1-1-UTF-7
+UTF-7 { IANA* MIME* WINDOWS } windows-65000 { WINDOWS* } csUnicode11UTF7 UNICODE-1-1-URF-7 UNICODE-1-1-UTF-7
+
+
-
# UTF-EBCDIC doesn't exist in ICU, but the aliases are here for reference.
#UTF-EBCDIC ibm-1210 { IBM* } ibm-1211 { IBM }
-@@ -237,7 +251,8 @@
+
+@@ -312,7 +326,8 @@
# RFC 2060: INTERNET MESSAGE ACCESS PROTOCOL - VERSION 4rev1
# (http://www.ietf.org/rfc/rfc2060.txt)
# Section 5.1.3. Mailbox International Naming Convention
@@ -55,7 +57,7 @@
SCSU { IANA* }
ibm-1212 { IBM } # SCSU with IBM PUA
-@@ -253,6 +268,7 @@
+@@ -328,6 +343,7 @@
# Standard iso-8859-1, which does not have the Euro update.
# See iso-8859-15 (latin9) for the Euro update
@@ -63,7 +65,7 @@
ISO-8859-1 { MIME* IANA JAVA* }
ibm-819 { IBM* JAVA } # This is not truely ibm-819 because it's missing the fallbacks.
IBM819 { IANA }
-@@ -264,6 +280,7 @@
+@@ -339,6 +355,7 @@
ISO_8859-1:1987 { IANA* JAVA }
l1 { IANA JAVA }
819 { JAVA }
@@ -71,7 +73,7 @@
# windows-28591 { WINDOWS* } # This has odd behavior because it has the Euro update, which isn't correct.
# LATIN_1 # Old ICU name
# ANSI_X3.110-1983 # This is for a different IANA alias. This isn't iso-8859-1.
-@@ -290,6 +307,7 @@
+@@ -365,6 +382,7 @@
# Table-based interchange codepages
# Central Europe
@@ -79,7 +81,7 @@
ibm-912_P100-1995 { UTR22* }
ibm-912 { IBM* JAVA }
ISO-8859-2 { MIME* IANA JAVA* WINDOWS }
-@@ -302,6 +320,7 @@
+@@ -377,6 +395,7 @@
cp912 { JAVA }
912 { JAVA }
windows-28592 { WINDOWS* }
@@ -87,7 +89,7 @@
# Maltese Esperanto
ibm-913_P100-2000 { UTR22* }
-@@ -401,6 +420,7 @@
+@@ -484,6 +503,7 @@
# -E means explicit. -I means implicit.
# -E requires the client to handle the ISO 6429 bidirectional controls
# This matches the official mapping on unicode.org
@@ -95,31 +97,31 @@
ibm-5012_P100-1999 { UTR22* }
ibm-5012 { IBM* }
ISO-8859-8 { MIME* IANA WINDOWS JAVA* }
-@@ -412,6 +432,7 @@
+@@ -495,6 +515,7 @@
ISO-8859-8-E { IANA MIME } # IANA and Windows considers this alias different and BiDi needs to be applied.
8859_8 { JAVA }
windows-28598 { WINDOWS* } # Hebrew (ISO-Visual). A hybrid between ibm-5012 and ibm-916 with extra PUA mappings.
-+ ISO-8859-8-Visual visual iso-8859-8i
++ ISO-8859-8-Visual visual iso-8859-8i
+ hebrew8 # Reflect HP-UX code page update
# Unfortunately, the Java aliases are split across ibm-916 and ibm-5012
- # Also many platforms are a combination between ibm-916 and ibm-5012 behaviors
-@@ -513,6 +534,7 @@
+@@ -603,6 +624,7 @@
pck # Probably SOLARIS
sjis # This might be for ibm-1351
ibm-943_VSUB_VPUA
-+ ibm-943_P14A-2000 cp943 ms_kanji 943
++ ibm-943_P14A-2000 cp943 ms_kanji 943
+ x-MS932_0213 { JAVA }
+ x-JISAutoDetect { JAVA }
# cp943 # This isn't Windows, and no one else uses it.
- # IANA says that Windows-31J is an extension to csshiftjis ibm-932
- ibm-943_P130-1999 { UTR22* }
-@@ -522,6 +544,7 @@
- 943 { JAVA }
+@@ -615,6 +637,7 @@
ibm-943_VASCII_VSUB_VPUA
+ x-IBM943 { JAVA }
# japanese. Unicode name is \u30b7\u30d5\u30c8\u7b26\u53f7\u5316\u8868\u73fe
+# Sun modification:
ibm-33722_P12A_P12A-2004_U2 { UTR22* }
ibm-33722 # Leave untagged because this isn't the default
ibm-5050 # Leave untagged because this isn't the default, and yes this alias is correct
-@@ -532,6 +555,7 @@
+@@ -625,6 +648,7 @@
windows-51932 { WINDOWS* }
ibm-33722_VPUA
IBM-eucJP
@@ -127,17 +129,17 @@
ibm-33722_P120-1999 { UTR22* } # Japan EUC with \ <-> Yen mapping
ibm-33722 { IBM* JAVA }
ibm-5050 { IBM } # Yes this is correct
-@@ -560,6 +584,7 @@
- csBig5 { IANA WINDOWS }
+@@ -669,6 +693,7 @@
windows-950 { WINDOWS* }
+ x-windows-950 { JAVA }
x-big5
-+ ibm-1370 CN-Big5 x-x-big5
++ ibm-1370 CN-Big5 x-x-big5
ibm-950_P110-1999 { UTR22* } # Taiwan Big-5 (w/o euro update)
ibm-950 { IBM* JAVA }
cp950 { JAVA* }
-@@ -579,16 +604,21 @@
- # windows-950_hkscs
-
+@@ -692,16 +717,20 @@
+ Big5_Solaris { JAVA }
+ x-Big5-Solaris { JAVA }
# GBK
+# Sun modification: zh_cn
ibm-1386_P100-2001 { UTR22* }
@@ -145,19 +147,18 @@
cp1386
windows-936 # Alternate mapping. Leave untagged. This is the IBM interpretation of a Windows codepage.
ibm-1386_VSUB_VPUA
-+ zh_cn
-+
++ zh_cn
+# Sun modification: x-gbk
windows-936-2000 { UTR22* }
GBK { IANA* WINDOWS JAVA* }
CP936 { IANA JAVA }
MS936 { IANA } # In JDK 1.5, this goes to x-mswin-936. This is an IANA name split.
windows-936 { IANA WINDOWS* JAVA }
-+ x-gbk
++ x-gbk
# Java has two different tables for ibm-1383 and gb2312. We pick closest set for tagging.
ibm-1383_P110-1999 { UTR22* } # China EUC.
-@@ -611,6 +641,7 @@
+@@ -724,6 +753,7 @@
gb2312-1980
GB2312.1980-0 # From X11R6
@@ -165,15 +166,15 @@
ibm-964_P110-1999 { UTR22* } # Taiwan EUC. x-euc-tw is a MIME name
ibm-964 { IBM* JAVA }
EUC-TW
-@@ -619,6 +650,7 @@
- cp964 { JAVA* }
+@@ -733,6 +763,7 @@
964 { JAVA }
ibm-964_VPUA
-+ cns11643_1 x-euc-tw
+ x-IBM964 { JAVA }
++ cns11643_1 x-euc-tw
# ISO-2022 needs one, and other people may need others.
ibm-949_P110-1999 { UTR22* }
-@@ -673,6 +705,7 @@
+@@ -791,6 +822,7 @@
# Java, Solaris and AIX use euc-kr to also mean ksc5601, and _sometimes_ for Windows too.
# ibm-1363 is almost a superset of ibm-970.
@@ -181,36 +182,41 @@
ibm-1363_P11B-1998 { UTR22* }
ibm-1363 # Leave untagged because this isn't the default
KS_C_5601-1987 { IANA* }
-@@ -686,8 +719,13 @@
- ksc
+@@ -805,8 +837,10 @@
windows-949 # Alternate mapping. Leave untagged. This is the IBM interpretation of a Windows codepage.
ibm-1363_VSUB_VPUA
+ x-IBM1363C { JAVA }
- # ks_x_1001:1992
- # ksc5601-1992
+ ks_x_1001:1992
+ ksc5601-1992
-+ ksc5601_1992
-+ x-windows-949
-+
-+# Sun modification:
-+johab johap x-johab x-johap ks_x_1001:1992-3 ksc5601.1992-3 ks_x_1001.1992-3 ksx1001.1992-3 ks_c_5601.1992-3
++ ksc5601_1992
++ x-windows-949
ibm-1363_P110-1997 { UTR22* } # Korean KSC MBCS with \ <-> Won mapping
ibm-1363 { IBM* }
-@@ -703,10 +741,12 @@
- iso-ir-149 { WINDOWS }
+@@ -824,16 +858,18 @@
ms949 { JAVA }
+ x-KSC5601 { JAVA }
+
++johab johap x-johab x-johap ks_x_1001:1992-3 ksc5601.1992-3 ks_x_1001.1992-3 ksx1001.1992-3 ks_c_5601.1992-3
++
+ windows-1361-2000 { UTR22* }
+ ksc5601_1992
+ ms1361
+- johab
+- x-Johab { JAVA }
+# Sun modification: 874 iso-8859-11 TIS620.2533
windows-874-2000 { UTR22* } # Thai (w/ euro update)
TIS-620 { WINDOWS }
windows-874 { JAVA* WINDOWS* }
MS874 { JAVA }
-+ 874 iso-8859-11 TIS620.2533
++ 874 iso-8859-11 TIS620.2533
+ x-windows-874 { JAVA }
# iso-8859-11 { WINDOWS } # iso-8859-11 is similar to TIS-620. ibm-13162 is a closer match.
- ibm-874_P100-1995 { UTR22* } # Thai PC (w/o euro update).
-@@ -753,15 +793,24 @@
+@@ -887,15 +923,24 @@
# The cp aliases in this section aren't really windows aliases, but it was used by ICU for Windows.
# cp is usually used to denote IBM in Java, and that is why we don't do that anymore.
# The windows-* aliases mean windows codepages.
@@ -220,7 +226,7 @@
-ibm-5349_P100-1998 { UTR22* } ibm-5349 { IBM* } windows-1253 { IANA* JAVA* WINDOWS* } cp1253 { JAVA } # Windows Greek (w/ euro update)
-ibm-5350_P100-1998 { UTR22* } ibm-5350 { IBM* } windows-1254 { IANA* JAVA* WINDOWS* } cp1254 { JAVA } # Windows Turkish (w/ euro update)
-ibm-9447_P100-2002 { UTR22* } ibm-9447 { IBM* } windows-1255 { IANA* JAVA* WINDOWS* } cp1255 { JAVA } # Windows Hebrew (w/ euro update)
--ibm-9448_X100-2005 { UTR22* } ibm-9448 { IBM* } windows-1256 { IANA* JAVA* WINDOWS* } cp1256 { WINDOWS JAVA } # Windows Arabic (w/ euro update)
+-ibm-9448_X100-2005 { UTR22* } ibm-9448 { IBM* } windows-1256 { IANA* JAVA* WINDOWS* } cp1256 { WINDOWS JAVA } x-windows-1256S { JAVA } # Windows Arabic (w/ euro update)
-ibm-9449_P100-2002 { UTR22* } ibm-9449 { IBM* } windows-1257 { IANA* JAVA* WINDOWS* } cp1257 { JAVA } # Windows Baltic (w/ euro update)
-ibm-5354_P100-1998 { UTR22* } ibm-5354 { IBM* } windows-1258 { IANA* JAVA* WINDOWS* } cp1258 { JAVA } # Windows Vietnamese (w/ euro update)
+# Sun modification: x-cp1250
@@ -230,17 +236,17 @@
+# Sun modification: 1252 x-cp1252
+ibm-5348_P100-1997 { UTR22* } ibm-5348 { IBM* } windows-1252 { IANA* JAVA* WINDOWS* } cp1252 { JAVA } 1252 x-cp1252 # Windows Latin1 (w/ euro update)
+# Sun modification: x-cp1253
-+ibm-5349_P100-1998 { UTR22* } ibm-5349 { IBM* } windows-1253 { IANA* JAVA* WINDOWS* } cp1253 { JAVA } x-cp1253 # Windows Greek (w/ euro update)
++ibm-5349_P100-1998 { UTR22* } ibm-5349 { IBM* } windows-1253 { IANA* JAVA* WINDOWS* } cp1253 { JAVA } x-cp1253 # Windows Greek (w/ euro update)
+# Sun modification: x-cp1254
-+ibm-5350_P100-1998 { UTR22* } ibm-5350 { IBM* } windows-1254 { IANA* JAVA* WINDOWS* } cp1254 { JAVA } x-cp1254 # Windows Turkish (w/ euro update)
++ibm-5350_P100-1998 { UTR22* } ibm-5350 { IBM* } windows-1254 { IANA* JAVA* WINDOWS* } cp1254 { JAVA } x-cp1254 # Windows Turkish (w/ euro update)
+# Sun modification: x-cp1255 Win1255
-+ibm-9447_P100-2002 { UTR22* } ibm-9447 { IBM* } windows-1255 { IANA* JAVA* WINDOWS* } cp1255 { JAVA } x-cp1255 Win1255 # Windows Hebrew (w/ euro update)
++ibm-9447_P100-2002 { UTR22* } ibm-9447 { IBM* } windows-1255 { IANA* JAVA* WINDOWS* } cp1255 { JAVA } x-cp1255 Win1255 # Windows Hebrew (w/ euro update)
+# Sun modification: x-cp1256
-+ibm-9448_X100-2005 { UTR22* } ibm-9448 { IBM* } windows-1256 { IANA* JAVA* WINDOWS* } cp1256 { WINDOWS JAVA } x-cp1256 # Windows Arabic (w/ euro update)
++ibm-9448_X100-2005 { UTR22* } ibm-9448 { IBM* } windows-1256 { IANA* JAVA* WINDOWS* } cp1256 { WINDOWS JAVA } x-windows-1256S { JAVA } x-cp1256 # Windows Arabic (w/ euro update)
+# Sun modification: x-cp1257
-+ibm-9449_P100-2002 { UTR22* } ibm-9449 { IBM* } windows-1257 { IANA* JAVA* WINDOWS* } cp1257 { JAVA } x-cp1257 # Windows Baltic (w/ euro update)
++ibm-9449_P100-2002 { UTR22* } ibm-9449 { IBM* } windows-1257 { IANA* JAVA* WINDOWS* } cp1257 { JAVA } x-cp1257 # Windows Baltic (w/ euro update)
+# Sun modification: x-cp1258
-+ibm-5354_P100-1998 { UTR22* } ibm-5354 { IBM* } windows-1258 { IANA* JAVA* WINDOWS* } cp1258 { JAVA } x-cp1258 # Windows Vietnamese (w/ euro update)
++ibm-5354_P100-1998 { UTR22* } ibm-5354 { IBM* } windows-1258 { IANA* JAVA* WINDOWS* } cp1258 { JAVA } x-cp1258 # Windows Vietnamese (w/ euro update)
# These tables are out of date, and most don't have the Euro
# Leave the windows- variants untagged. They are alternate tables of the newer ones above.
--- a/icu/patches/source_data_mappings_ucmfiles.mk.patch Mon Mar 21 16:06:50 2011 +0100
+++ b/icu/patches/source_data_mappings_ucmfiles.mk.patch Fri Mar 25 10:41:20 2011 +0100
@@ -1,10 +1,10 @@
---- icu/source/data/mappings/ucmfiles.mk.orig 2009-05-02 15:22:36.457142527 +0800
-+++ icu/source/data/mappings/ucmfiles.mk 2009-05-02 15:23:04.749010595 +0800
-@@ -104,5 +104,6 @@
- jisx-212.ucm\
- iso-ir-165.ucm cns-11643-1992.ucm\
- ibm-5478_P100-1995.ucm\
--icu-internal-25546.ucm lmb-excp.ucm
-+icu-internal-25546.ucm lmb-excp.ucm\
+--- icu/source/data/mappings/ucmfiles.mk.orig Fri Nov 5 20:53:41 2010
++++ icu/source/data/mappings/ucmfiles.mk Tue Dec 7 17:38:50 2010
+@@ -115,5 +115,6 @@
+ icu-internal-25546.ucm lmb-excp.ucm \
+ icu-internal-compound-d1.ucm icu-internal-compound-d2.ucm icu-internal-compound-d3.ucm icu-internal-compound-d4.ucm\
+ icu-internal-compound-d5.ucm icu-internal-compound-d6.ucm icu-internal-compound-d7.ucm \
+-icu-internal-compound-s1.ucm icu-internal-compound-s2.ucm icu-internal-compound-s3.ucm icu-internal-compound-t.ucm
++icu-internal-compound-s1.ucm icu-internal-compound-s2.ucm icu-internal-compound-s3.ucm icu-internal-compound-t.ucm \
+johab.ucm
--- a/icu/patches/source_data_misc_zoneinfo.txt.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- icu/source/data/misc/zoneinfo.txt.orig 2009-05-02 15:36:35.164451349 +0800
-+++ icu/source/data/misc/zoneinfo.txt 2009-05-02 16:06:24.409918762 +0800
-@@ -12,7 +12,7 @@
- // >> !!! >>> DO NOT EDIT <<< !!! <<
- //---------------------------------------------------------
-
--zoneinfo:table(nofallback) {
-+zoneinfo {
- TZVersion { "2008i" }
- Zones:array {
- /* ACT */ :int { 330 } //Z#0
--- a/icu/patches/source_i18n_Makefile.in.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- icu/source/i18n/Makefile.in.orig 2009-05-18 16:22:49.586600536 +0800
-+++ icu/source/i18n/Makefile.in 2009-05-18 16:23:40.354444340 +0800
-@@ -60,6 +60,14 @@
- DEFS += -DU_I18N_IMPLEMENTATION
- LDFLAGS += $(LDFLAGSICUI18N)
- LIBS = $(LIBICUUC) $(DEFAULT_LIBS)
-+## Sun modification:
-+OS = $(shell uname -s)
-+ifeq ($(OS), SunOS)
-+ifneq ($(COMPILER), 42)
-+LIBS += -lCstd
-+endif
-+endif
-+
-
- OBJECTS = ucln_in.o \
- fmtable.o format.o msgfmt.o umsg.o numfmt.o unum.o decimfmt.o dcfmtsym.o \
--- a/icu/patches/source_icudefs.mk.in.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- icu/source/icudefs.mk.in.orig 2009-05-13 17:27:23.854818627 +0800
-+++ icu/source/icudefs.mk.in 2009-05-13 17:27:54.790520846 +0800
-@@ -113,11 +113,18 @@
- # So we ignore the DEFS that comes from configure
- DEFS =
- # CFLAGS is for C only flags
--CFLAGS = @CFLAGS@
-+# Sun modification:
-+#CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ $(SHAREDLIBCFLAGS)
- # CXXFLAGS is for C++ only flags
--CXXFLAGS = @CXXFLAGS@
-+# Sun modification:
-+#CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ $(SHAREDLIBCXXFLAGS)
- # CPPFLAGS is for C Pre-Processor flags
--CPPFLAGS = @CPPFLAGS@
-+# Sun modification:
-+#CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ $(SHAREDLIBCPPFLAGS)
-+# Sun modification:
- # LIBCFLAGS are the flags for static and shared libraries.
- LIBCFLAGS = @LIBCFLAGS@
- # LIBCXXFLAGS are the flags for static and shared libraries.
--- a/icu/patches/source_io_Makefile.in.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- icu/source/io/Makefile.in.orig 2009-05-13 17:30:36.566204246 +0800
-+++ icu/source/io/Makefile.in 2009-05-13 17:31:33.271605609 +0800
-@@ -60,6 +60,14 @@
- DEFS += -DU_IO_IMPLEMENTATION
- LDFLAGS += $(LDFLAGSICUIO)
- LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS)
-+## Sun modification:
-+OS = $(shell uname -s)
-+ifeq ($(OS), SunOS)
-+ifneq ($(COMPILER), 42)
-+LIBS += -lCstd
-+endif
-+endif
-+
-
- OBJECTS = locbund.o ufile.o ufmt_cmn.o uprintf.o uprntf_p.o \
- uscanf.o uscanf_p.o ustdio.o sprintf.o sscanf.o \
--- a/icu/patches/source_layout_Makefile.in.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- icu.orig/source/layout/Makefile.in 2010-03-19 19:23:09.759898032 -0400
-+++ icu/source/layout/Makefile.in 2010-03-19 19:30:04.394338432 -0400
-@@ -59,6 +59,13 @@
- DEFS += -DU_LAYOUT_IMPLEMENTATION
- LDFLAGS += $(LDFLAGSICULE)
- LIBS = $(LIBICUUC) $(DEFAULT_LIBS)
-+## Sun modification:
-+OS = $(shell uname -s)
-+ifeq ($(OS), SunOS)
-+ifneq ($(COMPILER), 42)
-+LIBS += -lCstd
-+endif
-+endif
-
- OBJECTS = LEFontInstance.o \
- OpenTypeLayoutEngine.o \
--- a/icu/patches/source_layoutex_Makefile.in.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- icu.orig/source/layoutex/Makefile.in 2010-03-19 19:22:54.431044465 -0400
-+++ icu/source/layoutex/Makefile.in 2010-03-19 19:38:21.163392981 -0400
-@@ -59,6 +59,13 @@
- DEFS += -DU_LAYOUTEX_IMPLEMENTATION
- LDFLAGS += $(LDFLAGSICULX)
- LIBS = $(LIBICUUC) $(LIBICULE) $(DEFAULT_LIBS)
-+## Sun modification:
-+OS = $(shell uname -s)
-+ifeq ($(OS), SunOS)
-+ifneq ($(COMPILER), 42)
-+LIBS += -lCstd
-+endif
-+endif
-
- OBJECTS = ParagraphLayout.o \
- RunArrays.o \
--- a/icu/patches/source_test_cintltst_udatatst.c.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- icu/source/test/cintltst/udatatst.c.orig 2009-05-04 16:56:11.465321060 +0800
-+++ icu/source/test/cintltst/udatatst.c 2009-05-04 16:58:13.553972002 +0800
-@@ -1069,7 +1069,10 @@
- {
- UVersionInfo icuVersion;
- char expectDataName[20];
-+/* Sun modification:
- unsigned int expectLen = 8;
-+*/
-+ unsigned int expectLen = 7;
-
- char typeChar = '?';
-
-@@ -1100,11 +1103,17 @@
- break;
- }
-
-+/* Sun modification:
- sprintf(expectDataName, "%s%d%d%c",
- "icudt",
- (int)icuVersion[0],
- (int)icuVersion[1],
- typeChar);
-+*/
-+ sprintf(expectDataName, "%s%d%c",
-+ "icudt",
-+ (int)icuVersion[0],
-+ typeChar);
-
- log_verbose("Expected: %s\n", expectDataName);
- if(uprv_strlen(expectDataName) != expectLen)
--- a/icu/patches/source_test_intltest_regextst.cpp.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
---- icu/source/test/intltest/regextst.cpp.orig 2009-05-04 17:04:42.413388186 +0800
-+++ icu/source/test/intltest/regextst.cpp 2009-05-04 17:03:41.208825004 +0800
-@@ -69,6 +69,9 @@
- case 7: name = "Callbacks";
- if (exec) Callbacks();
- break;
-+ case 8: name = "Bug 6149";
-+ if (exec) Bug6149();
-+ break;
-
- default: name = "";
- break; //needed to end loop
-@@ -1889,6 +1892,12 @@
- // Ticket 5389
- REGEX_ERR("*c", 1, 1, U_REGEX_RULE_SYNTAX);
-
-+ // Invalid Back Reference \0
-+ // For ICU 3.8 and earlier
-+ // For ICU versions newer than 3.8, \0 introduces an octal escape.
-+ //
-+ REGEX_ERR("(ab)\\0", 1, 6, U_REGEX_BAD_ESCAPE_SEQUENCE);
-+
- }
-
-
-@@ -2478,5 +2487,27 @@
-
- }
-
-+//--------------------------------------------------------------
-+//
-+// Bug6149 Verify limits to heap expansion for backtrack stack.
-+// Use this pattern,
-+// "(a?){1,}"
-+// The zero-length match will repeat forever.
-+// (That this goes into a loop is another bug)
-+//
-+//---------------------------------------------------------------
-+void RegexTest::Bug6149() {
-+ UnicodeString pattern("(a?){1,}");
-+ UnicodeString s("xyz");
-+ uint32_t flags = 0;
-+ UErrorCode status = U_ZERO_ERROR;
-+
-+ RegexMatcher matcher(pattern, s, flags, status);
-+ UBool result = false;
-+ REGEX_ASSERT_FAIL(result=matcher.matches(status), U_REGEX_STACK_OVERFLOW);
-+ REGEX_ASSERT(result == FALSE);
-+ }
-+
-+
- #endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
-
--- a/icu/patches/source_test_intltest_regextst.h.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- icu/source/test/intltest/regextst.h.orig 2009-05-04 17:05:57.003995752 +0800
-+++ icu/source/test/intltest/regextst.h 2009-05-04 17:06:14.198483724 +0800
-@@ -31,6 +31,8 @@
- virtual void Errors();
- virtual void PerlTests();
- virtual void Callbacks();
-+ virtual void Bug6149();
-+
-
- // The following functions are internal to the regexp tests.
- virtual UBool doRegexLMTest(const char *pat, const char *text, UBool looking, UBool match, int32_t line);
--- a/icu/patches/source_test_intltest_tztest.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
---- source/test/intltest/tztest.cpp.orig 2010-11-09 18:11:42.050866346 +0100
-+++ source/test/intltest/tztest.cpp 2010-11-09 18:20:29.337723538 +0100
-@@ -34,6 +34,11 @@
- // class TimeZoneTest
- // *****************************************************************************
-
-+// TODO: We should probably read following data at runtime, so we can update
-+// the these values every release with necessary data changes.
-+const int32_t TimeZoneTest::REFERENCE_YEAR = 2009;
-+const char * TimeZoneTest::REFERENCE_DATA_VERSION = "2009d";
-+
- void TimeZoneTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
- {
- if (exec) logln("TestSuite TestTimeZone");
-@@ -579,18 +584,13 @@
- */
- void TimeZoneTest::TestShortZoneIDs()
- {
-- // TODO: This test case is tzdata sensitive.
-- // We should actually put the data version in this test code
-- // at build time. For now, we just hardcode the version string
-- // and display warning instead of error if non-reference tzdata
-- // version is used.
-- const char *REFERENCE_DATA_VERSION = "2008i";
--
- UErrorCode status = U_ZERO_ERROR;
-+
-+ // This test case is tzdata version sensitive.
- UBool isNonReferenceTzdataVersion = FALSE;
- const char *tzdataVer = TimeZone::getTZDataVersion(status);
- if (failure(status, "getTZDataVersion")) return;
-- if (uprv_strcmp(tzdataVer, REFERENCE_DATA_VERSION) != 0) {
-+ if (uprv_strcmp(tzdataVer, TimeZoneTest::REFERENCE_DATA_VERSION) != 0) {
- // Note: We want to display a warning message here if
- // REFERENCE_DATA_VERSION is out of date - so we
- // do not forget to update the value before GA.
-@@ -604,10 +604,9 @@
- // in the time zone in the current calendar year. The test
- // data is valid for the date after the reference year below.
- // If system clock is before the year, some test cases may fail.
-- const int32_t REFERENCE_YEAR = 2009;
- GregorianCalendar cal(*TimeZone::getGMT(), status);
- if (failure(status, "GregorianCalendar")) return;
-- cal.set(REFERENCE_YEAR, UCAL_JANUARY, 2); // day 2 in GMT
-+ cal.set(TimeZoneTest::REFERENCE_YEAR, UCAL_JANUARY, 2); // day 2 in GMT
-
- UBool isDateBeforeReferenceYear = ucal_getNow() < cal.getTime(status);
- if (failure(status, "Calendar::getTime")) return;
-@@ -1898,6 +1897,15 @@
- };
-
- void TimeZoneTest::TestDisplayNamesMeta() {
-+ UErrorCode status = U_ZERO_ERROR;
-+ GregorianCalendar cal(*TimeZone::getGMT(), status);
-+ if (failure(status, "GregorianCalendar")) return;
-+
-+ UBool isReferenceYear = TRUE;
-+ if (cal.get(UCAL_YEAR, status) != TimeZoneTest::REFERENCE_YEAR) {
-+ isReferenceYear = FALSE;
-+ }
-+
- UBool sawAnError = FALSE;
- for (int testNum = 0; zoneDisplayTestData[testNum].zoneName != NULL; testNum++) {
- Locale locale = Locale::createFromName(zoneDisplayTestData[testNum].localeName);
-@@ -1908,20 +1916,33 @@
- locale,
- displayName);
- if (displayName != zoneDisplayTestData[testNum].expectedDisplayName) {
-- sawAnError = TRUE;
- char name[100];
- UErrorCode status = U_ZERO_ERROR;
- displayName.extract(name, 100, NULL, status);
-- errln("Incorrect time zone display name. zone = \"%s\",\n"
-- " locale = \"%s\", style = %s, Summertime = %d\n"
-- " Expected \"%s\", "
-- " Got \"%s\"\n", zoneDisplayTestData[testNum].zoneName,
-- zoneDisplayTestData[testNum].localeName,
-- zoneDisplayTestData[testNum].style==TimeZone::SHORT ?
-- "SHORT" : "LONG",
-- zoneDisplayTestData[testNum].summerTime,
-- zoneDisplayTestData[testNum].expectedDisplayName,
-- name);
-+ if (isReferenceYear) {
-+ sawAnError = TRUE;
-+ errln("Incorrect time zone display name. zone = \"%s\",\n"
-+ " locale = \"%s\", style = %s, Summertime = %d\n"
-+ " Expected \"%s\", "
-+ " Got \"%s\"\n", zoneDisplayTestData[testNum].zoneName,
-+ zoneDisplayTestData[testNum].localeName,
-+ zoneDisplayTestData[testNum].style==TimeZone::SHORT ?
-+ "SHORT" : "LONG",
-+ zoneDisplayTestData[testNum].summerTime,
-+ zoneDisplayTestData[testNum].expectedDisplayName,
-+ name);
-+ } else {
-+ logln("Incorrect time zone display name. zone = \"%s\",\n"
-+ " locale = \"%s\", style = %s, Summertime = %d\n"
-+ " Expected \"%s\", "
-+ " Got \"%s\"\n", zoneDisplayTestData[testNum].zoneName,
-+ zoneDisplayTestData[testNum].localeName,
-+ zoneDisplayTestData[testNum].style==TimeZone::SHORT ?
-+ "SHORT" : "LONG",
-+ zoneDisplayTestData[testNum].summerTime,
-+ zoneDisplayTestData[testNum].expectedDisplayName,
-+ name);
-+ }
- }
- delete zone;
- }
---- source/test/intltest/tztest.h.orig 2010-11-10 10:13:43.085093156 +0100
-+++ source/test/intltest/tztest.h 2010-11-10 10:14:29.186212963 +0100
-@@ -1,6 +1,6 @@
-
- /********************************************************************
-- * Copyright (c) 1997-2008, International Business Machines
-+ * Copyright (c) 1997-2009, International Business Machines
- * Corporation and others. All Rights Reserved.
- ********************************************************************/
-
-@@ -98,6 +98,11 @@
- // internal functions
- static UnicodeString& formatOffset(int32_t offset, UnicodeString& rv);
- static UnicodeString& formatTZID(int32_t offset, UnicodeString& rv);
-+
-+ // Some test case data is current date/tzdata version sensitive and producing errors
-+ // when year/rule are changed.
-+ static const int32_t REFERENCE_YEAR;
-+ static const char *REFERENCE_DATA_VERSION;
- };
-
- #endif /* #if !UCONFIG_NO_FORMATTING */
--- a/icu/patches/source_tools_pkgdata_dllmode.c.patch Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
---- icu/source/tools/pkgdata/dllmode.c.orig 2009-05-04 17:22:33.976939003 +0800
-+++ icu/source/tools/pkgdata/dllmode.c 2009-05-04 17:23:31.151200485 +0800
-@@ -262,9 +262,11 @@
- if (o->version) {
- T_FileStream_writeLine(makefile, "ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))\n");
- T_FileStream_writeLine(makefile, "\tcd $(INSTALLTO) && $(RM) $(SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(SO_TARGET)\n");
-+/* Sun modification:
- T_FileStream_writeLine(makefile, "ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))\n");
- T_FileStream_writeLine(makefile, "\tcd $(INSTALLTO) && $(RM) $(MIDDLE_SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET)\n");
- T_FileStream_writeLine(makefile, "endif\n");
-+*/
- T_FileStream_writeLine(makefile, "endif\n");
-
- #ifdef OS390
-@@ -277,7 +279,10 @@
- T_FileStream_writeLine(makefile, "\n");
-
- #ifdef U_SOLARIS
-+/* Sun modification:
- T_FileStream_writeLine(makefile, "$(NAME).map:\n\techo \"{global: $(TOCSYM); local: *; };\" > $@\n\n");
-+*/
-+ T_FileStream_writeLine(makefile, "$(NAME).map:\n\techo \"SUNWprivate_1.1 {global: $(TOCSYM); local: *; };\" > $@\n\n");
- #endif
-
- #ifdef U_AIX