X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gtk-webkit3-sh.patch;h=0e3f5a805decca24c00661ac3ebac8c7b04f88f2;hb=333087b6047d1341d9350f0361e8d531d3f54cba;hp=3f3d90ee4b978a717473c8d2cb7a9b7a2e108a51;hpb=27aa13a9c5aa61e079d4746f8674ae5e7a66345e;p=packages%2Fgtk-webkit3.git

diff --git a/gtk-webkit3-sh.patch b/gtk-webkit3-sh.patch
index 3f3d90e..0e3f5a8 100644
--- a/gtk-webkit3-sh.patch
+++ b/gtk-webkit3-sh.patch
@@ -1,6 +1,17 @@
---- webkitgtk-2.0.0/Source/autotools/FindDependencies.m4.orig	2013-03-26 19:25:38.000000000 +0100
-+++ webkitgtk-2.0.0/Source/autotools/FindDependencies.m4	2013-04-01 21:33:59.797598840 +0200
-@@ -441,18 +441,18 @@
+--- webkitgtk-2.0.3/Source/autotools/FindDependencies.m4.orig	2013-06-11 11:31:36.000000000 +0200
++++ webkitgtk-2.0.3/Source/autotools/FindDependencies.m4	2013-06-24 17:49:33.605399898 +0200
+@@ -377,8 +377,8 @@
+ # Since we support earlier HarfBuzz versions we keep this conditional for now.
+ if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
+     PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
+-    FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
+-    FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
++    FREETYPE_CFLAGS="$FREETYPE_CFLAGS $HARFBUZZ_ICU_CFLAGS"
++    FREETYPE_LIBS="$FREETYPE_LIBS $HARFBUZZ_ICU_LIBS"
+ fi
+ AC_SUBST([FREETYPE_CFLAGS])
+ AC_SUBST([FREETYPE_LIBS])
+@@ -450,18 +450,18 @@
  
  if test "$with_acceleration_backend" = "opengl"; then
      if test "$enable_gles2" = "yes"; then
@@ -24,7 +35,7 @@
      fi
  
      # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
-@@ -460,8 +460,8 @@
+@@ -469,8 +469,8 @@
      AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
      AC_SUBST([DLOPEN_LIBS])