From ccd07a270f94ff91479eeba4a20a8414a27d9945 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 3 Dec 2022 17:20:43 +0100 Subject: [PATCH] HaikuWebKit 1.9.1 --- ...-1.9.0.recipe => haikuwebkit-1.9.1.recipe} | 6 +-- .../patches/haikuwebkit-1.8.4.patchset | 48 ------------------- 2 files changed, 2 insertions(+), 52 deletions(-) rename haiku-libs/haikuwebkit/{haikuwebkit-1.9.0.recipe => haikuwebkit-1.9.1.recipe} (92%) delete mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.9.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.9.1.recipe similarity index 92% rename from haiku-libs/haikuwebkit/haikuwebkit-1.9.0.recipe rename to haiku-libs/haikuwebkit/haikuwebkit-1.9.1.recipe index 0533e6709..04040017e 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.9.0.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.9.1.recipe @@ -5,15 +5,15 @@ 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-2021 Apple Inc., Google Inc., et al" +COPYRIGHT="1998-2022 Apple Inc., Google Inc., et al" LICENSE="GNU LGPL v2 GNU LGPL v2.1 MIT" REVISION="1" SOURCE_URI="https://github.com/haiku/haikuwebkit/archive/HaikuWebKit-$portVersion.tar.gz" -CHECKSUM_SHA256="cc9baf53ca7e50ed897d44f5edf5707113ee6b70a51bf5b4415b75c9eb8cd21b" SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" SOURCE_DIR="haikuwebkit-HaikuWebKit-$portVersion" +CHECKSUM_SHA256="1f059ec9ed4e00ec1c769de8a9baee331f811a63a70b854daa50918311779331" ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" @@ -58,14 +58,12 @@ 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 diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset deleted file mode 100644 index 34ea16fc1..000000000 --- a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset +++ /dev/null @@ -1,48 +0,0 @@ -From ffb0e184da57866c6cbf3c124a045f156220ef75 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= -Date: Sun, 6 Nov 2022 14:31:35 +0100 -Subject: Add libshared to WebCore libraries - -Fixes link error in nightlies - -diff --git a/Source/WebCore/PlatformHaiku.cmake b/Source/WebCore/PlatformHaiku.cmake -index 2da0dc3..eff8200 100644 ---- a/Source/WebCore/PlatformHaiku.cmake -+++ b/Source/WebCore/PlatformHaiku.cmake -@@ -209,7 +209,7 @@ list(APPEND WebCore_LIBRARIES - ${SQLITE_LIBRARIES} - ${WEBP_LIBRARIES} - ${ZLIB_LIBRARIES} -- be bsd network bnetapi netservices textencoding translation execinfo -+ be bsd network bnetapi netservices textencoding translation execinfo shared - ) - - list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES --- -2.37.3 - - -From c27bb3a91cf073ce0f1a197457e5651f1b0af0dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= -Date: Mon, 7 Nov 2022 17:41:45 +0100 -Subject: Don't build debugging tools - -They are not included in the package, and DumpRenderTree uses a BBitmap -method with a different signature in beta3 and master. - -diff --git a/Tools/PlatformHaiku.cmake b/Tools/PlatformHaiku.cmake -index bcf4722..69ce071 100644 ---- a/Tools/PlatformHaiku.cmake -+++ b/Tools/PlatformHaiku.cmake -@@ -1,4 +1,4 @@ --add_subdirectory(TestRunnerShared) --add_subdirectory(DumpRenderTree) --add_subdirectory(HaikuLauncher) --add_subdirectory(ImageDiff) -+#add_subdirectory(TestRunnerShared) -+#add_subdirectory(DumpRenderTree) -+#add_subdirectory(HaikuLauncher) -+#add_subdirectory(ImageDiff) --- -2.37.3 -