From d07c166ddad3ebc6675bbc246228973b9277d860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= Date: Tue, 8 Nov 2022 17:12:35 +0100 Subject: [PATCH] haikuwebkit: fix build (#7382) Just enough to make WebPositive run again in master until we have a shiny new version --- .../haikuwebkit/haikuwebkit-1.8.4.recipe | 3 +- .../patches/haikuwebkit-1.8.4.patchset | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe index f0a336e28..51524ede9 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe @@ -9,11 +9,12 @@ COPYRIGHT="1998-2021 Apple Inc., Google Inc., et al" LICENSE="GNU LGPL v2 GNU LGPL v2.1 MIT" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/haiku/haikuwebkit/archive/HaikuWebKit-$portVersion.tar.gz" CHECKSUM_SHA256="c4ed2126239c484d7ef7e4532acffd4adddf5a9fbb7938d3859d34bea5e02e97" SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" SOURCE_DIR="haikuwebkit-HaikuWebKit-$portVersion" +PATCHES="haikuwebkit-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset new file mode 100644 index 000000000..34ea16fc1 --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset @@ -0,0 +1,48 @@ +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 +