From 36759f23c3a36dba2bda17cd7addd3c3daee5b4a Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Sun, 19 Mar 2017 09:21:23 +0100
Subject: [PATCH] Change fix for pentadactyl on palemoon

---
 .../Pale-Moon-27.2.0-kinda-fix-segfault.patch          | 10 ----------
 satellites/palemoon.sat                                |  7 ++++---
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 satellites/extrafiles/Pale-Moon/Pale-Moon-27.2.0-kinda-fix-segfault.patch

diff --git a/satellites/extrafiles/Pale-Moon/Pale-Moon-27.2.0-kinda-fix-segfault.patch b/satellites/extrafiles/Pale-Moon/Pale-Moon-27.2.0-kinda-fix-segfault.patch
deleted file mode 100644
index 64344d2..0000000
--- a/satellites/extrafiles/Pale-Moon/Pale-Moon-27.2.0-kinda-fix-segfault.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-+++ js/src/jsarray.cpp
-@@ -830,6 +830,8 @@
-          * a native object (possibly a slow array) that has indexed properties,
-          * return true.
-          */
-+        if (obj == (void *)1) break;
-+
-         if (!obj->isNative())
-             return true;
-         if (obj->isIndexed())
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index ae5c3db..41043e3 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -11,6 +11,8 @@ define_option 'pulseaudio: Build with support for PulseAudio'
 
 dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \
           'd122a69ceaac94efeeb365fce39aa31f'
+dlfile "https://github.com/MoonchildProductions/$name/commit/a8a31880a42f5283f30c6f670ce7da8940fe43a3.diff" \
+       'cfeaea882f7c958ca9702399494b9338'
 ( name=autoconf version="$version_autoconf"
     dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
               '9de56d4a161a723228220b0f425dc711'
@@ -20,7 +22,6 @@ dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Rele
               '87c24a4090c1577ba817ec6882602491'
 )
 extrafile 'palemoon.desktop'
-extrafile "$name-$version-kinda-fix-segfault.patch"
 header_end
 
 ( cd "autoconf-$version_autoconf"
@@ -39,8 +40,8 @@ header_end
 
 cd "$name-${version}_Release"
 
-# Circumvents segfault when loading pentadactyl
-patch -p0 -i "../$name-$version-kinda-fix-segfault.patch"
+# Circumvents segfault when loading pentadactyl (https://github.com/MoonchildProductions/Pale-Moon/issues/966)
+patch -p1 -R -i ../a8a31880a42f5283f30c6f670ce7da8940fe43a3.diff
 
 cat > .mozconfig << EOF
 # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.