From 2b21c918a5e13433d375babc0df6c6b5565a0745 Mon Sep 17 00:00:00 2001 From: Samir Date: Tue, 5 Feb 2013 08:52:30 +0000 Subject: [PATCH] update lib32-icu --- lib32-boost-libs/PKGBUILD | 89 ++++++++++++++++ lib32-icu/PKGBUILD | 11 +- lib32-icu/icu.8198.revert.icu5431.patch | 129 ++++++++++++++++++++++++ 3 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 lib32-boost-libs/PKGBUILD create mode 100644 lib32-icu/icu.8198.revert.icu5431.patch diff --git a/lib32-boost-libs/PKGBUILD b/lib32-boost-libs/PKGBUILD new file mode 100644 index 0000000..f3390e4 --- /dev/null +++ b/lib32-boost-libs/PKGBUILD @@ -0,0 +1,89 @@ +# Lib32 Packages for Chakra, part of chakra-project.org +# +# maintainer (x86_64): Giuseppe Calà +# maintainer (x86_64): Anke Boersma + +_pkgbasename=boost-libs +pkgname=lib32-$_pkgbasename +pkgver=1.48.0 +_boostver=1_48_0 +pkgrel=1 +pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime (32 bit)" +arch=('x86_64') +url="http://www.boost.org" +license=('custom') +groups=('lib32') +depends=('lib32-bzip2' 'lib32-zlib' 'lib32-gcc-libs') +makedepends=('icu' 'bzip2' 'lib32-zlib' 'openmpi' 'gcc-multilib') +source=(http://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.tar.gz) +md5sums=('313a11e97eb56eb7efd18325354631be') + +_stagedir="${srcdir}/stagedir" + +build() +{ + export CC="gcc" + export CFLAGS="-m32" + export CXX="g++" + export CXXFLAGS="-m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + # set python path for bjam + cd "${srcdir}/boost_${_boostver}/tools" +# echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam +# echo "using python : 3.2 : /usr/bin/python3.2 : /usr/include/python3.2mu : +# /usr/lib32 ;" >> build/v2/user-config.jam +# echo "using mpi ;" >> build/v2/user-config.jam + + # build bjam + cd "${srcdir}/boost_${_boostver}/tools/build/v2/engine" + ./build.sh cc + + _bindir="bin.linuxx86" + + install -d "${_stagedir}"/usr/bin + install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam + + # build bcp + cd "${srcdir}/boost_${_boostver}/tools/bcp" + ../build/v2/engine/${_bindir}/bjam --toolset=gcc + install -m755 "${srcdir}/boost_${_boostver}/dist/bin/bcp" \ + ${_stagedir}/usr/bin/bcp + + # build libs + cd "${srcdir}/boost_${_boostver}" + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + + ./tools/build/v2/engine/${_bindir}/bjam \ + release debug-symbols=off threading=multi \ + runtime-link=shared link=shared,static \ + cflags=-fno-strict-aliasing \ + toolset=gcc \ + address-model=32 \ + --without-python \ + --without-mpi \ + --prefix="${_stagedir}" \ + -sTOOLS=gcc \ + --layout=system \ + ${MAKEFLAGS} \ + install +} + +package() +{ + install -d "${pkgdir}/usr/lib32" + + #shared libs + cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib32/" + + # license + install -D -m644 "${srcdir}/boost_${_boostver}/LICENSE_1_0.txt" \ + "${pkgdir}"/usr/share/licenses/lib32-boost-libs/LICENSE_1_0.txt +} + diff --git a/lib32-icu/PKGBUILD b/lib32-icu/PKGBUILD index bfe1358..c514b3c 100644 --- a/lib32-icu/PKGBUILD +++ b/lib32-icu/PKGBUILD @@ -1,7 +1,7 @@ # Lib32 Packages for Chakra pkgname=lib32-icu -pkgver=4.6 +pkgver=50.1.2 pkgrel=1 pkgdesc="International Components for Unicode library (32 bit)" arch=('x86_64') @@ -9,8 +9,10 @@ url="http://www.icu-project.org/" license=('custom:icu') depends=('lib32-gcc-libs' 'icu') makedepends=('gcc-multilib') -source=(http://download.icu-project.org/files/icu4c/${pkgver}/icu4c-${pkgver//./_}-src.tgz) -md5sums=('43e56b71c407be5154de681eaa646a4a') +source=(http://download.icu-project.org/files/icu4c/${pkgver}/icu4c-${pkgver//./_}-src.tgz + icu.8198.revert.icu5431.patch) +md5sums=('beb98aa972219c9fcd9c8a71314943c9' + 'ebd5470fc969c75e52baf4af94a9ee82') build() { # This version of ICU needs to set those flags @@ -24,6 +26,9 @@ build() { cd $srcdir/icu/source + # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200 + patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32 make diff --git a/lib32-icu/icu.8198.revert.icu5431.patch b/lib32-icu/icu.8198.revert.icu5431.patch new file mode 100644 index 0000000..4c3e78b --- /dev/null +++ b/lib32-icu/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) {