Revision bump in order to fix font-crash problem in libreoffice. Bug #381327

Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index d65ca3bbd40caf34f6fe009b1951fdd35d589a85..e60a53b7d7bab98c914e29022e4b571a9a8bb878 100644 (file)
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.158 2011/08/20 16:00:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.159 2011/09/05 16:50:52 scarabeus Exp $
+
+*icu-4.8.1-r1 (05 Sep 2011)
+
+  05 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -icu-4.6.1.ebuild,
+  -icu-4.8.1.ebuild, +icu-4.8.1-r1.ebuild,
+  +files/icu-4.8.1-fix_binformat_fonts.patch:
+  Revision bump in order to fix font-crash problem in libreoffice. Bug #381327
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> icu-4.8.ebuild:
   Stable for HPPA (bug #374589).

diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 89293bb72f7d9a73998c3bcc9bf1379500f82c3b..1d6a8f530ac993bb55584831b6c5401401a8125b 100644 (file)
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -3,23 +3,32 @@ Hash: SHA1
 
 AUX icu-4.6-pkgdata.patch 4214 RMD160 0cdc3d409dcdedf7ac62cc0a29142d75dbb6aeee SHA1 c0bf9c4ca0767887ef4839e5f7ae31636d01d34a SHA256 643cfce19b2091fee859462a86dac7b6119063ee67abc1132d4700c44a79c271
 AUX icu-4.6.1-parallel_installation.patch 1329 RMD160 48b673c8e56d046880340eca0c05cb0e52efde2a SHA1 2c00430f7ac4351a30ef048cf299288ab3735a33 SHA256 03ce917d8211af55ba2833039c90cf957696f6579e9b067ee26aa246363eaac7
+AUX icu-4.8.1-fix_binformat_fonts.patch 673 RMD160 b13e5d06ecb2c8b331addc7703f4d4278d5977f1 SHA1 b38a0d0f5b773069b70cae572fa2ffc5b4629547 SHA256 f298ebd4c9334f4855fecec2cb9c2d02a12653ac98b2f4bb31df3030c5b2acf7
 DIST icu4c-4_6-docs.zip 4884171 RMD160 ac5bc160bdb0f183ab0c5aa31324fa197b1a43f5 SHA1 c56518ffededdebea15525e1e25499e3e58aaec3 SHA256 863f88a12d63e1cfa449ff4010404610e2c7be4f22f98ac412d15c9e66d8a6d8
 DIST icu4c-4_6-src.tgz 15543712 RMD160 1cb84839384af5cba75bda6358c8bdaa82adaa9c SHA1 efc68a73a424d5822565feaf4468336f77294e8e SHA256 b5a1ada8127d8b79187f887903e34a87dbecea2659a139993bf81ad7309ddffc
-DIST icu4c-4_6_1-src.tgz 15561883 RMD160 decd6e5fb17e1369af91aad6685c1a39d6f63132 SHA1 b8bbf80dff1727a7528f9601b0502db1633658c3 SHA256 6846b5e67bea5cb7f5c4b0208489498a9b14bc34f2d556cc5a99209038644874
 DIST icu4c-4_8-docs.zip 10750270 RMD160 74149a52b21cdea7b4779bb1585888c82ac4b708 SHA1 c10d4dc711438763631564ace8200e3cef66f190 SHA256 dff1e6d5e674985e89b30a336d1d142cc5cf8e6c70acf398db50223cb837f0e4
 DIST icu4c-4_8-src.tgz 18620856 RMD160 77674ce09823f80810b7f5a0898881b5a62d938c SHA1 f458b41800cc21bbb92ceb119380ad3249252fd6 SHA256 45e17667b5c6886b49b43e98b8a3f6684e77e5dceda8e939af6f5c8bebd7a939
 DIST icu4c-4_8_1-docs.zip 5364512 RMD160 bc1794f99be91b7646f13ac06a96b912a1b388f5 SHA1 51f796df86f2e69c0ef1e398727a1fcb5fcbb7a3 SHA256 efcedde8bfaaf6aa33816a4124980058187868a6eedd4fe68d2d15f19977b3bd
 DIST icu4c-4_8_1-src.tgz 18677882 RMD160 2196dffbc2d074cf56f5dcbb4e2b802c950cfcf0 SHA1 f0252b2b7ad1ef861ac39b177b7a6fcb6c94eb45 SHA256 19a4cd6e94187a03bca7514d694c5a5a666567e2884ce008ca9f14fa400af88f
-EBUILD icu-4.6.1.ebuild 2313 RMD160 989f6074abc8fb8b8ec18c8290d3b606bf4d668a SHA1 55b371de43650e9b76aae4f8d9bb0eda4898bdd6 SHA256 3ba098cb35077f8e89971d360bc300c30e6a7e8bd064a308e59313e0074f916b
 EBUILD icu-4.6.ebuild 2298 RMD160 6d1c590d0ea65070ad719210284c2d8587523868 SHA1 adb4f653ccbe95464797d7770ef6b62c3f634517 SHA256 e8d571cbfb718379372612180632df65979bb211c6526d1014c28e599d4f8b59
-EBUILD icu-4.8.1.ebuild 2302 RMD160 bc2e9608122160eeb6f8af6780bbda44d1aa8aba SHA1 84518b8b9ccdf1c6cdf519f361170715ac5f8c4c SHA256 17910d296d50ecf6fa0a27c80c021489d3be3d8b5f5529c2100223249b007240
+EBUILD icu-4.8.1-r1.ebuild 2364 RMD160 70f23a6b8382c082205f00d05b8ac1980f55aaff SHA1 6e6077f373dfe281bd26b23d79da26fe7813db96 SHA256 6a82e161ff2117d87fc649d1f3c818c9c9063caecca9a9e6ef528ea6d5a56dbf
 EBUILD icu-4.8.ebuild 2283 RMD160 6ce2edd45c7147e53ff6f91a90846a8f6547de6a SHA1 4ce52186d0e8cfa0c867508300218abdb7bd59bd SHA256 bec58ae299472cdbb5a89d5a416013e21598cf66ae586d78f71a073684331155
-MISC ChangeLog 19453 RMD160 7de879ba6eb5da4c4231ae1cebe6fc71ab324b48 SHA1 7eae9a23ac14d881c408b97d64c216e5c944ce1b SHA256 0b160b1b5f1e63f0a4b5a41e1ff14027b65707c3efd3f3961d72ce22e456cc3e
+MISC ChangeLog 19731 RMD160 bc3b914fec8cfd25401ef35c92908468ed6ea90f SHA1 57b026b18e779fb637e780a97738137c752a3b81 SHA256 d02a3719fd88e4cfa8c0c18caafb380ace1ab3a655a003ae864b3ff0c9d465fd
 MISC metadata.xml 438 RMD160 ce1bd44e31ff4d1802a6cae49d78a1606d6ce7a1 SHA1 697ad724e944a504769a1436d637ce13bdc16d82 SHA256 2cb669639c4f909ae0adaf4c239460ff5b010f03d160834367326fc979c7c0db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5P2jcACgkQVWmRsqeSphOzTgCdHs/MUoSBzXCQOyze1/7IXVNS
-RSkAniNgRqJhv6s/cre7DqFbejMoe3+J
-=l5fC
+iQIcBAEBAgAGBQJOZP3wAAoJEOSiRoyO7jvo/lIP/AgFU6UID6i5ncfWGYiJNEh5
+m7XDpTU+HfvjVfd59re9hDxLE2A+K3SM2oiB4klgrZGj3sXeTuVYnsaw5Knmh9ug
+4IbWimJacMwVcvfGORTnQkWqma6FHPR0EcheJUzQRSOQf4TQ9nzw5pffQKR3ngfd
+jiMbPFbeBcviXrDFmqQeCICAYuZDJa8CC2T78KPNyZk4QZv5V+N0q8uh8VwQPdHl
+m8SHZ0awgqdKu5a+FnllvgTVolL0zMUBYXTxeZvAsFZZRfnWEPreLPKyJ2JjsdhV
+UKWzMwqtAz0a2ICI8AHmdSLIyukV5mJAsSyptunS506EYjeUDHwdcddbBtyKX4T0
+FZPSxZQaInOSN7CEb1mbByjxMuOkehvaS2RTqZwdizk+YqfOAVj8WRtTW5zKoFMV
+Sh4TzKPNY33sw703MhNcMu9zAT1AkpBOR3u2yu5L1oBSBSfEWvIlAD5vqPjownLa
+kAtRv6LuL6tTL3bfDCznuNyPgpvldl7y5x/CxsH6IT+tN56gpyskHb95dKbhztCe
+sbuc+FKpM7YueOO39UChj9KjgYnrpgnTxoD+PbXS94dkiX3fGLGLIPiQw68c/TQI
+WThXx5DoxJDkhe1/mbufObkOXYNXnFGhlNz6PgbgUbDcAx+ceSPpdUwsVqBWug4l
+cDpL2plHSci2cTLYHpq7
+=RRNq
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/icu/files/icu-4.8.1-fix_binformat_fonts.patch b/dev-libs/icu/files/icu-4.8.1-fix_binformat_fonts.patch
new file mode 100644 (file)
index 0000000..c2e0be6
--- /dev/null
+++ b/dev-libs/icu/files/icu-4.8.1-fix_binformat_fonts.patch
@@ -0,0 +1,14 @@
+diff -urN icu.old/source/layout/LookupProcessor.cpp icu/source/layout/LookupProcessor.cpp
+--- icu.old/source/layout/LookupProcessor.cpp  2011-09-05 18:35:11.221515458 +0200
++++ icu/source/layout/LookupProcessor.cpp      2011-09-05 18:41:30.021510913 +0200
+@@ -201,7 +201,9 @@
+ 
+     if (requiredFeatureIndex != 0xFFFF) {
+         requiredFeatureTable = featureListTable->getFeatureTable(requiredFeatureIndex, &requiredFeatureTag);
+-        featureReferences += SWAPW(featureTable->lookupCount);
++      if (requiredFeatureTable) {
++              featureReferences += SWAPW(requiredFeatureTable->lookupCount);
++      }
+     }
+ 
+     lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences);

