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

Update to icu4c-51.1.

Browse Source
This commit is contained in:
ajacoutot 2013-03-24 10:28:35 +00:00
parent b1e60fa5c1
commit 24f9d701f0
8 changed files with 25 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
textproc/icu4c/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.30 2013/03/11 11:42:42 espie Exp $
# $OpenBSD: Makefile,v 1.31 2013/03/24 10:28:35 ajacoutot Exp $
COMMENT= International Components for Unicode
VERSION= 50.1.2
VERSION= 51.1
DISTNAME= icu4c-${VERSION:S/./_/g}-src
PKGNAME= icu4c-${VERSION}
SO_VERSION= 6.0
SO_VERSION= 6.1
.for _lib in icudata icui18n icuio icule iculx icutest icutu icuuc
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor

4
textproc/icu4c/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (icu4c-50_1_2-src.tgz) = y2gGfcxg1oL44De/CWG91RactGUu+KoTbok3gAR9r9M=
SIZE (icu4c-50_1_2-src.tgz) = 21189361
SHA256 (icu4c-51_1-src.tgz) = h+WuUTvSnyX4ZIBErwHVq3dGCRLzdfn+EfWKVOeDZms=
SIZE (icu4c-51_1-src.tgz) = 21815174

8
textproc/icu4c/patches/patch-source_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_Makefile_in,v 1.7 2012/12/08 13:18:46 ajacoutot Exp $
--- source/Makefile.in.orig Mon Nov 5 18:18:12 2012
+++ source/Makefile.in Thu Dec 6 15:36:38 2012
@@ -302,8 +302,8 @@ $(top_builddir)/config/pkgdataMakefile:
$OpenBSD: patch-source_Makefile_in,v 1.8 2013/03/24 10:28:35 ajacoutot Exp $
--- source/Makefile.in.orig Fri Mar 15 23:16:50 2013
+++ source/Makefile.in Sun Mar 24 11:07:42 2013
@@ -307,8 +307,8 @@ $(top_builddir)/config/pkgdataMakefile:
$(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
-$(RMV) $@

10
textproc/icu4c/patches/patch-source_common_putilimp_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-source_common_putilimp_h,v 1.5 2012/12/08 13:18:46 ajacoutot Exp $
$OpenBSD: patch-source_common_putilimp_h,v 1.6 2013/03/24 10:28:35 ajacoutot Exp $
hppa and sparc don't have atomic builtins:
__sync_val_compare_and_swap, __sync_add_and_fetch, __sync_sub_and_fetch
don't assume having GNUC >= 401 implies they're here..
--- source/common/putilimp.h.orig Mon Nov 5 18:14:50 2012
+++ source/common/putilimp.h Thu Dec 6 15:39:07 2012
@@ -123,6 +123,8 @@ typedef size_t uintptr_t;
--- source/common/putilimp.h.orig Fri Mar 15 23:11:58 2013
+++ source/common/putilimp.h Sun Mar 24 11:07:42 2013
@@ -126,6 +126,8 @@ typedef size_t uintptr_t;
/* not defined */
#elif U_PLATFORM == U_PF_OS400
/* not defined */
@ -15,7 +15,7 @@ don't assume having GNUC >= 401 implies they're here..
#else
# define U_TIMEZONE timezone
#endif
@@ -180,7 +182,7 @@ typedef size_t uintptr_t;
@@ -183,7 +185,7 @@ typedef size_t uintptr_t;
*/
#ifdef U_HAVE_GCC_ATOMICS
/* Use the predefined value. */

98
textproc/icu4c/patches/patch-source_common_ucnvmbcs_c
View File

@ -1,98 +0,0 @@
$OpenBSD: patch-source_common_ucnvmbcs_c,v 1.1 2012/12/08 13:18:46 ajacoutot Exp $
On OpenBSD, si_value is already defined in <sys/siginfo.h>.
--- source/common/ucnvmbcs.c.orig Thu Dec 6 16:08:47 2012
+++ source/common/ucnvmbcs.c Thu Dec 6 16:09:24 2012
@@ -3940,9 +3940,9 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeA
uint32_t stage2Entry;
uint32_t asciiRoundtrips;
uint32_t value;
- uint8_t si_value[2] = {0, 0};
+ uint8_t icu_si_value[2] = {0, 0};
uint8_t so_value[2] = {0, 0};
- uint8_t si_value_length, so_value_length;
+ uint8_t icu_si_value_length, so_value_length;
int32_t length = 0, prevLength;
uint8_t unicodeMask;
@@ -4015,7 +4015,7 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeA
nextSourceIndex=0;
/* Get the SI/SO character for the converter */
- si_value_length = getSISOBytes(SI, cnv->options, si_value);
+ icu_si_value_length = getSISOBytes(SI, cnv->options, icu_si_value);
so_value_length = getSISOBytes(SO, cnv->options, so_value);
/* conversion loop */
@@ -4107,12 +4107,12 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeA
length=1;
} else {
/* change from double-byte mode to single-byte */
- if (si_value_length == 1) {
- value|=(uint32_t)si_value[0]<<8;
+ if (icu_si_value_length == 1) {
+ value|=(uint32_t)icu_si_value[0]<<8;
length = 2;
- } else if (si_value_length == 2) {
- value|=(uint32_t)si_value[1]<<8;
- value|=(uint32_t)si_value[0]<<16;
+ } else if (icu_si_value_length == 2) {
+ value|=(uint32_t)icu_si_value[1]<<8;
+ value|=(uint32_t)icu_si_value[0]<<16;
length = 3;
}
prevLength=1;
@@ -4339,12 +4339,12 @@ getTrail:
length=1;
} else {
/* change from double-byte mode to single-byte */
- if (si_value_length == 1) {
- value|=(uint32_t)si_value[0]<<8;
+ if (icu_si_value_length == 1) {
+ value|=(uint32_t)icu_si_value[0]<<8;
length = 2;
- } else if (si_value_length == 2) {
- value|=(uint32_t)si_value[1]<<8;
- value|=(uint32_t)si_value[0]<<16;
+ } else if (icu_si_value_length == 2) {
+ value|=(uint32_t)icu_si_value[1]<<8;
+ value|=(uint32_t)icu_si_value[0]<<16;
length = 3;
}
prevLength=1;
@@ -4614,14 +4614,14 @@ unassigned:
) {
/* EBCDIC_STATEFUL ending with DBCS: emit an SI to return the output stream to SBCS */
if(targetCapacity>0) {
- *target++=(uint8_t)si_value[0];
- if (si_value_length == 2) {
+ *target++=(uint8_t)icu_si_value[0];
+ if (icu_si_value_length == 2) {
if (targetCapacity<2) {
- cnv->charErrorBuffer[0]=(uint8_t)si_value[1];
+ cnv->charErrorBuffer[0]=(uint8_t)icu_si_value[1];
cnv->charErrorBufferLength=1;
*pErrorCode=U_BUFFER_OVERFLOW_ERROR;
} else {
- *target++=(uint8_t)si_value[1];
+ *target++=(uint8_t)icu_si_value[1];
}
}
if(offsets!=NULL) {
@@ -4630,11 +4630,11 @@ unassigned:
}
} else {
/* target is full */
- cnv->charErrorBuffer[0]=(uint8_t)si_value[0];
- if (si_value_length == 2) {
- cnv->charErrorBuffer[1]=(uint8_t)si_value[1];
+ cnv->charErrorBuffer[0]=(uint8_t)icu_si_value[0];
+ if (icu_si_value_length == 2) {
+ cnv->charErrorBuffer[1]=(uint8_t)icu_si_value[1];
}
- cnv->charErrorBufferLength=si_value_length;
+ cnv->charErrorBufferLength=icu_si_value_length;
*pErrorCode=U_BUFFER_OVERFLOW_ERROR;
}
prevLength=1; /* we switched into SBCS */

59
textproc/icu4c/patches/patch-source_tools_genrb_derb_c
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-source_tools_genrb_derb_c,v 1.1 2012/12/08 13:18:46 ajacoutot Exp $
On OpenBSD, truncate is already defined in <sys/types.h>.
--- source/tools/genrb/derb.c.orig Mon Nov 5 18:14:54 2012
+++ source/tools/genrb/derb.c Thu Dec 6 16:27:22 2012
@@ -54,7 +54,7 @@ static UConverter *defaultConverter = 0;
static const int32_t indentsize = 4;
static int32_t truncsize = DERB_DEFAULT_TRUNC;
-static UBool truncate = FALSE;
+static UBool icu_truncate = FALSE;
static const char *getEncodingName(const char *encoding);
static void reportError(const char *pname, UErrorCode *status, const char *when);
@@ -152,14 +152,14 @@ main(int argc, char* argv[]) {
}
if(options[4].doesOccur) {
- truncate = TRUE;
+ icu_truncate = TRUE;
if(options[4].value != NULL) {
truncsize = atoi(options[4].value); /* user defined printable size */
} else {
truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
}
} else {
- truncate = FALSE;
+ icu_truncate = FALSE;
}
if(options[5].doesOccur) {
@@ -473,7 +473,7 @@ static void printOutAlias(FILE *out, UConverter *conv
int32_t len = 0;
const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
UChar *string = quotedString(thestr);
- if(truncate && len > truncsize) {
+ if(icu_truncate && len > truncsize) {
char msg[128];
printIndent(out, converter, indent);
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -517,7 +517,7 @@ static void printOutBundle(FILE *out, UConverter *conv
UChar *string = quotedString(thestr);
/* TODO: String truncation */
- if(truncate && len > truncsize) {
+ if(icu_truncate && len > truncsize) {
char msg[128];
printIndent(out, converter, indent);
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -576,7 +576,7 @@ static void printOutBundle(FILE *out, UConverter *conv
{
int32_t len = 0;
const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
- if(truncate && len > truncsize) {
+ if(icu_truncate && len > truncsize) {
char msg[128];
printIndent(out, converter, indent);
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",

9
textproc/icu4c/pkg/PFRAG.shared
View File

@ -1,9 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2010/04/05 21:40:24 landry Exp $
@lib lib/libicudata.so.${LIBicudata_VERSION}
@lib lib/libicui18n.so.${LIBicui18n_VERSION}
@lib lib/libicuio.so.${LIBicuio_VERSION}
@lib lib/libicule.so.${LIBicule_VERSION}
@lib lib/libiculx.so.${LIBiculx_VERSION}
@lib lib/libicutest.so.${LIBicutest_VERSION}
@lib lib/libicutu.so.${LIBicutu_VERSION}
@lib lib/libicuuc.so.${LIBicuuc_VERSION}

16
textproc/icu4c/pkg/PLIST
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2013/01/05 13:16:05 ajacoutot Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.12 2013/03/24 10:28:36 ajacoutot Exp $
@bin bin/derb
@bin bin/genbrk
@bin bin/gencfu
@ -29,8 +28,6 @@ include/unicode/
include/unicode/alphaindex.h
include/unicode/appendable.h
include/unicode/basictz.h
include/unicode/bms.h
include/unicode/bmsearch.h
include/unicode/brkiter.h
include/unicode/bytestream.h
include/unicode/bytestrie.h
@ -41,7 +38,7 @@ include/unicode/chariter.h
include/unicode/choicfmt.h
include/unicode/coleitr.h
include/unicode/coll.h
include/unicode/colldata.h
include/unicode/compactdecimalformat.h
include/unicode/curramt.h
include/unicode/currpinf.h
include/unicode/currunit.h
@ -91,6 +88,7 @@ include/unicode/rbbi.h
include/unicode/rbnf.h
include/unicode/rbtz.h
include/unicode/regex.h
include/unicode/region.h
include/unicode/rep.h
include/unicode/resbund.h
include/unicode/schriter.h
@ -196,13 +194,21 @@ lib/icu/Makefile.inc
lib/icu/current
lib/icu/pkgdata.inc
lib/libicudata.a
@lib lib/libicudata.so.${LIBicudata_VERSION}
lib/libicui18n.a
@lib lib/libicui18n.so.${LIBicui18n_VERSION}
lib/libicuio.a
@lib lib/libicuio.so.${LIBicuio_VERSION}
lib/libicule.a
@lib lib/libicule.so.${LIBicule_VERSION}
lib/libiculx.a
@lib lib/libiculx.so.${LIBiculx_VERSION}
lib/libicutest.a
@lib lib/libicutest.so.${LIBicutest_VERSION}
lib/libicutu.a
@lib lib/libicutu.so.${LIBicutu_VERSION}
lib/libicuuc.a
@lib lib/libicuuc.so.${LIBicuuc_VERSION}
lib/pkgconfig/
lib/pkgconfig/icu-i18n.pc
lib/pkgconfig/icu-io.pc