Get rid of GCC 4.9.0 dependency disabling IndexedDB support.

In order to get rid of GCC_REQD disable IndexedDB support and
WebKitDatabaseProcess (that needs IndexedDB). Both were not present in
webkit-gtk<2.10.
Bump PKGREVISION.

4 files changed, 55 insertions, 17 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 09317321872..724ee97c02d 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.101 2015/10/24 13:37:45 leot Exp $
+# $NetBSD: Makefile,v 1.102 2015/10/25 16:48:23 leot Exp $
 
 DISTNAME=	webkitgtk-2.10.2
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -21,8 +22,11 @@ USE_LANGUAGES=	c c++
 #USE_LIBTOOL=	yes
 USE_TOOLS+=	automake bison gmake perl:build pkg-config msgfmt
 
-# GCC >= 4.9 or Clang >= 3.3
-GCC_REQD+=	4.9
+# GCC >= 4.7 or Clang >= 3.3
+# XXX: Kludge, upstream needs GCC 4.9.0 for IndexedDB support.
+# XXX: patches/patch-Source_cmake_OptionsGTK.cmake disables that to
+# XXX: avoid requiring GCC 4.9.0.
+GCC_REQD+=	4.7
 
 # Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
 # versions of ld.gold.
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index f369d3a7610..52bd14638b2 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2015/10/24 13:37:45 leot Exp $
+@comment $NetBSD: PLIST,v 1.28 2015/10/25 16:48:23 leot Exp $
 bin/MiniBrowser
 bin/jsc
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
@@ -288,7 +288,6 @@ lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
-libexec/webkit2gtk-4.0/WebKitDatabaseProcess
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess2
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 9c170b59eaa..52f17c2f128 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2015/10/24 13:37:45 leot Exp $
+$NetBSD: distinfo,v 1.83 2015/10/25 16:48:23 leot Exp $
 
 SHA1 (webkitgtk-2.10.2.tar.xz) = 34743186985299355eb84c04a944c7decf21a8e6
 RMD160 (webkitgtk-2.10.2.tar.xz) = 768d1a1e3af7497369af9392815101b7004139ce
@@ -12,6 +12,6 @@ SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829
 SHA1 (patch-Source_WTF_wtf_Platform.h) = cbf239e3b05909b63a33fbe5ced4f8b8743ce4aa
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29
-SHA1 (patch-Source_cmake_OptionsGTK.cmake) = afcfdbb5688dfa13f7f6b5cc4003bc66f6488593
+SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 620bfd4bae3eaf638fda0a1da3707e842a34adab
 SHA1 (patch-ai) = f0b059fe71022e961903655f5c2a5205fe452968
 SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
diff --git a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
index 03a28f98c95..783cd40bb2a 100644
--- a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
+++ b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
@@ -1,18 +1,35 @@
-$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.3 2015/10/24 13:37:45 leot Exp $
+$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.4 2015/10/25 16:48:23 leot Exp $
 
-Do not conflict with CMAKE_MODULE_PATH during the linking phase of
-libwebkit2gtk-4.0.so:
+o Do not require GCC 4.9.0 (should be build *without* IndexedDB support)
+o Do not conflict with CMAKE_MODULE_PATH during the linking phase of
+  libwebkit2gtk-4.0.so:
 
- Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so
- ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: ignoring invalid character `3' in script
- [...]
- ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: syntax error in VERSION script
- Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed
- [...]
+   Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so
+   ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: ignoring invalid character `3' in script
+   [...]
+   ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: syntax error in VERSION script
+   Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed
+   [...]
+
+o Disable DatabaseProcess and IndexedDB support.
 
 --- Source/cmake/OptionsGTK.cmake.orig	2015-10-15 09:18:14.000000000 +0000
 +++ Source/cmake/OptionsGTK.cmake
-@@ -105,7 +105,7 @@ else ()
+@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 2)
+ set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
+ set(WEBKITGTK_API_VERSION 4.0)
+ 
+-# IndexedDB support requires GCC 4.9, see https://bugs.webkit.org/show_bug.cgi?id=98932.
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")
+-        message(FATAL_ERROR "GCC 4.9.0 is required to build WebKitGTK+, use a newer GCC version or clang")
+-    endif ()
+-endif ()
+-
+ # Libtool library version, not to be confused with API version.
+ # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
+ CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 5 11)
+@@ -105,7 +98,7 @@ else ()
      WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF)
      WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
      if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -21,3 +38,21 @@ libwebkit2gtk-4.0.so:
      endif ()
  endif ()
  
+@@ -140,7 +133,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF)
+-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PRIVATE OFF)
+@@ -150,7 +143,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PRIVATE OFF)
+-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_WEB_AUDIO PRIVATE OFF)