gtk-webkit3-sh.patch

   1 --- webkitgtk-2.0.0/Source/autotools/FindDependencies.m4.orig   2013-03-26 19:25:38.000000000 +0100
   2 +++ webkitgtk-2.0.0/Source/autotools/FindDependencies.m4        2013-04-01 21:33:59.797598840 +0200
   3 @@ -441,18 +441,18 @@
   4
   5  if test "$with_acceleration_backend" = "opengl"; then
   6      if test "$enable_gles2" = "yes"; then
   7 -        acceleration_backend_description+= "(gles2"
   8 +        acceleration_backend_description="$acceleration_backend_description(gles2"
   9          OPENGL_LIBS="-lGLESv2"
  10      else
  11 -        acceleration_backend_description+="(gl"
  12 +        acceleration_backend_description="$acceleration_backend_description(gl"
  13          OPENGL_LIBS="-lGL"
  14      fi
  15      if test "$enable_egl" = "yes"; then
  16 -        acceleration_backend_description+=", egl"
  17 -        OPENGL_LIBS+=" -lEGL"
  18 +        acceleration_backend_description="$acceleration_backend_description, egl"
  19 +        OPENGL_LIBS="$OPENGL_LIBS -lEGL"
  20      fi
  21      if test "$enable_glx" = "yes"; then
  22 -        acceleration_backend_description+=", glx"
  23 +        acceleration_backend_description="$acceleration_backend_description, glx"
  24      fi
  25
  26      # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
  27 @@ -460,8 +460,8 @@
  28      AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
  29      AC_SUBST([DLOPEN_LIBS])
  30
  31 -    OPENGL_LIBS+=" $DLOPEN_LIBS"
  32 -    acceleration_backend_description+=")"
  33 +    OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
  34 +    acceleration_backend_description="$acceleration_backend_description)"
  35  fi
  36  AC_SUBST([OPENGL_LIBS])
  37
  38 --- webkitgtk-2.0.0/Source/autotools/SetupWebKitFeatures.m4.orig        2013-04-12 19:48:10.867922095 +0200
  39 +++ webkitgtk-2.0.0/Source/autotools/SetupWebKitFeatures.m4     2013-04-12 20:02:21.254571037 +0200
  40 @@ -12,7 +12,7 @@
  41  # This list of features represents those selected for release builds.
  42  # If you are adding a new or unstable feature, you should mark it
  43  # disabled here.
  44 -read -d '' DEFAULT_FEATURE_DEFINES <<"EOF"
  45 +DEFAULT_FEATURE_DEFINES="
  46         ENABLE_ACCELERATED_2D_CANVAS=0
  47         ENABLE_BATTERY_STATUS=0
  48         ENABLE_BLOB=1
  49 @@ -107,7 +107,7 @@
  50         ENABLE_WEB_TIMING=1
  51         ENABLE_WORKERS=1
  52         ENABLE_XHR_TIMEOUT=1
  53 -EOF
  54 +"
  55
  56  if test "$enable_spellcheck" = "yes"; then
  57      DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SPELLCHECK=1"