summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-04-24 12:40:32 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-04-24 12:40:32 +0000
commit2598ae85a7a89f3eb7b46ac3c30cfd9cf4493859 (patch)
treedb1621f624da9de2094ce302736f4b0cb60d3181
parentsci-libs/nlopt: Fix deprecated macro usage, #466988 (diff)
downloadgentoo-2-2598ae85a7a89f3eb7b46ac3c30cfd9cf4493859.tar.gz
gentoo-2-2598ae85a7a89f3eb7b46ac3c30cfd9cf4493859.tar.bz2
gentoo-2-2598ae85a7a89f3eb7b46ac3c30cfd9cf4493859.zip
Enable harfbuzz build instead of using ICU LE, without switch.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 4b4d54db340a..ac0a91790aad 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.459 2013/04/19 10:42:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.460 2013/04/24 12:40:32 scarabeus Exp $
+
+ 24 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Enable harfbuzz build instead of using ICU LE, without switch.
19 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.2.2.ebuild,
libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 2adccc52c04d..225dc1555f72 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.169 2013/04/19 10:42:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.170 2013/04/24 12:40:32 scarabeus Exp $
EAPI=5
@@ -119,6 +119,7 @@ COMMON_DEPEND="
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.10:=
media-libs/lcms:2
>=media-libs/libpng-1.4
>=media-libs/libcdr-0.0.5
@@ -412,6 +413,7 @@ src_configure() {
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
+ # --enable-harfbuzz: disabling uses ICU LE which is unmaintained and broken
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
@@ -432,6 +434,7 @@ src_configure() {
--with-system-dicts \
--enable-cairo-canvas \
--enable-graphite \
+ --enable-harfbuzz \
--enable-largefile \
--enable-mergelibs \
--enable-python=system \