From 3e390f73a474251adc090d420ee9b3dee96a1451 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 19 Mar 2017 03:30:53 +0100 Subject: [PATCH] Update palemoon --- .../Pale-Moon-27.2.0-kinda-fix-segfault.patch | 10 +++++++ .../extrafiles/palemoon/palemoon.desktop | 13 ---------- ...actyl-1.2pre-pm-3-disable-deprecated.patch | 26 +++++++++++++++++++ .../radare2/radare2-1.3.0-docdir.patch | 6 ++--- satellites/palemoon-pentadactyl.sat | 3 +++ satellites/palemoon.sat | 10 ++++--- 6 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 satellites/extrafiles/Pale-Moon/Pale-Moon-27.2.0-kinda-fix-segfault.patch delete mode 100644 satellites/extrafiles/palemoon/palemoon.desktop create mode 100644 satellites/extrafiles/pentadactyl/pentadactyl-1.2pre-pm-3-disable-deprecated.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 new file mode 100644 index 0000000..64344d2 --- /dev/null +++ b/satellites/extrafiles/Pale-Moon/Pale-Moon-27.2.0-kinda-fix-segfault.patch @@ -0,0 +1,10 @@ ++++ 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/extrafiles/palemoon/palemoon.desktop b/satellites/extrafiles/palemoon/palemoon.desktop deleted file mode 100644 index 2538f46..0000000 --- a/satellites/extrafiles/palemoon/palemoon.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Pale Moon Web Browser -Comment=Browse the World Wide Web -Keywords=Internet;WWW;Browser;Web;Explorer -Exec=palemoon %u -Terminal=false -X-MultipleArgs=false -Type=Application -Icon=palemoon -Categories=Network;WebBrowser;Internet -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; -StartupNotify=true diff --git a/satellites/extrafiles/pentadactyl/pentadactyl-1.2pre-pm-3-disable-deprecated.patch b/satellites/extrafiles/pentadactyl/pentadactyl-1.2pre-pm-3-disable-deprecated.patch new file mode 100644 index 0000000..a287487 --- /dev/null +++ b/satellites/extrafiles/pentadactyl/pentadactyl-1.2pre-pm-3-disable-deprecated.patch @@ -0,0 +1,26 @@ ++++ common/modules/base.jsm +@@ -378,9 +378,6 @@ + this.constructor.className ? this.constructor.className + "#" : + ""; + +- deprecated.warn(func, +- obj + (fn.realName || fn.name || name || "").replace(/__/g, "."), +- alternative); + return func.apply(this, arguments); + } + if (func.name) ++++ disable-deprecated.patch +@@ -0,0 +1,13 @@ ++diff -Nur ../pentadactyl-pm-pentadactyl-1.2pre-pm-3/common/modules/base.jsm ./common/modules/base.jsm ++--- ../pentadactyl-pm-pentadactyl-1.2pre-pm-3/common/modules/base.jsm 2017-01-23 03:13:03.000000000 +0100 +++++ ./common/modules/base.jsm 2017-03-19 01:48:11.357447546 +0100 ++@@ -378,9 +378,6 @@ ++ this.constructor.className ? this.constructor.className + "#" : ++ ""; ++ ++- deprecated.warn(func, ++- obj + (fn.realName || fn.name || name || "").replace(/__/g, "."), ++- alternative); ++ return func.apply(this, arguments); ++ } ++ if (func.name) diff --git a/satellites/extrafiles/radare2/radare2-1.3.0-docdir.patch b/satellites/extrafiles/radare2/radare2-1.3.0-docdir.patch index 8ac81fa..d80d27d 100644 --- a/satellites/extrafiles/radare2/radare2-1.3.0-docdir.patch +++ b/satellites/extrafiles/radare2/radare2-1.3.0-docdir.patch @@ -1,4 +1,4 @@ -+++ ./Makefile ++++ Makefile @@ -186,13 +186,13 @@ ln -fs "${PWD}/man/$$FILE" "${DESTDIR}${MANDIR}/man7/$$FILE" ; done @@ -26,7 +26,7 @@ cd man ; for FILE in *.1 ; do rm -f "${DESTDIR}${MANDIR}/man1/$$FILE" ; done rm -f "${DESTDIR}${MANDIR}/man1/r2.1" -+++ ./config-user.mk.acr ++++ config-user.mk.acr @@ -8,6 +8,7 @@ BINDIR=@BINDIR@ LIBDIR=@LIBDIR@ @@ -35,7 +35,7 @@ DATADIR=@DATADIR@ INCLUDEDIR=@INCLUDEDIR@ -+++ ./configure ++++ configure @@ -102,7 +102,7 @@ : ${DATADIR:="${SPREFIX}/share"} : ${INFODIR:="${DATADIR}/info"} diff --git a/satellites/palemoon-pentadactyl.sat b/satellites/palemoon-pentadactyl.sat index 54d8f66..91cf5f7 100644 --- a/satellites/palemoon-pentadactyl.sat +++ b/satellites/palemoon-pentadactyl.sat @@ -4,9 +4,12 @@ update_url="https://github.com/madand/$name-pm/releases" dlextract "https://github.com/madand/$name-pm/archive/$name-$version.tar.gz" \ '9ffbd57120c5dd2b5b84208f5d6a0571' +extrafile "$name-$version-disable-deprecated.patch" header_end cd "$name-pm-$name-$version" +patch -p0 -i "../$name-$version-disable-deprecated.patch" + make pentadactyl.xpi install -Dm644 "downloads/$name-$version.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/pentadactyl@addons.palemoon.org.xpi" diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat index f6e16fa..ae5c3db 100644 --- a/satellites/palemoon.sat +++ b/satellites/palemoon.sat @@ -1,7 +1,7 @@ # TODO: Slap the devs for relying on gcc 4.9 (It segfaults often when building with newer versions, probably due to new optimizations) name=Pale-Moon -version=27.1.2 +version=27.2.0 version_autoconf=2.13 version_gcc=4.9.4 update_url="https://github.com/MoonchildProductions/$name/releases" @@ -10,7 +10,7 @@ update_names="/archive/${version}_Release.tar.gz" define_option 'pulseaudio: Build with support for PulseAudio' dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \ - 'd9fda44446bb560169741a0ad27ef915' + 'd122a69ceaac94efeeb365fce39aa31f' ( name=autoconf version="$version_autoconf" dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \ '9de56d4a161a723228220b0f425dc711' @@ -20,6 +20,7 @@ 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" @@ -38,6 +39,9 @@ header_end cd "$name-${version}_Release" +# Circumvents segfault when loading pentadactyl +patch -p0 -i "../$name-$version-kinda-fix-segfault.patch" + cat > .mozconfig << EOF # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. #ac_add_options --enable-official-branding @@ -69,7 +73,7 @@ ac_add_options --x-libraries="/$dir_prefix/$dir_libdir" # Use system libraries (./configure --help | grep system) ac_add_options --with-system-nspr ac_add_options --with-system-libevent -#ac_add_options --with-system-nss - Apparently unsupported +ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2