From 32270d3fa3ef0cc5286b7fce20589e9ad5265b70 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Tue, 7 Mar 2017 23:08:23 +0100
Subject: [PATCH] Update palemoon

---
 astronaut/astronautpkg                |  4 +--
 satellites/palemoon-decentraleyes.sat |  3 +-
 satellites/palemoon-pentadactyl.sat   |  3 +-
 satellites/palemoon-ublock.sat        |  7 ++---
 satellites/palemoon-umatrix.sat       |  3 +-
 satellites/palemoon.sat               | 43 ++++++++++++++-------------
 6 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg
index e837779..ba1c7d0 100755
--- a/astronaut/astronautpkg
+++ b/astronaut/astronautpkg
@@ -65,7 +65,7 @@ _astronaut_wrapper_post() {
 #EOF
 
     # Move configuration files to .new and install them for proper compliance.
-    if [ -d "$dir_install/etc" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_sysconfdir" ]; then
         mkdir -p "$dir_install/install"
         cat > "$dir_install/install/doinst.sh" << EOF
 config() {
@@ -90,7 +90,7 @@ EOF
     # Create the package
     cd "$dir_install"
     mkdir -p "$dir_wrapper_pkgtools"
-    PATH="$PATH:/sbin" $_astronaut_wrapper_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$_satname-$(echo "$version" | sed -e 's/-/_/g')-$(uname -m)-astro.txz"
+    PATH="$PATH:/sbin" $_astronaut_wrapper_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$_satname-$(echo "$version" | tr - _)-$(uname -m)-astro.txz"
 }
 
 . "$_astronaut"
diff --git a/satellites/palemoon-decentraleyes.sat b/satellites/palemoon-decentraleyes.sat
index f9abba6..891224f 100644
--- a/satellites/palemoon-decentraleyes.sat
+++ b/satellites/palemoon-decentraleyes.sat
@@ -2,7 +2,6 @@
 
 name=decentraleyes
 version=1.3.7
-palemoon_version=27.1.1
 update_url="https://github.com/Synzvato/$name/releases"
 update_names="/archive/v$version.tar.gz"
 
@@ -10,6 +9,6 @@ dlfile "https://github.com/Synzvato/$name/releases/download/v$version/Decentrale
        '525ef066830acec9b3229ae8fc34a55b'
 header_end
 
-install -Dm644 "Decentraleyes.v$version-palemoon-unsigned.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon-$palemoon_version/browser/extensions/jid1-BoFifL9Vbdl2zQ@jetpack.xpi"
+install -Dm644 "Decentraleyes.v$version-palemoon-unsigned.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/jid1-BoFifL9Vbdl2zQ@jetpack.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-pentadactyl.sat b/satellites/palemoon-pentadactyl.sat
index 462f212..54d8f66 100644
--- a/satellites/palemoon-pentadactyl.sat
+++ b/satellites/palemoon-pentadactyl.sat
@@ -1,6 +1,5 @@
 name=pentadactyl
 version=1.2pre-pm-3
-palemoon_version=27.1.1
 update_url="https://github.com/madand/$name-pm/releases"
 
 dlextract "https://github.com/madand/$name-pm/archive/$name-$version.tar.gz" \
@@ -9,6 +8,6 @@ header_end
 
 cd "$name-pm-$name-$version"
 make pentadactyl.xpi
-install -Dm644 "downloads/$name-$version.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon-$palemoon_version/browser/extensions/pentadactyl@addons.palemoon.org.xpi"
+install -Dm644 "downloads/$name-$version.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/pentadactyl@addons.palemoon.org.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat
index 65eb271..f4b7dfe 100644
--- a/satellites/palemoon-ublock.sat
+++ b/satellites/palemoon-ublock.sat
@@ -1,13 +1,12 @@
 import 'vcs/git'
 
 name=uBlock
-version=1.11.0
-palemoon_version=27.1.1
+version=1.11.2
 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" \
-          '482cc613ae9ffc1f389b02daf5eed7f1'
+          'f4807729a8e7829a5b8ea494efb002e1'
 ( name=uAssets
     vcs_git -V "https://github.com/uBlockOrigin/uAssets"
 )
@@ -15,6 +14,6 @@ header_end
 
 cd "$name-$version"
 tools/make-firefox.sh all
-install -Dm644 "dist/build/${name}0.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon-$palemoon_version/browser/extensions/${name}0@raymondhill.net.xpi"
+install -Dm644 "dist/build/${name}0.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/${name}0@raymondhill.net.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-umatrix.sat b/satellites/palemoon-umatrix.sat
index b32d5f4..48570fc 100644
--- a/satellites/palemoon-umatrix.sat
+++ b/satellites/palemoon-umatrix.sat
@@ -2,7 +2,6 @@ import 'vcs/git'
 
 name=uMatrix
 version=0.9.3.6
-palemoon_version=27.1.1
 update_url="https://github.com/gorhill/$name/releases"
 update_names="/archive/$version.tar.gz"
 
@@ -20,6 +19,6 @@ rm -f assets/checksums.txt
 cp -a ../uAssets/thirdparties assets
 
 tools/make-firefox.sh all
-install -Dm644 "dist/build/$name.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon-$palemoon_version/browser/extensions/$name@raymondhill.net.xpi"
+install -Dm644 "dist/build/$name.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/$name@raymondhill.net.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index 139d540..f6e16fa 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -1,32 +1,35 @@
 # 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.1
+version=27.1.2
+version_autoconf=2.13
+version_gcc=4.9.4
 update_url="https://github.com/MoonchildProductions/$name/releases"
 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" \
-          'a4148016d84345b081a3c5350acaa9f6'
-( name=autoconf
-    dlextract 'http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz' \
+          'd9fda44446bb560169741a0ad27ef915'
+( name=autoconf version="$version_autoconf"
+    dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
               '9de56d4a161a723228220b0f425dc711'
 )
-( name=gcc
-    dlextract 'http://ftp.gnu.org/gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2' \
+( name=gcc version="$version_gcc"
+    dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
               '87c24a4090c1577ba817ec6882602491'
 )
 extrafile 'palemoon.desktop'
 header_end
 
-( cd 'autoconf-2.13'
-    ./configure --prefix="$PWD/install" --program-suffix=-2.13
+( cd "autoconf-$version_autoconf"
+    ./configure --prefix="$PWD/install" --program-suffix=-$version_autoconf
     make
     make install
 )
 
-( cd 'gcc-4.9.4'
+( cd "gcc-$version_gcc"
+    sed -i -e 's/\.\/fixinc\.sh/-c true/' gcc/Makefile.in
     mkdir build; cd build
     ../configure --prefix="$PWD/../install" --disable-bootstrap --enable-languages=c++
     make
@@ -63,13 +66,6 @@ ac_add_options --x-libraries="/$dir_prefix/$dir_libdir"
 # The section before this is kept up to date with https://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux#head:Mozconfig_Files (with minor changes)
 # The following section are my additions.
 
-# Proper paths
-ac_add_options --prefix="/$dir_prefix"
-ac_add_options --bindir="/$dir_prefix/$dir_bindir"
-ac_add_options --libdir="/$dir_prefix/$dir_libdir"
-ac_add_options --includedir="/$dir_prefix/$dir_includedir"
-ac_add_options --datadir="/$dir_prefix/$dir_datadir"
-
 # Use system libraries (./configure --help | grep system)
 ac_add_options --with-system-nspr
 ac_add_options --with-system-libevent
@@ -91,22 +87,29 @@ ac_add_options --with-system-icu
 $(option pulseaudio && echo ac_add_options --enable-pulseaudio || echo ac_add_options --disable-pulseaudio)
 EOF
 
-PATH="$PWD/../autoconf-2.13/install/bin:$PWD/../gcc-4.9.4/install/bin:$PATH" \
+# Build
+PATH="$PWD/../autoconf-$version_autoconf/install/bin:$PWD/../gcc-$version_gcc/install/bin:$PATH" \
 make -f client.mk build
 
+# Install
 cd pmbuild
-make DESTDIR="$dir_install" install
+make package
+
+mkdir -p "$dir_install/$dir_prefix/$dir_libdir/palemoon"
+cp -Ta dist/palemoon "$dir_install/$dir_prefix/$dir_libdir/palemoon"
+mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
+ln -sf "/$dir_prefix/$dir_libdir/palemoon/palemoon" "$dir_install/$dir_prefix/$dir_bindir/palemoon"
 
 cd ../..
 
 # Install icons
 for x in 16 32 48; do
     mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps"
-    ln -s "/$dir_prefix/$dir_libdir/palemoon-$version/browser/chrome/icons/default/default$x.png" \
+    ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/chrome/icons/default/default$x.png" \
           "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/palemoon.png"
 done
 mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps"
-ln -s "/$dir_prefix/$dir_libdir/palemoon-$version/browser/icons/mozicon128.png" \
+ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/icons/mozicon128.png" \
       "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps/palemoon.png"
 
 # Install desktop