network/palemoon: Updated for version 28.9.0.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 19 insertions, 13 deletions

diff --git a/network/palemoon/README b/network/palemoon/README
index e6981a79191b..72c8031fec5d 100644
--- a/network/palemoon/README
+++ b/network/palemoon/README
@@ -46,8 +46,9 @@ If your processor doesn't support sse2 instructions or you get segfaults,
 try looking in the SlackBuild for the OPTIMIZE build option (eventually
 refer to the Pale Moon developers for help).
 
-jack is an optional dependency and, if detected, automatically built. If
-this is undesirable you can blacklist jack, by passing the variable:
+jack-audio-connection-kit is an optional dependency and, if detected,
+automatically built. If this is undesirable you can blacklist jack, by
+passing the variable:
 
   BLACKLIST_JACK=yes ./palemoon.SlackBuild
 
diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild
index b9240ffc2709..780f1fe2fcde 100644
--- a/network/palemoon/palemoon.SlackBuild
+++ b/network/palemoon/palemoon.SlackBuild
@@ -26,8 +26,9 @@
 # Special thanks to Ponce
 
 PRGNAM=palemoon
-VERSION=${VERSION:-28.8.4}
-SRCNAM=${SRCNAM:-UXP-PM${VERSION}_Release}
+VERSION=${VERSION:-28.9.0.2}
+SRCNAM1=${SRCNAM1:-Pale-Moon-${VERSION}_Release}
+SRCNAM2=${SRCNAM2:-UXP-RELBASE_20200324}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -141,9 +142,10 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH
 
 # Build Pale Moon
 cd $TMP
-rm -rf $SRCNAM
-tar -xvf $CWD/$SRCNAM.tar.gz
-cd $SRCNAM
+rm -rf $SRCNAM1
+tar -xvf $CWD/$SRCNAM1.tar.gz
+cd $SRCNAM1
+tar -xvf $CWD/$SRCNAM2.tar.gz -C platform --strip-components 1
 
 if [ "${ADNAUSEAM:-block}" = "unblock" ]; then
 	patch -p1 < $CWD/adNauseam-unblock.patch
@@ -165,7 +167,7 @@ find -L . \
 # "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)"
 export LANG=C
 
-export MOZCONFIG="$TMP/$SRCNAM/.mozconfig"
+export MOZCONFIG="$TMP/$SRCNAM1/.mozconfig"
 export MOZILLA_OFFICIAL=1
 export MOZ_MAKE_FLAGS=$MAKEFLAGS
 export CFLAGS="$SLKCFLAGS"
@@ -217,7 +219,8 @@ echo "ac_add_options --disable-pulseaudio" >> .mozconfig; fi
 if pkg-config --exists jack && [ "${BLACKLIST_JACK:-no}" != "yes" ]; then
 echo "ac_add_options --enable-jack" >> .mozconfig; fi
 
-python2 mach build
+sed -i 's/.\/platform\/mach/"python2\ .\/platform\/mach"/g' mach
+./mach build
 
 ## Clean up; and package Pale Moon.
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
@@ -256,7 +259,7 @@ cat $CWD/palemoon.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  $TMP/$SRCNAM/LEGAL $TMP/$SRCNAM/LICENSE $TMP/$SRCNAM/README.md \
+  $TMP/$SRCNAM1/platform/LEGAL $TMP/$SRCNAM1/LICENSE $TMP/$SRCNAM1/README.md $TMP/$SRCNAM1/AUTHORS \
   $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info
index 6ba340b71803..f5d50e457881 100644
--- a/network/palemoon/palemoon.info
+++ b/network/palemoon/palemoon.info
@@ -1,9 +1,11 @@
 PRGNAM="palemoon"
-VERSION="28.8.4"
+VERSION="28.9.0.2"
 HOMEPAGE="http://www.palemoon.org/"
-DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.8.4_Release/UXP-PM28.8.4_Release.tar.gz \
+DOWNLOAD="https://github.com/MoonchildProductions/Pale-Moon/archive/28.9.0.2_Release/Pale-Moon-28.9.0.2_Release.tar.gz
+          https://github.com/MoonchildProductions/UXP/archive/RELBASE_20200324/UXP-RELBASE_20200324.tar.gz \
           http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz"
-MD5SUM="ge6d59dab775da0e2d18294294459da14 \
+MD5SUM="5664cbdc7ad15ceee29a1a993ecfcb23 \
+        0295e8bfeb73a85788de23736f093798 \
         f2994d302cf736e7e71974edfa51da3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""