From e3305545ee3c718ec4c99e552a3351d2938a7e23 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 2 Apr 2018 23:12:46 +0200
Subject: [PATCH] Upgrade palemoon and addons

---
 satellites/palemoon-greasemonkey.sat | 4 ++--
 satellites/palemoon-ublock.sat       | 8 ++++++--
 satellites/palemoon.sat              | 7 ++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/satellites/palemoon-greasemonkey.sat b/satellites/palemoon-greasemonkey.sat
index be5d0a1..25c2e06 100644
--- a/satellites/palemoon-greasemonkey.sat
+++ b/satellites/palemoon-greasemonkey.sat
@@ -1,11 +1,11 @@
 name=greasemonkey
-majver=3.31beta1
+majver=3.31
 version=${majver}Fork
 update_url="https://github.com/janekptacijarabaci/$name/releases"
 update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/janekptacijarabaci/$name/archive/$version/$name-$version.tar.gz" \
-          '6aa861b6c5fe5eab71a54f210881bd10'
+          'd8324a778a001f8cf71e34209c047bf7'
 _
 
 cd "$name-$version"
diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat
index 572b63d..1bd1e81 100644
--- a/satellites/palemoon-ublock.sat
+++ b/satellites/palemoon-ublock.sat
@@ -1,18 +1,22 @@
 import 'vcs/git'
 
 name=uBlock
-version=1.14.24
+version=1.15.24
 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" \
-          '349e46d19152328acd43ec0be4f0f194'
+          '003bcfaf1a7150f0d8c5e876d767e8d6'
 ( name=uAssets
     vcs_git -V "https://github.com/uBlockOrigin/uAssets"
 )
 _
 
 cd "$name-$version"
+
+# tools/make-firefox-meta.py looks for this directory to find the project root...
+mkdir -p .git
+
 tools/make-firefox.sh all
 install -Dm644 "dist/build/${name}0.firefox.xpi" "$dir_install/$dir_prefix/$dir_lib/palemoon/browser/extensions/${name}0@raymondhill.net.xpi"
 
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index 54d9622..a182ec4 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -1,14 +1,14 @@
 # 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.8.0
+version=27.8.3
 version_gcc=4.9.4
 version_autoconf=2.13
 update_url="https://github.com/MoonchildProductions/$name/releases"
 update_names="/archive/${version}_Release.tar.gz"
 
 dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \
-          '9745e8e1c1ed57ffd47acb2d6aff3804'
+          '0a9beb55dcce7f3cce9acc30309fe1fe'
 extrafile 'palemoon.desktop'
 
 ( name=gcc version="$version_gcc"
@@ -71,7 +71,7 @@ ac_add_options --x-libraries="/$dir_prefix/$dir_lib"
 # Use system libraries (autoconf-2.13 && ./configure --help | grep system)
 ac_add_options --with-system-nspr
 ac_add_options --with-system-libevent
-$(pkg-config --atleast-version="$(sed -ne 's/^    AM_PATH_NSS(\([^,]*\),.*/\1/p' configure.in)" nss && echo ac_add_options --with-system-nss)
+ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
@@ -88,6 +88,7 @@ ac_add_options --with-system-icu
 # Make pulseaudio support optional
 $(pkg-config --exists libpulse || echo ac_add_options --disable-pulseaudio)
 EOF
+#$(pkg-config --atleast-version="$(sed -ne 's/^    AM_PATH_NSS(\([^,]*\),.*/\1/p' configure.in)" nss && echo ac_add_options --with-system-nss)
 
 # This program is about as picky about compiler flags as it is about the compiler version.
 # Sigh...