Fix build with system harfbuzz-0.9.18, bug #472416 by Ivan Atienza.

(Portage version: 2.1.11.62/cvs/Linux i686, signed Manifest commit with key 30427902)

5 files changed, 62 insertions, 7 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 75303bdb26cb..6ba461e85b4b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.893 2013/06/05 09:22:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.894 2013/06/06 16:45:18 phajdan.jr Exp $
+
+  06 Jun 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-harfbuzz-r0.patch, chromium-28.0.1500.20.ebuild,
+  chromium-29.0.1521.3.ebuild, chromium-9999-r1.ebuild:
+  Fix build with system harfbuzz-0.9.18, bug #472416 by Ivan Atienza.
 
   05 Jun 2013; Agostino Sarubbo <ago@gentoo.org> chromium-27.0.1453.110.ebuild:
   Stable for x86, wrt bug #472350
diff --git a/www-client/chromium/chromium-28.0.1500.20.ebuild b/www-client/chromium/chromium-28.0.1500.20.ebuild
index e28bc0c08de3..f96a2cc6d6e7 100644
--- a/www-client/chromium/chromium-28.0.1500.20.ebuild
+++ b/www-client/chromium/chromium-28.0.1500.20.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/www-client/chromium/chromium-28.0.1500.20.ebuild,v 1.2 2013/06/02 10:00:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1500.20.ebuild,v 1.3 2013/06/06 16:45:18 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -51,7 +51,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/flac:=
-	media-libs/harfbuzz:=
+	media-libs/harfbuzz:=[icu(+)]
 	>=media-libs/libjpeg-turbo-1.2.0-r1:=
 	media-libs/libpng:0=
 	media-libs/libvpx:=
@@ -133,6 +133,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r5.patch"
 
+	# Fix build with harfbuzz-0.9.18, bug #472416 .
+	epatch "${FILESDIR}/${PN}-system-harfbuzz-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
diff --git a/www-client/chromium/chromium-29.0.1521.3.ebuild b/www-client/chromium/chromium-29.0.1521.3.ebuild
index 35647f303863..c956678497a4 100644
--- a/www-client/chromium/chromium-29.0.1521.3.ebuild
+++ b/www-client/chromium/chromium-29.0.1521.3.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/www-client/chromium/chromium-29.0.1521.3.ebuild,v 1.2 2013/06/02 10:00:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1521.3.ebuild,v 1.3 2013/06/06 16:45:18 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -55,7 +55,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/flac:=
-	media-libs/harfbuzz:=
+	media-libs/harfbuzz:=[icu(+)]
 	>=media-libs/libjpeg-turbo-1.2.0-r1:=
 	media-libs/libpng:0=
 	media-libs/libvpx:=
@@ -138,6 +138,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.patch"
 
+	# Fix build with harfbuzz-0.9.18, bug #472416 .
+	epatch "${FILESDIR}/${PN}-system-harfbuzz-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 3c6c60d16320..4023a9044869 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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/www-client/chromium/chromium-9999-r1.ebuild,v 1.196 2013/05/29 21:49:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.197 2013/06/06 16:45:18 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -54,7 +54,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac:=
-	media-libs/harfbuzz:=
+	media-libs/harfbuzz:=[icu(+)]
 	>=media-libs/libjpeg-turbo-1.2.0-r1:=
 	media-libs/libpng:0=
 	media-libs/libvpx:=
diff --git a/www-client/chromium/files/chromium-system-harfbuzz-r0.patch b/www-client/chromium/files/chromium-system-harfbuzz-r0.patch
new file mode 100644
index 000000000000..769b67313cfe
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-harfbuzz-r0.patch
@@ -0,0 +1,44 @@
+Index: build/linux/unbundle/harfbuzz.gyp
+diff --git a/build/linux/unbundle/harfbuzz.gyp b/build/linux/unbundle/harfbuzz.gyp
+index 456dd384df2d5c57d9857cfb775d46ef87add2bc..93b2a69c12d7b7524fa0c2aa67b52136b779196d 100644
+--- a/build/linux/unbundle/harfbuzz.gyp
++++ b/build/linux/unbundle/harfbuzz.gyp
+@@ -3,24 +3,34 @@
+ # found in the LICENSE file.
+ 
+ {
++  'variables': {
++    # Check for presence of harfbuzz-icu library, use it if present.
++    'harfbuzz_libraries':
++        '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
++        '--code "int main() { return 0; }" '
++        '--run-linker '
++        '--on-success "harfbuzz harfbuzz-icu" '
++        '--on-failure "harfbuzz" '
++        '-- -lharfbuzz-icu)',
++  },
+   'targets': [
+     {
+       'target_name': 'harfbuzz-ng',
+       'type': 'none',
+       'cflags': [
+-        '<!@(pkg-config --cflags harfbuzz)',
++        '<!@(pkg-config --cflags <(harfbuzz_libraries))',
+       ],
+       'direct_dependent_settings': {
+         'cflags': [
+-          '<!@(pkg-config --cflags harfbuzz)',
++          '<!@(pkg-config --cflags <(harfbuzz_libraries))',
+         ],
+       },
+       'link_settings': {
+         'ldflags': [
+-          '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)',
++          '<!@(pkg-config --libs-only-L --libs-only-other <(harfbuzz_libraries))',
+         ],
+         'libraries': [
+-          '<!@(pkg-config --libs-only-l harfbuzz)',
++          '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))',
+         ],
+       },
+     },