Title: [137155] trunk/Tools
- Revision
- 137155
- Author
- mrobin...@webkit.org
- Date
- 2012-12-10 07:20:47 -0800 (Mon, 10 Dec 2012)
Log Message
Build fix.
Add a patchfile missing from my previous commit.
* gtk/patches/harfbuzz-icu-detection-fix.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (137154 => 137155)
--- trunk/Tools/ChangeLog 2012-12-10 15:20:30 UTC (rev 137154)
+++ trunk/Tools/ChangeLog 2012-12-10 15:20:47 UTC (rev 137155)
@@ -1,5 +1,13 @@
2012-12-10 Martin Robinson <mrobin...@igalia.com>
+ Build fix.
+
+ Add a patchfile missing from my previous commit.
+
+ * gtk/patches/harfbuzz-icu-detection-fix.patch: Added.
+
+2012-12-10 Martin Robinson <mrobin...@igalia.com>
+
REGRESSION(137127): Causes assertion failures on the debug bots
https://bugs.webkit.org/show_bug.cgi?id=104549
Added: trunk/Tools/gtk/patches/harfbuzz-icu-detection-fix.patch (0 => 137155)
--- trunk/Tools/gtk/patches/harfbuzz-icu-detection-fix.patch (rev 0)
+++ trunk/Tools/gtk/patches/harfbuzz-icu-detection-fix.patch 2012-12-10 15:20:47 UTC (rev 137155)
@@ -0,0 +1,36 @@
+diff --git a/configure.ac b/configure.ac
+index b1948f1..9ae69dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,6 +184,31 @@ fi
+ AM_CONDITIONAL(HAVE_ICU_LE, $have_icu_le)
+
+ dnl ==========================================================================
++dnl Fallback to icu-config if ICU pkg-config files could not be found
++dnl ==========================================================================
++
++if test "$have_icu" != "true"; then
++ AC_PATH_PROG(icu_config, icu-config, no)
++ AC_MSG_CHECKING([for ICU by using icu-config fallback])
++ if test "$icu_config" != "no"; then
++ # We don't use --cflags as this gives us a lot of things that we don't
++ # necessarily want, like debugging and optimization flags
++ # See man (1) icu-config for more info.
++ ICU_CFLAGS=`$icu_config --cppflags`
++ ICU_LIBS=`$icu_config --ldflags-libsonly --ldflags-layout`
++ AC_SUBST(ICU_CFLAGS)
++ AC_SUBST(ICU_LIBS)
++ AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library])
++ AC_DEFINE(HAVE_ICU, 1, [Have ICU library])
++ AM_CONDITIONAL(HAVE_ICU, true)
++ AM_CONDITIONAL(HAVE_ICU_LE, true)
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ fi
++fi
++
++dnl ==========================================================================
+
+ PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false)
+ if $have_graphite; then
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
