Skip to content

Commit b77eb14

Browse files
Merge pull request #25 from soumyaDghosh/2404
sdk: patch bmalloc related build failure in armhf
2 parents 197b390 + 2d46df4 commit b77eb14

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
From: Alberto Garcia <[email protected]>
2+
Subject: Fix the armhf build if bmalloc is enabled
3+
Bug: https://bugs.webkit.org/show_bug.cgi?id=278858
4+
Index: webkitgtk/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp
5+
===================================================================
6+
--- webkitgtk.orig/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp
7+
+++ webkitgtk/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp
8+
@@ -29,10 +29,10 @@
9+
#if PLATFORM(X11)
10+
11+
#include "WebPageProxy.h"
12+
-#include <X11/Xlib.h>
13+
#include <gtk/gtk.h>
14+
#include <wtf/TZoneMallocInlines.h>
15+
#include <wtf/glib/GRefPtr.h>
16+
+#include <X11/Xlib.h>
17+
18+
#if USE(GTK4)
19+
#include <gdk/x11/gdkx.h>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ parts:
3636
- -DENABLE_JOURNALD_LOG=OFF
3737
- -DENABLE_DOCUMENTATION=OFF
3838
- -DENABLE_MINIBROWSER=ON
39+
override-pull: |
40+
craftctl default
41+
if [[ ${CRAFT_ARCH_BUILD_FOR} == "armhf" ]]; then
42+
echo "patching for armhf for bmalloc..."
43+
patch -p1 < ${CRAFT_PROJECT_DIR}/patches/fix-bmalloc-armhf.patch
44+
fi
3945
build-packages:
4046
- bubblewrap
4147
- gettext

0 commit comments

Comments
 (0)