mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
qtwebkit, revbump, move to recent ICU, add upstream patches (#10474)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,4 +1,4 @@
|
||||
From 7cd638c1f30f1c8b72c8bfae8ef28200d6dee102 Mon Sep 17 00:00:00 2001
|
||||
From 3864b4785cbf7cafecfdb7dc82b854ca14a7735a Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 19 Jun 2020 21:33:30 +1000
|
||||
Subject: Add Haiku support
|
||||
@@ -1517,10 +1517,10 @@ index bce9ea2..bea3766 100644
|
||||
set(USE_MEDIA_FOUNDATION OFF)
|
||||
set(USE_QT_MULTIMEDIA OFF)
|
||||
--
|
||||
2.30.2
|
||||
2.43.2
|
||||
|
||||
|
||||
From dfb6efface5aa195275b57754814c3e9e07f9edc Mon Sep 17 00:00:00 2001
|
||||
From 9ded1463fe9e11d23d27e7af6d50cc0151df8853 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 25 Feb 2022 15:48:30 +0100
|
||||
Subject: Patch for newer libs
|
||||
@@ -1674,5 +1674,109 @@ index 7aaac48..9ae0d36 100644
|
||||
|
||||
static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
|
||||
--
|
||||
2.30.2
|
||||
2.43.2
|
||||
|
||||
|
||||
From 9e12a7e45df4c4d82429f7ec41f4925e4288510b Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Sat, 25 May 2024 12:12:58 +0200
|
||||
Subject: Offlineasm warnings with newer Ruby versions
|
||||
|
||||
https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef
|
||||
|
||||
diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb
|
||||
index b445112..cd1cffa 100644
|
||||
--- a/Source/JavaScriptCore/offlineasm/parser.rb
|
||||
+++ b/Source/JavaScriptCore/offlineasm/parser.rb
|
||||
@@ -584,9 +584,7 @@ class Parser
|
||||
firstCodeOrigin = @tokens[@idx].codeOrigin
|
||||
list = []
|
||||
loop {
|
||||
- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
|
||||
- break
|
||||
- elsif @tokens[@idx].is_a? Annotation
|
||||
+ if @tokens[@idx].is_a? Annotation
|
||||
# This is the only place where we can encounter a global
|
||||
# annotation, and hence need to be able to distinguish between
|
||||
# them.
|
||||
@@ -600,6 +598,8 @@ class Parser
|
||||
list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string)
|
||||
@annotation = nil
|
||||
@idx += 2 # Consume the newline as well.
|
||||
+ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
|
||||
+ break
|
||||
elsif @tokens[@idx] == "\n"
|
||||
# ignore
|
||||
@idx += 1
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
||||
From 272f4a46335fbdf5e80f1c6d467a6c684e21c148 Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Sat, 25 May 2024 17:48:07 +0200
|
||||
Subject: Build fails with libxml2 version 2.12.0 due to API change
|
||||
|
||||
https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
|
||||
|
||||
diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h
|
||||
index cffd1c4..88094c0 100644
|
||||
--- a/Source/WebCore/xml/XSLTProcessor.h
|
||||
+++ b/Source/WebCore/xml/XSLTProcessor.h
|
||||
@@ -64,7 +64,11 @@ public:
|
||||
|
||||
void reset();
|
||||
|
||||
+#if LIBXML_VERSION >= 21200
|
||||
+ static void parseErrorFunc(void* userData, const xmlError*);
|
||||
+#else
|
||||
static void parseErrorFunc(void* userData, xmlError*);
|
||||
+#endif
|
||||
static void genericErrorFunc(void* userData, const char* msg, ...);
|
||||
|
||||
// Only for libXSLT callbacks
|
||||
diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
|
||||
index 8587b00..e553255 100644
|
||||
--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
|
||||
+++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
|
||||
@@ -78,7 +78,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...)
|
||||
// It would be nice to do something with this error message.
|
||||
}
|
||||
|
||||
-void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
|
||||
+#if LIBXML_VERSION >= 21200
|
||||
+ void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error)
|
||||
+#else
|
||||
+ void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
|
||||
+#endif
|
||||
{
|
||||
PageConsoleClient* console = static_cast<PageConsoleClient*>(userData);
|
||||
if (!console)
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
||||
From 6d5f214da258da7f228161100edf4acb632857a8 Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Sat, 25 May 2024 19:43:10 +0200
|
||||
Subject: Silense some warning
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index eaf3a35..9f0672f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -104,6 +104,10 @@ else ()
|
||||
message(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")
|
||||
endif ()
|
||||
|
||||
+if(HAIKU)
|
||||
+ add_definitions(-Wno-deprecated-copy -Wno-redundant-move -Wno-class-memaccess)
|
||||
+endif()
|
||||
+
|
||||
# -----------------------------------------------------------------------------
|
||||
# Default library types
|
||||
# -----------------------------------------------------------------------------
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.qt.io"
|
||||
COPYRIGHT="2015-2020 The Qt Company Ltd."
|
||||
LICENSE="BSD (3-clause)
|
||||
GNU LGPL v2.1"
|
||||
REVISION="3"
|
||||
REVISION="4"
|
||||
srcGitRev="ac8ebc6c3a56064f88f5506e5e3783ab7bee2456"
|
||||
SOURCE_URI="https://github.com/qt/qtwebkit/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="405b32de1ac1921759190ef68b7dcb7620c545d0055a84ea8e1ba7b86b3d6dc4"
|
||||
@@ -92,7 +92,7 @@ BUILD_REQUIRES="
|
||||
devel:libglu$secondaryArchSuffix
|
||||
devel:libgnutls$secondaryArchSuffix >= 30
|
||||
devel:libhyphen$secondaryArchSuffix
|
||||
devel:libicuuc$secondaryArchSuffix
|
||||
devel:libicuuc$secondaryArchSuffix >= 74
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libpcre2_16$secondaryArchSuffix
|
||||
@@ -131,7 +131,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:make
|
||||
cmd:perl
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python
|
||||
cmd:python3
|
||||
cmd:ruby
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user