Skip to content

Commit

Permalink
Merge pull request #25 from soumyaDghosh/2404
Browse files Browse the repository at this point in the history
sdk: patch bmalloc related build failure in armhf
  • Loading branch information
merlijn-sebrechts authored Dec 23, 2024
2 parents 197b390 + 2d46df4 commit b77eb14
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
19 changes: 19 additions & 0 deletions webkitgtk-6-gnome-2404-sdk/patches/fix-bmalloc-armhf.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
From: Alberto Garcia <berto@igalia.com>
Subject: Fix the armhf build if bmalloc is enabled
Bug: https://bugs.webkit.org/show_bug.cgi?id=278858
Index: webkitgtk/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp
===================================================================
--- webkitgtk.orig/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp
+++ webkitgtk/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp
@@ -29,10 +29,10 @@
#if PLATFORM(X11)

#include "WebPageProxy.h"
-#include <X11/Xlib.h>
#include <gtk/gtk.h>
#include <wtf/TZoneMallocInlines.h>
#include <wtf/glib/GRefPtr.h>
+#include <X11/Xlib.h>

#if USE(GTK4)
#include <gdk/x11/gdkx.h>
6 changes: 6 additions & 0 deletions webkitgtk-6-gnome-2404-sdk/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ parts:
- -DENABLE_JOURNALD_LOG=OFF
- -DENABLE_DOCUMENTATION=OFF
- -DENABLE_MINIBROWSER=ON
override-pull: |
craftctl default
if [[ ${CRAFT_ARCH_BUILD_FOR} == "armhf" ]]; then
echo "patching for armhf for bmalloc..."
patch -p1 < ${CRAFT_PROJECT_DIR}/patches/fix-bmalloc-armhf.patch
fi
build-packages:
- bubblewrap
- gettext
Expand Down

0 comments on commit b77eb14

Please sign in to comment.