webkitgtk: update to 2.12.0

4 files changed, 23 insertions, 28 deletions

diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
index 9f6538d1b..8b8b6e533 100644
--- a/package/webkitgtk/Makefile
+++ b/package/webkitgtk/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		webkitgtk
-PKG_VERSION:=		2.10.7
+PKG_VERSION:=		2.12.0
 PKG_RELEASE:=		1
-PKG_HASH:=		990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e
+PKG_HASH:=		a68604f8fd1bcb247d647709290226289b90c16acb1f3730538b688db8df5ea6
 PKG_DESCR:=		web browser engine
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk3 libsoup
@@ -18,7 +18,6 @@ PKG_BUILDDEP+=		gst-plugins-base gstreamer cairo enchant
 PKG_URL:=		http://www.webkitgtk.org/
 PKG_SITES:=		http://webkitgtk.org/releases/
 PKG_OPTS:=		dev
-PKG_NOPARALLEL:=	1
 
 PKG_CFLINE_WEBKITGTK:=	select ADK_PACKAGE_CAIRO_WITH_PDF@
 PKG_CFLINE_WEBKITGTK+=	select ADK_PACKAGE_CAIRO_WITH_PS@
@@ -29,12 +28,16 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
-TARGET_CXXFLAGS+=	-D__STDC_LIMIT_MACROS
+TARGET_CXXFLAGS+=	-D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
 XAKE_FLAGS+=		VERBOSE=1
 CONFIG_STYLE:=		cmake
-CMAKE_FLAGS+=           -DPORT=GTK \
-			-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
+CMAKE_FLAGS+=           -DCMAKE_BUILD_TYPE=Release \
+			-DPORT=GTK \
+			-DENABLE_API_TESTS=OFF \
+			-DENABLE_GTKDOC=OFF \
 			-DENABLE_GEOLOCATION=OFF \
+			-DENABLE_MINIBROWSER=ON \
+			-DUSE_LIBNOTIFY=OFF \
 			-DUSE_LIBHYPHEN=OFF \
 			-DENABLE_INTROSPECTION=OFF
 
@@ -42,7 +45,7 @@ webkitgtk-install:
 	$(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libjavascriptcoregtk*.so* \
 		$(IDIR_WEBKITGTK)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libwebkitgtk*.so* \
+	$(CP) $(WRKINST)/usr/lib/libwebkit2gtk*.so* \
 		$(IDIR_WEBKITGTK)/usr/lib
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp b/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp
deleted file mode 100644
index 2d1a35c7e..000000000
--- a/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- webkitgtk-2.10.7.orig/Source/JavaScriptCore/runtime/Options.cpp	2016-01-29 17:29:32.000000000 +0100
-+++ webkitgtk-2.10.7/Source/JavaScriptCore/runtime/Options.cpp	2016-03-02 07:46:04.000000000 +0100
-@@ -610,7 +610,7 @@ bool Option::operator==(const Option& ot
-     case Options::Type::unsignedType:
-         return m_entry.unsignedVal == other.m_entry.unsignedVal;
-     case Options::Type::doubleType:
--        return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal));
-+        return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
-     case Options::Type::int32Type:
-         return m_entry.int32Val == other.m_entry.int32Val;
-     case Options::Type::optionRangeType:
diff --git a/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake b/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake
new file mode 100644
index 000000000..863e86475
--- /dev/null
+++ b/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake
@@ -0,0 +1,7 @@
+--- webkitgtk-2.12.0.orig/Source/PlatformGTK.cmake	2016-03-17 08:51:05.000000000 +0100
++++ webkitgtk-2.12.0/Source/PlatformGTK.cmake	2016-04-03 10:54:31.244767406 +0200
+@@ -1,4 +1,3 @@
+-add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
+ 
+ # This allows exposing a 'gir' target which builds all GObject introspection files.
+ if (ENABLE_INTROSPECTION)
diff --git a/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp
index f5566ff08..103391413 100644
--- a/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp
+++ b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp
@@ -1,15 +1,11 @@
---- webkitgtk-2.10.7.orig/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2016-01-29 17:29:33.000000000 +0100
-+++ webkitgtk-2.10.7/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2016-03-02 19:21:10.000000000 +0100
-@@ -201,8 +201,12 @@ void MemoryPressureHandler::respondToMem
+--- webkitgtk-2.12.0.orig/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2016-03-22 09:38:02.000000000 +0100
++++ webkitgtk-2.12.0/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2016-04-05 09:42:03.711465052 +0200
+@@ -201,7 +201,7 @@ void MemoryPressureHandler::respondToMem
  
  void MemoryPressureHandler::platformReleaseMemory(Critical)
  {
-+#ifndef __UCLIBC__
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
      ReliefLogger log("Run malloc_trim");
      malloc_trim(0);
-+#else
-+    ReliefLogger log("malloc_trim not available");
-+#endif
- }
- 
- void MemoryPressureHandler::ReliefLogger::platformLog()
+ #endif