diff --git a/dev-libs/icu/icu-4.6.1.ebuild b/dev-libs/icu/icu-4.6.1.ebuild
deleted file mode 100644 (file)
index a3eceb3..0000000
--- a/dev-libs/icu/icu-4.6.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.6.1.ebuild,v 1.7 2011/05/24 15:09:09 ranger Exp $
-
-EAPI="3"
-
-inherit eutils versionator
-
-MAJOR_MINOR_VERSION="$(get_version_component_range 1-2)"
-MICRO_VERSION="$(get_version_component_range 3)"
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-
-BASE_URI="http://download.icu-project.org/files/icu4c/${PV}"
-DOCS_BASE_URI="http://download.icu-project.org/files/icu4c/${MAJOR_MINOR_VERSION}"
-SRC_ARCHIVE="icu4c-${PV//./_}-src.tgz"
-DOCS_ARCHIVE="icu4c-${MAJOR_MINOR_VERSION//./_}-docs.zip"
-
-SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
-       doc? ( ${DOCS_BASE_URI}/${DOCS_ARCHIVE} )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc examples static-libs"
-
-DEPEND="doc? ( app-arch/unzip )"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}/source"
-
-QA_DT_NEEDED="/usr/lib.*/libicudata.so.${MAJOR_MINOR_VERSION/./}.${MICRO_VERSION:-0}"
-
-src_unpack() {
-       unpack "${SRC_ARCHIVE}"
-       if use doc; then
-               mkdir docs
-               pushd docs > /dev/null
-               unpack "${DOCS_ARCHIVE}"
-               popd > /dev/null
-       fi
-}
-
-src_prepare() {
-       # Do not hardcode flags into icu-config.
-       # https://ssl.icu-project.org/trac/ticket/6102
-       local variable
-       for variable in ARFLAGS CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
-               sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed"
-       done
-
-       epatch "${FILESDIR}/${P}-parallel_installation.patch"
-}
-
-src_configure() {
-       econf \
-               $(use_enable debug) \
-               $(use_enable examples samples) \
-               $(use_enable static-libs static)
-}
-
-src_test() {
-       # INTLTEST_OPTS: intltest options
-       #   -e: Exhaustive testing
-       #   -l: Reporting of memory leaks
-       #   -v: Increased verbosity
-       # IOTEST_OPTS: iotest options
-       #   -e: Exhaustive testing
-       #   -v: Increased verbosity
-       # CINTLTST_OPTS: cintltst options
-       #   -e: Exhaustive testing
-       #   -v: Increased verbosity
-       emake -j1 check || die "emake check failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dohtml ../readme.html
-       dodoc ../unicode-license.txt
-       if use doc; then
-               insinto /usr/share/doc/${PF}/html/api
-               doins -r "${WORKDIR}/docs/"* || die "doins failed"
-       fi
-}

diff --git a/dev-libs/icu/icu-4.8.1.ebuild b/dev-libs/icu/icu-4.8.1-r1.ebuild
similarity index 92%
rename from dev-libs/icu/icu-4.8.1.ebuild
rename to dev-libs/icu/icu-4.8.1-r1.ebuild
index be7d968d4821a0834840e6a908a81285b1c4325f..853df7a06d6655cc726c5af4a6a964338afd59c0 100644 (file)
--- a/dev-libs/icu/icu-4.8.1.ebuild
+++ b/dev-libs/icu/icu-4.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1.ebuild,v 1.1 2011/07/29 15:45:27 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1-r1.ebuild,v 1.1 2011/09/05 16:50:52 scarabeus Exp $
 
 EAPI="3"
 
@@ -53,6 +53,8 @@ src_prepare() {
        for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
                sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed"
        done
+
+       epatch "${FILESDIR}/icu-4.8.1-fix_binformat_fonts.patch"
 }
 
 src_configure() {