From 82350e62543a47cb1bc587b8dc0bc493274a7983 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Thu, 24 Nov 2022 17:52:56 +0100 Subject: [PATCH] HaikuWebKit 1.9.0 --- ...-1.8.4.recipe => haikuwebkit-1.9.0.recipe} | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) rename haiku-libs/haikuwebkit/{haikuwebkit-1.8.4.recipe => haikuwebkit-1.9.0.recipe} (78%) diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.9.0.recipe similarity index 78% rename from haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe rename to haiku-libs/haikuwebkit/haikuwebkit-1.9.0.recipe index 51524ede9..6bbdfe7ed 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.9.0.recipe @@ -9,12 +9,11 @@ COPYRIGHT="1998-2021 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/haikuwebkit/archive/HaikuWebKit-$portVersion.tar.gz" -CHECKSUM_SHA256="c4ed2126239c484d7ef7e4532acffd4adddf5a9fbb7938d3859d34bea5e02e97" +CHECKSUM_SHA256="cc9baf53ca7e50ed897d44f5edf5707113ee6b70a51bf5b4415b75c9eb8cd21b" SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" SOURCE_DIR="haikuwebkit-HaikuWebKit-$portVersion" -PATCHES="haikuwebkit-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" @@ -26,16 +25,22 @@ PROVIDES=" lib:libWebKitLegacy$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= r1~beta2_hrev55169 + haiku$secondaryArchSuffix + lib:libatomic$secondaryArchSuffix + lib:libavif$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix - lib:libgcrypt$secondaryArchSuffix lib:libgl$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix >= 66 + lib:libidn2$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng16$secondaryArchSuffix + lib:libpsl$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix + lib:libssl$secondaryArchSuffix lib:libtasn1$secondaryArchSuffix + lib:libunistring$secondaryArchSuffix lib:libwebp$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libxslt$secondaryArchSuffix @@ -53,17 +58,25 @@ REQUIRES_devel=" haikuwebkit$secondaryArchSuffix == $portVersion base " +# NOTE: gcrypt is unused, but a #include was accidentally left, so keep the devel in for now. BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel haiku_devel + devel:libavif$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix devel:libexecinfo$secondaryArchSuffix devel:libgcrypt$secondaryArchSuffix devel:libgl$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix >= 66 + devel:libidn2$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix + devel:libpsl$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix + devel:libssl$secondaryArchSuffix devel:libtasn1$secondaryArchSuffix + devel:libunistring$secondaryArchSuffix devel:libwebp$secondaryArchSuffix >= 7 devel:libxml2$secondaryArchSuffix devel:libxslt$secondaryArchSuffix @@ -90,7 +103,7 @@ BUILD() { export DISABLE_ASLR=1 export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" - Tools/Scripts/build-webkit --haiku --no-webkit2 \ + Tools/Scripts/build-webkit --haiku --no-webkit2 --no-fatal-warnings \ --cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSHOULD_INSTALL_JS_SHELL=ON" }