diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-03-02 20:02:34 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-03-02 20:03:16 +0100 |
| commit | 2498dca71d0f694dc7fcab6a73a3d04b2c475ea8 (patch) | |
| tree | ec1412b4bee000267229a13015d234d9c4fb30ee /package/webkitgtk | |
| parent | 3a0e1284a72e9c8e6c637fa66f37253003de35fc (diff) | |
webkitgtk: update and add some patches
Diffstat (limited to 'package/webkitgtk')
3 files changed, 37 insertions, 8 deletions
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index 30fcdb47b..9f6538d1b 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -4,30 +4,33 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= webkitgtk -PKG_VERSION:= 2.10.2 +PKG_VERSION:= 2.10.7 PKG_RELEASE:= 1 -PKG_HASH:= 6adf497d24e36660037b84dfc1c53ac7f47bd4c459162290c49436eaa959a18f +PKG_HASH:= 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e PKG_DESCR:= web browser engine PKG_SECTION:= libs/misc PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup PKG_DEPENDS+= libsecret libxt harfbuzz cairo -PKG_DEPENDS+= gst-plugins-base gstreamer +PKG_DEPENDS+= gst-plugins-base gstreamer libnotify PKG_BUILDDEP:= glib icu4c zlib libwebp gtk3 cmake-host -PKG_BUILDDEP+= libsoup libsecret libXt harfbuzz +PKG_BUILDDEP+= libsoup libsecret libXt harfbuzz libnotify 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:= depends on ADK_BROKEN -#PKG_CFLINE_WEBKITGTK:= select ADK_PACKAGE_CAIRO_WITH_PDF@ -#PKG_CFLINE_WEBKITGTK+= select ADK_PACKAGE_CAIRO_WITH_PS@ -#PKG_CFLINE_WEBKITGTK+= select ADK_PACKAGE_CAIRO_WITH_SVG@ +PKG_CFLINE_WEBKITGTK:= select ADK_PACKAGE_CAIRO_WITH_PDF@ +PKG_CFLINE_WEBKITGTK+= select ADK_PACKAGE_CAIRO_WITH_PS@ +PKG_CFLINE_WEBKITGTK+= select ADK_PACKAGE_CAIRO_WITH_SVG@ 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 +XAKE_FLAGS+= VERBOSE=1 CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DPORT=GTK \ -DENABLE_PLUGIN_PROCESS_GTK2=OFF \ diff --git a/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp b/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp new file mode 100644 index 000000000..2d1a35c7e --- /dev/null +++ b/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp @@ -0,0 +1,11 @@ +--- 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_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp new file mode 100644 index 000000000..f5566ff08 --- /dev/null +++ b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp @@ -0,0 +1,15 @@ +--- 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 + + void MemoryPressureHandler::platformReleaseMemory(Critical) + { ++#ifndef __UCLIBC__ + ReliefLogger log("Run malloc_trim"); + malloc_trim(0); ++#else ++ ReliefLogger log("malloc_trim not available"); ++#endif + } + + void MemoryPressureHandler::ReliefLogger::platformLog() |