Skip to content

Commit 178ecef

Browse files
authored
Merge pull request #39 from soumyaDghosh/2404
fix(sdk): fix build for s390x and ppc64el
2 parents 60e12c8 + e80070a commit 178ecef

File tree

2 files changed

+143
-0
lines changed

2 files changed

+143
-0
lines changed
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
# https://bugs.webkit.org/show_bug.cgi?id=293980
2+
# https://github.com/WebKit/WebKit/pull/46277
3+
diff --git a/Source/WebCore/platform/graphics/cairo/PatternCairo.cpp b/Source/WebCore/platform/graphics/cairo/PatternCairo.cpp
4+
index a3fcd68ff8b7..f0192cc2d69f 100644
5+
--- a/Source/WebCore/platform/graphics/cairo/PatternCairo.cpp
6+
+++ b/Source/WebCore/platform/graphics/cairo/PatternCairo.cpp
7+
@@ -30,6 +30,7 @@
8+
9+
#include "CairoUtilities.h"
10+
#include "GraphicsContext.h"
11+
+#include "NativeImage.h"
12+
13+
namespace WebCore {
14+
15+
diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h
16+
index 50520bc3f2c0..db48b47f713f 100644
17+
--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
18+
+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
19+
@@ -26,6 +26,7 @@
20+
#pragma once
21+
22+
#include <initializer_list>
23+
+#include <limits>
24+
#include <optional>
25+
26+
namespace WTF {
27+
28+
# https://bugs.webkit.org/show_bug.cgi?id=293853
29+
# https://github.com/WebKit/WebKit/pull/46168
30+
diff --git a/Source/WTF/wtf/SmallSet.h b/Source/WTF/wtf/SmallSet.h
31+
index 65a5e48bfaa4..f1eaac631b16 100644
32+
--- a/Source/WTF/wtf/SmallSet.h
33+
+++ b/Source/WTF/wtf/SmallSet.h
34+
@@ -25,6 +25,7 @@
35+
36+
#pragma once
37+
38+
+#include <limits>
39+
#include <wtf/Assertions.h>
40+
#include <wtf/FastMalloc.h>
41+
#include <wtf/HashFunctions.h>
42+
43+
# https://github.com/WebKit/WebKit/pull/46231
44+
# https://bugs.webkit.org/show_bug.cgi?id=293853
45+
diff --git a/Source/JavaScriptCore/bytecode/SourceID.h b/Source/JavaScriptCore/bytecode/SourceID.h
46+
index cfa489f29189..4e0e5f738db2 100644
47+
--- a/Source/JavaScriptCore/bytecode/SourceID.h
48+
+++ b/Source/JavaScriptCore/bytecode/SourceID.h
49+
@@ -25,6 +25,8 @@
50+
51+
#pragma once
52+
53+
+#include <limits>
54+
+
55+
namespace JSC {
56+
57+
using SourceID = uint32_t;
58+
diff --git a/Source/JavaScriptCore/jit/GdbJIT.cpp b/Source/JavaScriptCore/jit/GdbJIT.cpp
59+
index f49de33b14fb..d574ff83ba0e 100644
60+
--- a/Source/JavaScriptCore/jit/GdbJIT.cpp
61+
+++ b/Source/JavaScriptCore/jit/GdbJIT.cpp
62+
@@ -28,7 +28,8 @@
63+
64+
#include <wtf/TZoneMallocInlines.h>
65+
66+
-#if ENABLE(ASSEMBLER) && (OS(DARWIN) || OS(LINUX))
67+
+#if ENABLE(ASSEMBLER)
68+
+#if OS(DARWIN) || OS(LINUX)
69+
70+
#include "CallFrame.h"
71+
#include "CallFrameInlines.h"
72+
@@ -1492,4 +1493,5 @@ void GdbJIT::log(const CString&, MacroAssemblerCodeRef<LinkBufferPtrTag>) { }
73+
74+
} // namespace JSC
75+
76+
-#endif // ENABLE(ASSEMBLER) && (OS(DARWIN) || OS(LINUX))
77+
+#endif // OS(DARWIN) || OS(LINUX)
78+
+#endif // ENABLE(ASSEMBLER)
79+
diff --git a/Source/JavaScriptCore/runtime/PureNaN.h b/Source/JavaScriptCore/runtime/PureNaN.h
80+
index 8cab247c8d4a..f96f45b1b54b 100644
81+
--- a/Source/JavaScriptCore/runtime/PureNaN.h
82+
+++ b/Source/JavaScriptCore/runtime/PureNaN.h
83+
@@ -26,6 +26,7 @@
84+
#pragma once
85+
86+
#include <bit>
87+
+#include <limits>
88+
#include <wtf/Assertions.h>
89+
#include <wtf/StdLibExtras.h>
90+
91+
diff --git a/Source/JavaScriptCore/yarr/Yarr.h b/Source/JavaScriptCore/yarr/Yarr.h
92+
index 87a554fff25d..1fca142b3b6b 100644
93+
--- a/Source/JavaScriptCore/yarr/Yarr.h
94+
+++ b/Source/JavaScriptCore/yarr/Yarr.h
95+
@@ -27,7 +27,7 @@
96+
97+
#pragma once
98+
99+
-#include <limits.h>
100+
+#include <limits>
101+
#include "YarrErrorCode.h"
102+
103+
namespace JSC { namespace Yarr {
104+
diff --git a/Source/WTF/wtf/WeakRandom.h b/Source/WTF/wtf/WeakRandom.h
105+
index 22aa3a3163e4..bb3c5695e380 100644
106+
--- a/Source/WTF/wtf/WeakRandom.h
107+
+++ b/Source/WTF/wtf/WeakRandom.h
108+
@@ -30,7 +30,7 @@
109+
110+
#pragma once
111+
112+
-#include <limits.h>
113+
+#include <limits>
114+
#include <wtf/CryptographicallyRandomNumber.h>
115+
#include <wtf/StdLibExtras.h>
116+
117+
diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h
118+
index e2f58542ecff..dc42629cac34 100644
119+
--- a/Source/WTF/wtf/text/icu/UTextProvider.h
120+
+++ b/Source/WTF/wtf/text/icu/UTextProvider.h
121+
@@ -25,6 +25,7 @@
122+
123+
#pragma once
124+
125+
+#include <limits>
126+
#include <unicode/utext.h>
127+
128+
namespace WTF {
129+
diff --git a/Source/WebCore/platform/DateComponents.h b/Source/WebCore/platform/DateComponents.h
130+
index 50069f3890c1..afc401067ff5 100644
131+
--- a/Source/WebCore/platform/DateComponents.h
132+
+++ b/Source/WebCore/platform/DateComponents.h
133+
@@ -30,6 +30,7 @@
134+
135+
#pragma once
136+
137+
+#include <limits>
138+
#include <optional>
139+
#include <unicode/utypes.h>
140+
#include <wtf/Forward.h>

webkitgtk-6-gnome-2404-sdk/snapcraft.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ parts:
3737
- -DENABLE_JOURNALD_LOG=OFF
3838
- -DENABLE_DOCUMENTATION=OFF
3939
- -DENABLE_MINIBROWSER=ON
40+
override-pull: |
41+
craftctl default
42+
patch -p1 < ${CRAFT_PROJECT_DIR}/patches/fix-build-s390x-ppc64el.patch
4043
build-packages:
4144
- bubblewrap
4245
- gettext

0 commit comments

Comments
 (0)