extra/webkit2gtk: fix

This commit is contained in:
Kevin Mihelich 2018-09-20 23:54:54 +00:00
parent 7a8e0bd700
commit f43954e028
2 changed files with 25 additions and 2 deletions

View file

@ -3,6 +3,7 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - do not use LLINT assembly for v5/v6
# - patch from Fedora to fix ARM FTBFS
highmem=1
@ -20,15 +21,18 @@ optdepends=('gtk2: Netscape plugin support'
'gst-plugins-base: free media decoding'
'gst-plugins-good: media decoding'
'gst-libav: nonfree media decoding')
source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc})
source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
armv7-build-fix.patch)
sha256sums=('051794adb25c1d5f7cb24b84ef0f1b04d9030441a8a708282f53539752007a12'
'SKIP')
'SKIP'
'3699970053fbf22c7c1ea820c87b398af22aa08ee5b5c6d3436e888b8960ab45')
validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
prepare() {
mkdir build
cd webkitgtk-$pkgver
sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
patch -p1 -i ../armv7-build-fix.patch
}
build() {

View file

@ -0,0 +1,19 @@
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
index 81d4f7ef268..790a39da444 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
@@ -1942,6 +1942,14 @@ public:
return PatchableJump(result);
}
+ PatchableJump patchableBranch8(RelationalCondition cond, Address left, TrustedImm32 imm)
+ {
+ m_makeJumpPatchable = true;
+ Jump result = branch8(cond, left, imm);
+ m_makeJumpPatchable = false;
+ return PatchableJump(result);
+ }
+
PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm)
{
m_makeJumpPatchable = true;