diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe deleted file mode 100644 index 1bbc5b653..000000000 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe +++ /dev/null @@ -1,103 +0,0 @@ -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-2016 Apple Inc., Google Inc., et al" -LICENSE=" - GNU LGPL v2 - GNU LGPL v2.1 - MIT - " -REVISION="1" -SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="49080d1b4fb09eed7bbcd160683144d8851b4cc5a77ecc922c27dabbfeb75e4d" -SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" -SOURCE_DIR="webkit-$portVersion" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - haikuwebkit$secondaryArchSuffix = $portVersion - cmd:jsc - lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1 - lib:libWebKit$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libexecinfo$secondaryArchSuffix - lib:libgnutls$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libsqlite3$secondaryArchSuffix - lib:libwebp$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix - lib:libxslt$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -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 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - haiku_devel - devel:libexecinfo$secondaryArchSuffix - devel:libgnutls$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libsqlite3$secondaryArchSuffix - devel:libwebp$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - devel:libxslt$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:bison - cmd:cmake >= 3.0.0 - cmd:flex - cmd:gcc$secondaryArchSuffix - cmd:gperf - cmd:ld$secondaryArchSuffix - cmd:m4 - cmd:make - cmd:ninja - cmd:perl - cmd:pkg_config - cmd:python - cmd:ruby - cmd:which - " - -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 -} diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.6.recipe similarity index 93% rename from haiku-libs/haikuwebkit/haikuwebkit-1.6.4.recipe rename to haiku-libs/haikuwebkit/haikuwebkit-1.6.6.recipe index efc175ae8..488637823 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.4.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.6.6.recipe @@ -6,19 +6,19 @@ 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-2017 Apple Inc., Google Inc., et al" +COPYRIGHT="1998-2018 Apple Inc., Google Inc., et al" LICENSE=" GNU LGPL v2 GNU LGPL v2.1 MIT " -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="e468401fc1dcadb4019469de09b697d822ab263c2da827906529da2ae30f7931" +CHECKSUM_SHA256="51d75358ae1b01a56935c0320bbb17765dfdf253b5d3898ccaf40deb85a0a280" SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" SOURCE_DIR="webkit-$portVersion" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES="