From 6bda4b4924af954486482f313b058d556129f0d9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 10 Feb 2015 11:41:57 -0600 Subject: some updates, midori still broken --- package/webkitgtk/Makefile | 25 ++++++++-------------- package/webkitgtk/patches/patch-CMakeLists_txt | 10 +++++++++ .../webkitgtk/patches/patch-CMakeLists_txt.orig | 10 +++++++++ .../patch-Source_JavaScriptCore_CMakeLists_txt | 16 ++++++++++++++ 4 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 package/webkitgtk/patches/patch-CMakeLists_txt create mode 100644 package/webkitgtk/patches/patch-CMakeLists_txt.orig create mode 100644 package/webkitgtk/patches/patch-Source_JavaScriptCore_CMakeLists_txt (limited to 'package/webkitgtk') diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index b0368c60d..43cae5da5 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -4,17 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= webkitgtk -PKG_VERSION:= 2.4.3 +PKG_VERSION:= 2.7.3 PKG_RELEASE:= 1 -PKG_HASH:= 9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac +PKG_HASH:= 06243dfda689e83d170a31d6ea288f51790ddc596faa8a6b44f464006528b7f8 PKG_DESCR:= web browser engine PKG_SECTION:= libs/misc -PKG_DEPENDS:= glib icu4c zlib libwebp libgtk libsoup +PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup PKG_DEPENDS+= libsecret libxt harfbuzz cairo PKG_DEPENDS+= gst-plugins-base gstreamer -PKG_BUILDDEP:= glib icu4c zlib libwebp gtk+ +PKG_BUILDDEP:= glib icu4c zlib libwebp gtk3 cmake-host PKG_BUILDDEP+= libsoup libsecret libXt harfbuzz -PKG_BUILDDEP+= gst-plugins-base gstreamer cairo +PKG_BUILDDEP+= gst-plugins-base gstreamer cairo enchant PKG_URL:= http://www.webkitgtk.org/ PKG_SITES:= http://webkitgtk.org/releases/ PKG_OPTS:= dev @@ -27,17 +27,10 @@ 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})) +$(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -MAKE_FILE:= GNUmakefile -CONFIGURE_ENV+= AR_FLAGS="cr" -CONFIGURE_ARGS+= --with-gtk=2.0 \ - --disable-webkit2 \ - --disable-geolocation - -pre-build: - mkdir -p $(WRKBUILD)/DerivedSources/{webkit,webkitdom,InjectedBundle,Platform,ANGLE} - mkdir -p $(WRKBUILD)/DerivedSources/WebKit2/webkit2gtk/webkit2 +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DPORT=GTK -DENABLE_PLUGIN_PROCESS_GTK2=OFF webkitgtk-install: $(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib @@ -46,4 +39,4 @@ webkitgtk-install: $(CP) $(WRKINST)/usr/lib/libwebkitgtk*.so* \ $(IDIR_WEBKITGTK)/usr/lib -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/webkitgtk/patches/patch-CMakeLists_txt b/package/webkitgtk/patches/patch-CMakeLists_txt new file mode 100644 index 000000000..3c8adb8b3 --- /dev/null +++ b/package/webkitgtk/patches/patch-CMakeLists_txt @@ -0,0 +1,10 @@ +--- webkitgtk-2.7.3.orig/CMakeLists.txt 2014-12-02 07:49:21.000000000 -0600 ++++ webkitgtk-2.7.3/CMakeLists.txt 2015-01-02 07:12:58.481869248 -0600 +@@ -68,7 +68,6 @@ find_package(Gperf 3.0.1 REQUIRED) + find_package(Perl 5.10.0 REQUIRED) + + find_package(PythonInterp 2.6.0 REQUIRED) +-find_package(Ruby 1.8.7) + + # ----------------------------------------------------------------------------- + # Determine the target processor diff --git a/package/webkitgtk/patches/patch-CMakeLists_txt.orig b/package/webkitgtk/patches/patch-CMakeLists_txt.orig new file mode 100644 index 000000000..d5065cc2d --- /dev/null +++ b/package/webkitgtk/patches/patch-CMakeLists_txt.orig @@ -0,0 +1,10 @@ +--- webkitgtk-2.6.4.orig/CMakeLists.txt 2014-11-20 02:32:05.000000000 -0600 ++++ webkitgtk-2.6.4/CMakeLists.txt 2014-12-30 10:43:47.709729339 -0600 +@@ -69,7 +69,6 @@ find_package(Gperf 3.0.1 REQUIRED) + find_package(Perl 5.10.0 REQUIRED) + + find_package(PythonInterp 2.6.0 REQUIRED) +-find_package(Ruby 1.8.7) + + # ----------------------------------------------------------------------------- + # Determine the target processor diff --git a/package/webkitgtk/patches/patch-Source_JavaScriptCore_CMakeLists_txt b/package/webkitgtk/patches/patch-Source_JavaScriptCore_CMakeLists_txt new file mode 100644 index 000000000..c87ddae22 --- /dev/null +++ b/package/webkitgtk/patches/patch-Source_JavaScriptCore_CMakeLists_txt @@ -0,0 +1,16 @@ +--- 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 -- cgit v1.2.3