From 38a5326924d4864a1c7581f04944f6c735472f64 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Sun, 1 Oct 2017 00:41:52 +0200
Subject: [PATCH] Update palemoon to 27.5.0

---
 satellites/functions/vcs/git.sh       |  2 +-
 satellites/palemoon-decentraleyes.sat |  8 +++++---
 satellites/palemoon-greasemonkey.sat  |  4 ++--
 satellites/palemoon-ublock.sat        |  4 ++--
 satellites/palemoon.sat               | 10 +++++++---
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/satellites/functions/vcs/git.sh b/satellites/functions/vcs/git.sh
index 5318939..8bd79c5 100644
--- a/satellites/functions/vcs/git.sh
+++ b/satellites/functions/vcs/git.sh
@@ -46,7 +46,7 @@ vcs_git() {
 
     # Clone the repository
     if [ "$download_only" = false -a "$clone" = true ]; then
-        vcs_git_clone -r "$rev" "$1" "$2"
+        vcs_git_clone -r "$rev" "$@"
     fi
 }
 
diff --git a/satellites/palemoon-decentraleyes.sat b/satellites/palemoon-decentraleyes.sat
index 11061ab..b647ea3 100644
--- a/satellites/palemoon-decentraleyes.sat
+++ b/satellites/palemoon-decentraleyes.sat
@@ -1,13 +1,15 @@
 # TODO: Build jetpack plugin (requires jpm)
 
 name=decentraleyes
-version=1.3.7
+version=1.3.10
 update_url="https://github.com/Synzvato/$name/releases"
 
-dlfile "https://github.com/Synzvato/$name/releases/download/v$version/Decentraleyes.v$version-palemoon-unsigned.xpi" \
-       '525ef066830acec9b3229ae8fc34a55b'
+download "https://addons.palemoon.org/?component=download&id=jid1-BoFifL9Vbdl2zQ@jetpack&version=$version" \
+         '95dafa4d7b8452f5613da068b1309cd6' \
+         "Decentraleyes.v$version-palemoon-unsigned.xpi"
 _
 
+getfile "Decentraleyes.v$version-palemoon-unsigned.xpi"
 install -Dm644 "Decentraleyes.v$version-palemoon-unsigned.xpi" "$dir_install/$dir_prefix/$dir_lib/palemoon/browser/extensions/jid1-BoFifL9Vbdl2zQ@jetpack.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-greasemonkey.sat b/satellites/palemoon-greasemonkey.sat
index 0dad382..0617b79 100644
--- a/satellites/palemoon-greasemonkey.sat
+++ b/satellites/palemoon-greasemonkey.sat
@@ -1,10 +1,10 @@
 name=greasemonkey
-version=3.11
+version=3.16
 update_url="https://github.com/$name/$name/releases"
 update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/$name/$name/archive/$version/$name-$version.tar.gz" \
-          'bdc40ff400a90ef6e360c30858dcf970'
+          'fbfddb4936c95c18e9528fcfbffc1540'
 _
 
 cd "$name-$version"
diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat
index 5cd6781..dc9b677 100644
--- a/satellites/palemoon-ublock.sat
+++ b/satellites/palemoon-ublock.sat
@@ -1,12 +1,12 @@
 import 'vcs/git'
 
 name=uBlock
-version=1.13.8
+version=1.14.10
 update_url="https://github.com/gorhill/$name/releases"
 update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.gz" \
-          '4d802ab3b3b3c4fce9525fc750954a5b'
+          '8be4a74882522089d4cae32b0c51a4fb'
 ( name=uAssets
     vcs_git -V "https://github.com/uBlockOrigin/uAssets"
 )
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index 90a399a..4123ec0 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -1,7 +1,7 @@
 # The Pale Moon team recommends building with GCC 4.9. While other versions like 5.x are known to work, they're unsupported.
 
 name=Pale-Moon
-version=27.4.2
+version=27.5.0
 version_gcc=4.9.4
 version_autoconf=2.13
 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" \
-          'b48067fff5505e1b078c2bf2c7efdeff'
+          'f786d177566a88d650a003afdf41e281'
 extrafile 'palemoon.desktop'
 
 ( name=gcc version="$version_gcc"
@@ -91,8 +91,12 @@ ac_add_options --with-system-icu
 $(option pulseaudio && echo ac_add_options --enable-pulseaudio || echo ac_add_options --disable-pulseaudio)
 EOF
 
+# This program is about as picky about compiler flags as it is about the compiler version.
+# Sigh...
+#export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+#unset CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS
+
 # Build
-MOZ_MAKE_FLAGS="$MAKEFLAGS" \
 PATH="$PWD/../gcc-$version_gcc/install/bin:$PWD/../autoconf-$version_autoconf/install/bin:$PATH" \
 make -f client.mk build