| 1 |
tetromino 13/06/06 05:09:38 |
| 2 |
|
| 3 |
Added: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch |
| 4 |
Log: |
| 5 |
Fix linking failure with harfbuzz-0.9.18, and add a subslot dependency to allow for automatic rebuilding when 0.9.18-rX is subslotted. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch |
| 16 |
=================================================================== |
| 17 |
2013-05-30 Alberto Garcia <agarcia@××××××.com> |
| 18 |
|
| 19 |
[GTK] Needs to check for harfbuzz-icu |
| 20 |
https://bugs.webkit.org/show_bug.cgi?id=116978 |
| 21 |
|
| 22 |
Reviewed by Xan Lopez. |
| 23 |
|
| 24 |
HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we |
| 25 |
also need to check for it in order to get the necessary flags for |
| 26 |
the compiler and the linker. |
| 27 |
|
| 28 |
We keep this conditional for now since we still want to support |
| 29 |
earlier versions of HarfBuzz. |
| 30 |
|
| 31 |
* Source/autotools/FindDependencies.m4: |
| 32 |
|
| 33 |
Index: /trunk/Source/autotools/FindDependencies.m4 |
| 34 |
=================================================================== |
| 35 |
--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962) |
| 36 |
+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963) |
| 37 |
@@ -376,4 +376,11 @@ |
| 38 |
[cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) |
| 39 |
fi |
| 40 |
+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. |
| 41 |
+# Since we support earlier HarfBuzz versions we keep this conditional for now. |
| 42 |
+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then |
| 43 |
+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) |
| 44 |
+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" |
| 45 |
+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" |
| 46 |
+fi |
| 47 |
AC_SUBST([FREETYPE_CFLAGS]) |
| 48 |
AC_SUBST([FREETYPE_LIBS]) |
Archives