[HarfBuzz] ICU detection fix in HarfBuzz obsoletes our workaround

https://bugs.webkit.org/show_bug.cgi?id=112166

HarfBuzz 0.9.14 merged my patch for icu detection without
pkg-config files, as needed by for example Ubuntu 12.04.
This obsoletes our local workaround. Removed it for GTK and EFL.

Reviewed by Martin Robinson.

* efl/jhbuild.modules: Patch reference removed, version bumped to 0.9.14.
* efl/patches/harfbuzz-icu-detection-fix.patch: Removed.
* gtk/jhbuild.modules: Patch reference removed, version bumped to 0.9.14.
* gtk/patches/harfbuzz-icu-detection-fix.patch: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146778 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 50491db..e3b839a 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2013-03-25  Dominik Röttsches  <dominik.rottsches@intel.com>
+
+        [HarfBuzz] ICU detection fix in HarfBuzz obsoletes our workaround
+        https://bugs.webkit.org/show_bug.cgi?id=112166
+
+        HarfBuzz 0.9.14 merged my patch for icu detection without
+        pkg-config files, as needed by for example Ubuntu 12.04.
+        This obsoletes our local workaround. Removed it for GTK and EFL.
+
+        Reviewed by Martin Robinson.
+
+        * efl/jhbuild.modules: Patch reference removed, version bumped to 0.9.14.
+        * efl/patches/harfbuzz-icu-detection-fix.patch: Removed.
+        * gtk/jhbuild.modules: Patch reference removed, version bumped to 0.9.14.
+        * gtk/patches/harfbuzz-icu-detection-fix.patch: Removed.
+
 2013-03-22  Kiran Muppala  <cmuppala@apple.com>
 
         Unreviewed.  Move self from contributor to committer list.

diff --git a/Tools/efl/jhbuild.modules b/Tools/efl/jhbuild.modules
index 99c278e..9e5cf26 100644 (file)
--- a/Tools/efl/jhbuild.modules
+++ b/Tools/efl/jhbuild.modules
@@ -162,12 +162,11 @@
   </autotools>
 
  <autotools id="harfbuzz" autogen-sh="configure">
-   <branch module="software/harfbuzz/release/harfbuzz-0.9.7.tar.bz2" version="0.9.7"
-           checkoutdir="harfbuzz-0.9.7"
+   <branch module="software/harfbuzz/release/harfbuzz-0.9.14.tar.bz2" version="0.9.14"
+           checkoutdir="harfbuzz-0.9.14"
            repo="freedesktop.org"
-           hash="sha256:bd2999859f8828461fedae23e4af52d926ac32a73245f03ae2d2065205e9cf25"
-           md5sum="db5382728a912352633d3be2e2a1d988">
-     <patch file="harfbuzz-icu-detection-fix.patch" strip="1" />
+           hash="sha256:d07c0ffdbbbfdfbb6c65e73fe9c76466e87dbf04b094cbd0abf5fd7d571a4004"
+           md5sum="7e1990b79060e98e2d31f677a0ac9eed">
    </branch>
  </autotools>
 

diff --git a/Tools/efl/patches/harfbuzz-icu-detection-fix.patch b/Tools/efl/patches/harfbuzz-icu-detection-fix.patch
deleted file mode 100644 (file)
index 567e24d..0000000
--- a/Tools/efl/patches/harfbuzz-icu-detection-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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

diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index 9abd92f..d04a090 100644 (file)
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -92,15 +92,14 @@
             md5sum="647ee8ed266f9a4117c8d0a4855b3d3e"/>
   </tarball>
 
- <autotools id="harfbuzz" autogen-sh="configure">
-   <branch module="software/harfbuzz/release/harfbuzz-0.9.7.tar.bz2" version="0.9.7"
-           checkoutdir="harfbuzz-0.9.7"
-           repo="freedesktop.org"
-           hash="sha256:bd2999859f8828461fedae23e4af52d926ac32a73245f03ae2d2065205e9cf25"
-           md5sum="db5382728a912352633d3be2e2a1d988">
-     <patch file="harfbuzz-icu-detection-fix.patch" strip="1" />
-   </branch>
- </autotools>
+  <autotools id="harfbuzz" autogen-sh="configure">
+    <branch module="software/harfbuzz/release/harfbuzz-0.9.14.tar.bz2" version="0.9.14"
+            checkoutdir="harfbuzz-0.9.14"
+            repo="freedesktop.org"
+            hash="sha256:d07c0ffdbbbfdfbb6c65e73fe9c76466e87dbf04b094cbd0abf5fd7d571a4004"
+            md5sum="7e1990b79060e98e2d31f677a0ac9eed">
+    </branch>
+  </autotools>
 
   <autotools id="libffi" autogen-sh="configure">
     <branch module="libffi/libffi-3.0.10.tar.gz" version="3.0.10"

diff --git a/Tools/gtk/patches/harfbuzz-icu-detection-fix.patch b/Tools/gtk/patches/harfbuzz-icu-detection-fix.patch
deleted file mode 100644 (file)
index 567e24d..0000000
--- a/Tools/gtk/patches/harfbuzz-icu-detection-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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