Browse Source

webkitgtk: update, still disabled

Waldemar Brodkorb 10 years ago
parent
commit
f95a5a97bc

+ 8 - 5
package/webkitgtk/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		webkitgtk
 PKG_NAME:=		webkitgtk
-PKG_VERSION:=		2.8.1
+PKG_VERSION:=		2.10.2
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		7d214459d216ca499ad75bccae7f248655d6ef5b295ffafd299773e7331860ff
+PKG_HASH:=		6adf497d24e36660037b84dfc1c53ac7f47bd4c459162290c49436eaa959a18f
 PKG_DESCR:=		web browser engine
 PKG_DESCR:=		web browser engine
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk3 libsoup
 PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk3 libsoup
@@ -19,8 +19,7 @@ PKG_URL:=		http://www.webkitgtk.org/
 PKG_SITES:=		http://webkitgtk.org/releases/
 PKG_SITES:=		http://webkitgtk.org/releases/
 PKG_OPTS:=		dev
 PKG_OPTS:=		dev
 
 
-PKG_CFLINE_WEBKITGTK:=	depends on ADK_BROKEN
-
+PKG_CFLINE_WEBKITGTK:= 	depends on ADK_BROKEN
 #PKG_CFLINE_WEBKITGTK:=	select ADK_PACKAGE_CAIRO_WITH_PDF@
 #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_PS@
 #PKG_CFLINE_WEBKITGTK+=	select ADK_PACKAGE_CAIRO_WITH_SVG@
 #PKG_CFLINE_WEBKITGTK+=	select ADK_PACKAGE_CAIRO_WITH_SVG@
@@ -30,7 +29,11 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 $(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 
 CONFIG_STYLE:=		cmake
 CONFIG_STYLE:=		cmake
-CMAKE_FLAGS+=           -DPORT=GTK -DENABLE_PLUGIN_PROCESS_GTK2=OFF
+CMAKE_FLAGS+=           -DPORT=GTK \
+			-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
+			-DENABLE_GEOLOCATION=OFF \
+			-DUSE_LIBHYPHEN=OFF \
+			-DENABLE_INTROSPECTION=OFF
 
 
 webkitgtk-install:
 webkitgtk-install:
 	$(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib
 	$(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib

+ 0 - 16
package/webkitgtk/patches/patch-Source_JavaScriptCore_CMakeLists_txt

@@ -1,16 +0,0 @@
---- webkitgtk-2.6.4.orig/Source/JavaScriptCore/CMakeLists.txt	2014-11-20 02:32:07.000000000 -0600
-+++ webkitgtk-2.6.4/Source/JavaScriptCore/CMakeLists.txt	2015-01-02 03:29:09.901992192 -0600
-@@ -611,13 +611,6 @@ if (WTF_USE_UDIS86)
-     )
- endif ()
- 
--# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
--# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
--# for finding the only Ruby interpreter.
--if (NOT RUBY_EXECUTABLE)
--    message(FATAL_ERROR "The Ruby interpreter is needed to generate LLInt files.")
--endif ()
--
- set(LLINT_ASM
-     llint/LowLevelInterpreter.asm
-     llint/LowLevelInterpreter32_64.asm