From a66a05a8a6b58f1e08cddca40c2dcb8621fef295 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 17 Nov 2015 19:12:51 +0100 Subject: [PATCH] Fix haikuwebkit 1.5.1. * Using a patch, so people who already downloaded the source archive to build it won't have to reload it. * Some options had wrongly set default values, leading to a failed build. --- .../haikuwebkit/haikuwebkit-1.5.1.recipe | 104 ++++++++++++++++++ .../patches/haikuwebkit-1.5.1.patchset | 44 ++++++++ 2 files changed, 148 insertions(+) create mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.5.1.recipe create mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit-1.5.1.patchset diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.5.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.5.1.recipe new file mode 100644 index 000000000..c6a6d0530 --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.5.1.recipe @@ -0,0 +1,104 @@ +SUMMARY="Open source web browser engine" +DESCRIPTION=" +WebKit is an open source web browser engine. WebKit is also the name of the \ +Mac OS X system framework version of the engine that's used by Safari, \ +Dashboard, Mail, and many other OS X applications. WebKit's HTML and \ +JavaScript code began as a branch of the KHTML and KJS libraries from KDE. +" +HOMEPAGE="http://www.webkit.org/" +COPYRIGHT="1998-2015 Apple Inc., Google Inc., et al" +LICENSE=" + GNU LGPL v2 + GNU LGPL v2.1 + MIT + " +SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz" +SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" +CHECKSUM_SHA256="f434e707ba958412d073d1ca2010e934281662cf88b4cc9a6b2735fe2d96fd92" +PATCHES="haikuwebkit-1.5.1.patchset" +REVISION="1" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + haikuwebkit$secondaryArchSuffix = $portVersion + lib:libWebKit$secondaryArchSuffix = $portVersion + lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1 + cmd:jsc + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libxslt$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libexecinfo$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + haiku_devel + devel:libicuuc$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libxslt$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libexecinfo$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:pkg_config + cmd:flex + cmd:bison + cmd:gcc$secondaryArchSuffix + cmd:gperf + cmd:ld$secondaryArchSuffix + cmd:m4 + cmd:make + cmd:ninja + cmd:perl + cmd:python + cmd:cmake >= 3.0.0 + cmd:ruby + cmd:which + " + +SOURCE_DIR="webkit-$portVersion" + +BUILD() +{ + export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" + Tools/Scripts/build-webkit --haiku --no-webkit2 \ + --cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSHOULD_INSTALL_JS_SHELL=ON" +} + +INSTALL() +{ + cd WebKitBuild/Release + ninja install + + prepareInstalledDevelLibs libWebKit libJavaScriptCore + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + haikuwebkit${secondaryArchSuffix}_devel = $portVersion + devel:libJavaScriptCore$secondaryArchSuffix = $portVersion + devel:libwebcore$secondaryArchSuffix = $portVersion + devel:libWebKit$secondaryArchSuffix = $portVersion + devel:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + haikuwebkit$secondaryArchSuffix == $portVersion base + " diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.5.1.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.5.1.patchset new file mode 100644 index 000000000..6b82a20be --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.5.1.patchset @@ -0,0 +1,44 @@ +From 53c840e2444a74e35f0f03f3f02b6d42f6046c2a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 17 Nov 2015 07:23:05 +0100 +Subject: Use correct features to make it build. + + +diff --git a/Source/cmake/OptionsHaiku.cmake b/Source/cmake/OptionsHaiku.cmake +index eb3fa08..e4877d1 100644 +--- a/Source/cmake/OptionsHaiku.cmake ++++ b/Source/cmake/OptionsHaiku.cmake +@@ -39,7 +39,7 @@ set(DATA_INSTALL_DIR "data/WebKit" CACHE PATH "Installation path for data") + add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}") + + WEBKIT_OPTION_BEGIN() +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING PUBLIC ON) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS PUBLIC OFF) +@@ -87,7 +87,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY PUBLIC ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME PUBLIC ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS PUBLIC PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS PUBLIC ON) +-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PUBLIC ON) ++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SQL_DATABASE PUBLIC ON) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO PUBLIC OFF) +diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm +index 44719d7..56b9809 100644 +--- a/Tools/Scripts/webkitperl/FeatureList.pm ++++ b/Tools/Scripts/webkitperl/FeatureList.pm +@@ -151,7 +151,7 @@ my ( + + my @features = ( + { option => "3d-rendering", desc => "Toggle 3D Rendering support", +- define => "ENABLE_3D_TRANSFORMS", default => (isAppleMacWebKit() || isIOSWebKit() || isHaiku() || isGtk() || isEfl()), value => \$threeDTransformsSupport }, ++ define => "ENABLE_3D_TRANSFORMS", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$threeDTransformsSupport }, + + { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support", + define => "ENABLE_ACCELERATED_2D_CANVAS", default => isGtk(), value => \$accelerated2DCanvasSupport }, +-- +2.2.2 +