gtk-webkit-sh.patch

   1 --- webkitgtk-2.0.3/Source/autotools/FindDependencies.m4.orig   2013-06-11 11:31:36.000000000 +0200
   2 +++ webkitgtk-2.0.3/Source/autotools/FindDependencies.m4        2013-06-24 17:49:33.605399898 +0200
   3 @@ -377,8 +377,8 @@
   4  # Since we support earlier HarfBuzz versions we keep this conditional for now.
   5  if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
   6      PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
   7 -    FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
   8 -    FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
   9 +    FREETYPE_CFLAGS="$FREETYPE_CFLAGS $HARFBUZZ_ICU_CFLAGS"
  10 +    FREETYPE_LIBS="$FREETYPE_LIBS $HARFBUZZ_ICU_LIBS"
  11  fi
  12  AC_SUBST([FREETYPE_CFLAGS])
  13  AC_SUBST([FREETYPE_LIBS])
  14 @@ -450,18 +450,18 @@
  15
  16  if test "$with_acceleration_backend" = "opengl"; then
  17      if test "$enable_gles2" = "yes"; then
  18 -        acceleration_backend_description+= "(gles2"
  19 +        acceleration_backend_description="$acceleration_backend_description(gles2"
  20          OPENGL_LIBS="-lGLESv2"
  21      else
  22 -        acceleration_backend_description+="(gl"
  23 +        acceleration_backend_description="$acceleration_backend_description(gl"
  24          OPENGL_LIBS="-lGL"
  25      fi
  26      if test "$enable_egl" = "yes"; then
  27 -        acceleration_backend_description+=", egl"
  28 -        OPENGL_LIBS+=" -lEGL"
  29 +        acceleration_backend_description="$acceleration_backend_description, egl"
  30 +        OPENGL_LIBS="$OPENGL_LIBS -lEGL"
  31      fi
  32      if test "$enable_glx" = "yes"; then
  33 -        acceleration_backend_description+=", glx"
  34 +        acceleration_backend_description="$acceleration_backend_description, glx"
  35      fi
  36
  37      # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
  38 @@ -469,8 +469,8 @@
  39      AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
  40      AC_SUBST([DLOPEN_LIBS])
  41
  42 -    OPENGL_LIBS+=" $DLOPEN_LIBS"
  43 -    acceleration_backend_description+=")"
  44 +    OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
  45 +    acceleration_backend_description="$acceleration_backend_description)"
  46  fi
  47  AC_SUBST([OPENGL_LIBS])
  48