diff --git a/.abf.yml b/.abf.yml index e35db0d..33c18fc 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - icu4c-53_1-docs.zip: 1a4bbeef968f592decde2844617fa41eea1b93c6 - icu4c-53_1-src.tgz: 7eca017fdd101e676d425caaf28ef862d3655e0f + icu4c-57_1-src.tgz: ca5f5cc584f45e87bf56bf8b7f9244d12a5ada67 + icu4c-57_1-docs.zip: 1678cf37ce454c967e046926f92c6235b796956f diff --git a/icu-53.1-TestTwoDigitYear-fix.patch b/icu-53.1-TestTwoDigitYear-fix.patch deleted file mode 100644 index fba035f..0000000 --- a/icu-53.1-TestTwoDigitYear-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN icu.orig/source/test/intltest/dtfmttst.cpp icu/source/test/intltest/dtfmttst.cpp ---- icu.orig/source/test/intltest/dtfmttst.cpp 2014-06-17 16:47:24.189000000 +0400 -+++ icu/source/test/intltest/dtfmttst.cpp 2014-06-17 16:48:02.083000000 +0400 -@@ -1132,7 +1132,7 @@ - return; - } - parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5)); -- parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4)); -+ parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4)); - } - - // ------------------------------------- diff --git a/icu.7601.Indic-ccmp.patch b/icu.7601.Indic-ccmp.patch new file mode 100644 index 0000000..9de5a45 --- /dev/null +++ b/icu.7601.Indic-ccmp.patch @@ -0,0 +1,44 @@ +diff -ru orig.icu/source/layout/IndicReordering.cpp icu/source/layout/IndicReordering.cpp +--- orig.icu/source/layout/IndicReordering.cpp 2016-04-15 18:30:15.788856946 +0200 ++++ icu/source/layout/IndicReordering.cpp 2016-04-15 18:30:39.244998995 +0200 +@@ -13,6 +13,7 @@ + + U_NAMESPACE_BEGIN + ++#define ccmpFeatureTag LE_CCMP_FEATURE_TAG + #define loclFeatureTag LE_LOCL_FEATURE_TAG + #define initFeatureTag LE_INIT_FEATURE_TAG + #define nuktFeatureTag LE_NUKT_FEATURE_TAG +@@ -35,6 +36,7 @@ + #define caltFeatureTag LE_CALT_FEATURE_TAG + #define kernFeatureTag LE_KERN_FEATURE_TAG + ++#define ccmpFeatureMask 0x00000001UL + #define loclFeatureMask 0x80000000UL + #define rphfFeatureMask 0x40000000UL + #define blwfFeatureMask 0x20000000UL +@@ -73,7 +75,7 @@ + + #define repositionedGlyphMask 0x00000002UL + +-#define basicShapingFormsMask ( loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask ) ++#define basicShapingFormsMask ( ccmpFeatureMask | loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask ) + #define positioningFormsMask ( kernFeatureMask | distFeatureMask | abvmFeatureMask | blwmFeatureMask ) + #define presentationFormsMask ( presFeatureMask | abvsFeatureMask | blwsFeatureMask | pstsFeatureMask | halnFeatureMask | caltFeatureMask ) + +@@ -484,6 +486,7 @@ + #define tagArray0 (rphfFeatureMask | tagArray1) + + static const FeatureMap featureMap[] = { ++ {ccmpFeatureTag, ccmpFeatureMask}, + {loclFeatureTag, loclFeatureMask}, + {initFeatureTag, initFeatureMask}, + {nuktFeatureTag, nuktFeatureMask}, +@@ -506,6 +509,7 @@ + static const le_int32 featureCount = LE_ARRAY_SIZE(featureMap); + + static const FeatureMap v2FeatureMap[] = { ++ {ccmpFeatureTag, ccmpFeatureMask}, + {loclFeatureTag, loclFeatureMask}, + {nuktFeatureTag, nuktFeatureMask}, + {akhnFeatureTag, akhnFeatureMask}, diff --git a/icu.8198.revert.icu5431.patch b/icu.8198.revert.icu5431.patch new file mode 100644 index 0000000..4c3e78b --- /dev/null +++ b/icu.8198.revert.icu5431.patch @@ -0,0 +1,129 @@ +Index: icu/trunk/source/layout/IndicReordering.cpp +=================================================================== +--- icu/trunk/source/layout/IndicReordering.cpp (revision 25772) ++++ icu/trunk/source/layout/IndicReordering.cpp (revision 26090) +@@ -126,4 +126,8 @@ + FeatureMask fSMFeatures; + ++ LEUnicode fPreBaseConsonant; ++ LEUnicode fPreBaseVirama; ++ le_int32 fPBCIndex; ++ FeatureMask fPBCFeatures; + + void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass) +@@ -172,5 +176,6 @@ + fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups), + fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0), +- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0) ++ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0), ++ fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0) + { + // nothing else to do... +@@ -191,4 +196,6 @@ + fVMabove = fVMpost = 0; + fSMabove = fSMbelow = 0; ++ ++ fPreBaseConsonant = fPreBaseVirama = 0; + } + +@@ -386,4 +393,12 @@ + } + ++ void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features) ++ { ++ fPBCIndex = index; ++ fPreBaseConsonant = PBConsonant; ++ fPreBaseVirama = PBVirama; ++ fPBCFeatures = features; ++ } ++ + void noteBaseConsonant() + { +@@ -465,4 +480,20 @@ + } + ++ void writePreBaseConsonant() ++ { ++ // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However, ++ // it seems that almost none of the fonts for Malayalam are set up to handle this. ++ // So, we're going to force the issue here by using the rakar as defined with RA in most fonts. ++ ++ if (fPreBaseConsonant == 0x0d31) { // RRA ++ fPreBaseConsonant = 0x0d30; // RA ++ } ++ ++ if (fPreBaseConsonant != 0) { ++ writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures); ++ writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures); ++ } ++ } ++ + le_int32 getOutputIndex() + { +@@ -723,4 +754,5 @@ + } + ++ + IndicClassTable::CharClass charClass = CC_RESERVED; + IndicClassTable::CharClass nextClass = CC_RESERVED; +@@ -730,7 +762,9 @@ + le_bool seenVattu = FALSE; + le_bool seenBelowBaseForm = FALSE; ++ le_bool seenPreBaseForm = FALSE; + le_bool hasNukta = FALSE; + le_bool hasBelowBaseForm = FALSE; + le_bool hasPostBaseForm = FALSE; ++ le_bool hasPreBaseForm = FALSE; + + if (postBase < markStart && classTable->isNukta(chars[postBase])) { +@@ -746,12 +780,20 @@ + hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta; + hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta; ++ hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta; + + if (IndicClassTable::isConsonant(charClass)) { + if (postBaseLimit == 0 || seenVattu || + (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) || +- !(hasBelowBaseForm || hasPostBaseForm)) { ++ !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) { + break; + } + ++ // Note any pre-base consonants ++ if ( baseConsonant == lastConsonant && lastConsonant > 0 && ++ hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) { ++ output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2); ++ seenPreBaseForm = TRUE; ++ ++ } + // consonants with nuktas are never vattus + seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta; +@@ -786,10 +828,12 @@ + + // write any pre-base consonants ++ output.writePreBaseConsonant(); ++ + le_bool supressVattu = TRUE; + + for (i = baseLimit; i < baseConsonant; i += 1) { + LEUnicode ch = chars[i]; +- // Don't put 'blwf' on first consonant. +- FeatureMask features = (i == baseLimit? tagArray2 : tagArray1); ++ // Don't put 'pstf' or 'blwf' on anything before the base consonant. ++ FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask ); + + charClass = classTable->getCharClass(ch); +@@ -842,5 +886,5 @@ + + // write below-base consonants +- if (baseConsonant != lastConsonant) { ++ if (baseConsonant != lastConsonant && !seenPreBaseForm) { + for (i = bcSpan + 1; i < postBase; i += 1) { + output.writeChar(chars[i], i, tagArray1); +@@ -872,5 +916,5 @@ + // write post-base consonants + // FIXME: does this put the right tags on post-base consonants? +- if (baseConsonant != lastConsonant) { ++ if (baseConsonant != lastConsonant && !seenPreBaseForm) { + if (postBase <= lastConsonant) { + for (i = postBase; i <= lastConsonant; i += 1) { diff --git a/icu.8800.freeserif.crash.patch b/icu.8800.freeserif.crash.patch new file mode 100644 index 0000000..6d8061a --- /dev/null +++ b/icu.8800.freeserif.crash.patch @@ -0,0 +1,14 @@ +diff -ru orig.icu/source/layout/LookupProcessor.cpp icu/source/layout/LookupProcessor.cpp +--- orig.icu/source/layout/LookupProcessor.cpp 2016-03-23 21:56:44.000000000 +0100 ++++ icu/source/layout/LookupProcessor.cpp 2016-04-15 18:19:26.903927005 +0200 +@@ -223,7 +223,9 @@ + + if (requiredFeatureIndex != 0xFFFF) { + requiredFeatureTable = featureListTable->getFeatureTable(featureListTable, requiredFeatureIndex, &requiredFeatureTag, success); +- featureReferences += SWAPW(requiredFeatureTable->lookupCount); ++ if (requiredFeatureTable.isValid()) { ++ featureReferences += SWAPW(requiredFeatureTable->lookupCount); ++ } + } + + lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences); diff --git a/icu.spec b/icu.spec index cc2ba6f..fcc2e12 100644 --- a/icu.spec +++ b/icu.spec @@ -10,20 +10,23 @@ %define devname %mklibname %{name} -d %define tarballver %(echo %{version}|sed -e 's|\\.|_|g') -%bcond_with crosscompile +%bcond_with crosscompile Summary: International Components for Unicode Name: icu Epoch: 1 -Version: 53.1 -Release: 3 +Version: 57.1 +Release: 1 License: MIT Group: System/Libraries Url: http://www.icu-project.org/index.html Source0: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{tarballver}-src.tgz Source1: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{tarballver}-docs.zip Patch0: %{name}4c-49.1-setBreakType.patch -Patch1: icu-53.1-TestTwoDigitYear-fix.patch +# From Fedora package +Patch10: icu.7601.Indic-ccmp.patch +Patch11: icu.8198.revert.icu5431.patch +Patch12: icu.8800.freeserif.crash.patch BuildRequires: doxygen %description @@ -51,22 +54,40 @@ include: * Formatting and Parsing: dates, times, numbers, currencies, messages and rule based +%files +%{_bindir}/* +%exclude %{_bindir}/icu-config +%{_sbindir}/* + +#---------------------------------------------------------------------------- + %package doc Summary: Documentation for the International Components for Unicode -Group: System/Libraries +Group: Documentation Requires: %{name} >= %{EVRD} %description doc Documentation for the International Components for Unicode. +%files doc +%doc readme.html docs/* +%{_mandir}/man1/* +%{_mandir}/man8/* + +#---------------------------------------------------------------------------- + %package -n %{libicudata} Summary: Library for the International Components for Unicode - icudata Group: System/Libraries -Obsoletes: %{mklibname icu 44} <= 4.4.2 %description -n %{libicudata} Library for the International Components for Unicode - icudata. +%files -n %{libicudata} +%{_libdir}/libicudata.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{libicui18n} Summary: Library for the International Components for Unicode - icui18n Group: System/Libraries @@ -74,6 +95,11 @@ Group: System/Libraries %description -n %{libicui18n} Library for the International Components for Unicode - icui18n. +%files -n %{libicui18n} +%{_libdir}/libicui18n.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{libicuio} Summary: Library for the International Components for Unicode - icuio Group: System/Libraries @@ -81,6 +107,11 @@ Group: System/Libraries %description -n %{libicuio} Library for the International Components for Unicode - icuio. +%files -n %{libicuio} +%{_libdir}/libicuio.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{libicule} Summary: Library for the International Components for Unicode - icule Group: System/Libraries @@ -88,6 +119,11 @@ Group: System/Libraries %description -n %{libicule} Library for the International Components for Unicode - icule. +%files -n %{libicule} +%{_libdir}/libicule.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{libiculx} Summary: Library for the International Components for Unicode - iculx Group: System/Libraries @@ -95,6 +131,11 @@ Group: System/Libraries %description -n %{libiculx} Library for the International Components for Unicode - iculx. +%files -n %{libiculx} +%{_libdir}/libiculx.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{libicutest} Summary: Library for the International Components for Unicode - icutest Group: System/Libraries @@ -102,6 +143,11 @@ Group: System/Libraries %description -n %{libicutest} Library for the International Components for Unicode - icutest. +%files -n %{libicutest} +%{_libdir}/libicutest.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{libicutu} Summary: Library for the International Components for Unicode - icutu Group: System/Libraries @@ -109,6 +155,11 @@ Group: System/Libraries %description -n %{libicutu} Library for the International Components for Unicode - icutu. +%files -n %{libicutu} +%{_libdir}/libicutu.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{libicuuc} Summary: Library for the International Components for Unicode - icuuc Group: System/Libraries @@ -116,28 +167,49 @@ Group: System/Libraries %description -n %{libicuuc} Library for the International Components for Unicode - icuuc. +%files -n %{libicuuc} +%{_libdir}/libicuuc.so.%{major}* + +#---------------------------------------------------------------------------- + %package -n %{devname} Summary: Development files for the International Components for Unicode Group: Development/Other -Requires: %{libicudata} >= %{EVRD} -Requires: %{libicui18n} >= %{EVRD} -Requires: %{libicuio} >= %{EVRD} -Requires: %{libicule} >= %{EVRD} -Requires: %{libiculx} >= %{EVRD} -Requires: %{libicutest} >= %{EVRD} -Requires: %{libicutu} >= %{EVRD} -Requires: %{libicuuc} >= %{EVRD} +Requires: %{libicudata} = %{EVRD} +Requires: %{libicui18n} = %{EVRD} +Requires: %{libicuio} = %{EVRD} +Requires: %{libicule} = %{EVRD} +Requires: %{libiculx} = %{EVRD} +Requires: %{libicutest} = %{EVRD} +Requires: %{libicutu} = %{EVRD} +Requires: %{libicuuc} = %{EVRD} Provides: %{name}%{major}-devel = %{EVRD} Provides: %{name}-devel = %{EVRD} -#define _requires_exceptions statically\\|linked -%description -n %{devname} +%description -n %{devname} Development files and headers for the International Components for Unicode. +%files -n %{devname} +%{_bindir}/icu-config +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%dir %{_includedir}/layout +%dir %{_includedir}/unicode +%{_includedir}/layout/* +%{_includedir}/unicode/* +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* + +#---------------------------------------------------------------------------- + %prep %setup -qn %{name} %patch0 -p1 -b .setBreakType -%patch1 -p1 -b .testfix +%patch10 -p1 +%patch11 -p2 -R +%patch12 -p1 mkdir -p docs cd docs @@ -180,50 +252,3 @@ unset TARGET %endif %makeinstall_std -C source -%files -%{_bindir}/* -%exclude %{_bindir}/icu-config -%{_sbindir}/* - -%files doc -%doc readme.html docs/* -%{_mandir}/man1/* -%{_mandir}/man8/* - -%files -n %{libicudata} -%{_libdir}/libicudata.so.%{major}* - -%files -n %{libicui18n} -%{_libdir}/libicui18n.so.%{major}* - -%files -n %{libicuio} -%{_libdir}/libicuio.so.%{major}* - -%files -n %{libicule} -%{_libdir}/libicule.so.%{major}* - -%files -n %{libiculx} -%{_libdir}/libiculx.so.%{major}* - -%files -n %{libicutest} -%{_libdir}/libicutest.so.%{major}* - -%files -n %{libicutu} -%{_libdir}/libicutu.so.%{major}* - -%files -n %{libicuuc} -%{_libdir}/libicuuc.so.%{major}* - -%files -n %{devname} -%{_bindir}/icu-config -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%dir %{_includedir}/layout -%dir %{_includedir}/unicode -%{_includedir}/layout/* -%{_includedir}/unicode/* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* -