haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

haikuwebkit: fix build (#7382)

Browse Source 
Just enough to make WebPositive run again in master until we have a
shiny new version
This commit is contained in:
Máximo Castañeda
2022-11-08 17:12:35 +01:00
committed by GitHub
parent 280fbbb0dd
commit d07c166dda
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
haiku-libs/haikuwebkit/haikuwebkit-1.8.4.recipe
View File

@@ -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"

48
haiku-libs/haikuwebkit/patches/haikuwebkit-1.8.4.patchset Normal file
View File

@@ -0,0 +1,48 @@
From ffb0e184da57866c6cbf3c124a045f156220ef75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
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?= <antiswen@yahoo.es>
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