network/palemoon: Updated for version 28.0.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 56 insertions, 117 deletions

diff --git a/network/palemoon/README b/network/palemoon/README
index c8cbf18f6c..72c8031fec 100644
--- a/network/palemoon/README
+++ b/network/palemoon/README
@@ -16,12 +16,6 @@ offically released by the Pale Moon devs.
 
 ----------------------------------------------------------------------------
 
-To package this version of Pale Moon for installation along side any other
-version of Pale Moon, (such as the before mentioned version known here as
-"palemoon") pass the script the parameter:
-
-    APPEND_VERSION_SUFFIX=yes
-
 See http://docs.slackware.com/howtos:software:palemoon for additional tips and
 help resources.
 
@@ -31,10 +25,6 @@ or use Alienbob's patched oxygen-gtk2; which will fix this issue.
 http://www.slackware.com/~alien/slackbuilds/oxygen-gtk2/build/
 See the help doc link above for other creative tips and workarounds.
 
-It is recommended that Pale Moon be compiled with gcc 4.9.4. Compiling Pale
-Moon with any other compiler may result in an unstable build. Look for
-gcclegacy494 here on SBo.
-
 A native fork of FireFox's developer tools exists as an external add-on or
 internally. Pale Moon by default ships with the developer tools internally;
 if this is undesirable, dev tools can be disabled by passing the script the
@@ -52,17 +42,16 @@ To remove the "AdNauseam" extension from the Pale Moon blocklist, do
 
     ADNAUSEAM=unblock ./palemoon.SlackBuild
 
-To remove the "NoScript" extension from the Pale Moon blocklist, do
-
-    NOSCRIPT=unblock ./palemoon.SlackBuild
-
-Note: The most up-to-date version of NoScript compatible with Pale Moon can be
-found here: https://noscript.net/getit#classic
-
 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-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
+
 To enable debug information, pass the script the parameter
 
     ENABLE_DEBUG=yes
diff --git a/network/palemoon/adNauseam-unblock.patch b/network/palemoon/adNauseam-unblock.patch
index d57796ec08..b1ff1b8bb4 100644
--- a/network/palemoon/adNauseam-unblock.patch
+++ b/network/palemoon/adNauseam-unblock.patch
@@ -1,5 +1,5 @@
-*** a/browser/app/blocklist.xml	2018-05-19 19:02:40.285091999 -0700
---- b/browser/app/blocklist.xml	2018-05-19 19:32:36.468323646 -0700
+*** a/application/palemoon/app/blocklist.xml	2018-05-19 19:02:40.285091999 -0700
+--- b/application/palemoon/app/blocklist.xml	2018-05-19 19:32:36.468323646 -0700
 ***************
 *** 2504,2514 ****
         </versionRange>
diff --git a/network/palemoon/noscript-unblock.patch b/network/palemoon/noscript-unblock.patch
deleted file mode 100644
index 79f469ca52..0000000000
--- a/network/palemoon/noscript-unblock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-*** a/browser/app/blocklist.xml	2018-06-04 18:09:57.238079553 -0700
---- b/browser/app/blocklist.xml	2018-06-04 18:08:19.325884594 -0700
-***************
-*** 2514,2524 ****
-        </versionRange>
-        <prefs></prefs>
-      </emItem>
--     <emItem blockID="pm112" id="{73a6fe31-595d-460b-a920-fcc0f8843232}">
--       <versionRange minVersion="0" maxVersion="*" severity="1">
--       </versionRange>
--       <prefs></prefs>
--     </emItem>
-    </emItems>
-    <pluginItems>
-      <pluginItem blockID="p26">
---- 2514,2519 ----
diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild
index 5cde8bb56b..081340f2f6 100644
--- a/network/palemoon/palemoon.SlackBuild
+++ b/network/palemoon/palemoon.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for palemoon
+# Slackware build script for Pale Moon
 
 # Copyright 2018 Vasily Sora USA
 # All rights reserved.
@@ -26,8 +26,8 @@
 # Special thanks to Ponce
 
 PRGNAM=palemoon
-SRCNAM=${SRCNAM:-Pale-Moon}
-VERSION=${VERSION:-27.9.4}
+VERSION=${VERSION:-28.0.0}
+SRCNAM=${SRCNAM:-UXP-PM${VERSION}_Release}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,18 +44,21 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+OBJ=${OBJ:-obj-$PRGNAM}
+GTK=${GTK:-gtk2}
+
 # You can try changing the optimization level to simply "-O2" if your processor
 # doesn't support sse2 instructions.
 # "-Os" might help if you experience segfaults.
 OPTIMIZE=${OPTIMIZE:-"-O2 -msse2 -mfpmath=sse"}
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fopenmp"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fopenmp"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -fopenmp"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -70,37 +73,18 @@ fi
 # master trunck of the Pale Moon github repository.
 BRANDING=${BRANDING:---enable-official-branding}
 if [ "$BRANDING" = "NewMoon" ]; then
-	BRANDING="--disable-official-branding --with-branding=browser/branding/unofficial"
+	BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unofficial"
 elif [ "$BRANDING" = "unstable" ]; then
-	BRANDING="--disable-official-branding --with-branding=browser/branding/unstable"
+	BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unstable"
 fi
 
-# Set the compiler that will be used. The ideal compiler for
-# PaleMoon is most likely gcc-4.9.4.
-#
-# If the user has specified a compiler, use that. Other wise
-# look to see if gcc-4.9.4 or gcc-4.8.2 and g++-4.9.4 or
-# g++-4.8.2 can be found. If nothing else, default to using
-# Slackware's stock compiler.
-#
-# Thank you to Orbea; for suggesting this method.
-if command -v gcc-4.9.4 >/dev/null && command -v g++-gcc-4.9.4 >/dev/null; then
-	CC="${CC:-gcc-4.9.4}" && CXX="${CXX:-g++-gcc-4.9.4}"
-elif command -v gcc-4.8.2 >/dev/null && command -v g++-gcc-4.8.2 >/dev/null; then
-	CC="${CC:-gcc-4.8.2}" && CXX="${CXX:-g++-gcc-4.8.2}"
-else
-	CC="${CC:-gcc}" && CXX="${CXX:-g++}"
-fi
-
-export CC="$CC"
-export CXX="$CXX"
 
-rm -rf $PKG $TMP/pmbuild $TMP/gold
-mkdir -p $TMP $PKG $OUTPUT $TMP/pmbuild $TMP/gold
+rm -rf $PKG $TMP/gold $TMP/$OBJ
+mkdir -p $TMP $PKG $OUTPUT $TMP/gold $TMP/$OBJ
 
 DEBUG=" --enable-strip --disable-debug --disable-debug-symbols --enable-release"
 if [ "${ENABLE_DEBUG:-no}" = "yes" ]; then
-  DEBUG=" --disable-strip --disable-install-strip --enable-debug-symbols "
+  DEBUG=" --disable-strip --disable-install-strip --enable-debug --enable-debug-symbols "
   # On IA32, use gold since GNU ld runs out of memory linking libxul.so
   # when debug is turned on
   if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then
@@ -153,18 +137,14 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH
 
 # Build Pale Moon
 cd $TMP
-rm -rf $SRCNAM-${VERSION}_Release
-tar xvf $CWD/$SRCNAM-${VERSION}_Release.tar.gz
-cd $SRCNAM-${VERSION}_Release
+rm -rf $SRCNAM
+tar -xvf $CWD/$SRCNAM.tar.gz
+cd $SRCNAM
 
 if [ "${ADNAUSEAM:-block}" = "unblock" ]; then
 	patch -p1 < $CWD/adNauseam-unblock.patch
 fi
 
-if [ ${NOSCRIPT:-block} = "unblock" ]; then
-	patch -p1 < $CWD/noscript-unblock.patch
-fi
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -172,59 +152,40 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Crude hack so that /usr/lib/mozilla/plugins points to
-# /usr/lib64/mozilla/plugins on 64 bit systems
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-  sed -i 's:/usr/lib/mozilla/plugins:/usr/lib64/mozilla/plugins:g' \
-    xpcom/io/nsAppFileLocationProvider.cpp
-fi
-
-
 # Without LANG=C, building the Python environment may fail with:
 # "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)"
 export LANG=C
 
-export MOZBUILD_STATE_PATH="$TMP/$SRCNAM-${VERSION}_Release/moz.build"
-export MOZCONFIG="$TMP/$SRCNAM-${VERSION}_Release/.mozconfig"
+export MOZCONFIG="$TMP/$SRCNAM/.mozconfig"
 export MOZILLA_OFFICIAL=1
 export MOZ_MAKE_FLAGS=$MAKEFLAGS
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
+export BUILDING_RELEASE=1
+export MOZ_ADDON_SIGNING=
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
 export PYTHON=/usr/bin/python2
 
-# Dev tools are enabled by default in the official binaries, so we should do the same here;
-# passing DEVTOOLS=no to the script, however, will disable them.
-if [ "$DEVTOOLS" = "no" ]; then
-  DEVTOOLS=""
-else
-  DEVTOOLS="--enable-devtools"
-fi
-
 # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.
 # Our building options, in a configure-like display ;)
 OPTIONS="\
   ${BRANDING} \
-  --enable-application=browser \
-  --enable-default-toolkit=cairo-gtk2 \
-  --disable-installer \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION \
+  --x-libraries=/usr/lib${LIBDIRSUFFIX} \
+  --enable-default-toolkit=cairo-$GTK \
+  $DEBUG \
+  $DEVTOOLS \
+  --enable-application=$PRGNAM \
+  --disable-crashreporter \
   --disable-updater \
   --disable-tests \
-  --disable-mochitests \
   --enable-jemalloc \
-  --with-pthreads \
-  --enable-shared-js \
-  $DEVTOOLS \
-  $DEBUG \
-  --x-libraries=/usr/lib${LIBDIRSUFFIX} \
-  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man"
+  --with-pthreads"
 
-echo "mk_add_options MOZ_CO_PROJECT=browser" >> .mozconfig
-echo "mk_add_options MOZ_OBJDIR=$TMP/pmbuild" >> .mozconfig
+echo "mk_add_options MOZ_OBJDIR=$TMP/$OBJ" > .mozconfig
 
 # Write in the .mozconfig the options above
 for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done
@@ -233,11 +194,14 @@ echo "ac_add_options --enable-optimize=\"$OPTIMIZE\"" >> .mozconfig
 if ! pkg-config --exists libpulse; then
 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
 
-# Clean up; and package Pale Moon.
+## Clean up; and package Pale Moon.
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-cd $TMP/pmbuild
+cd $TMP/$OBJ
 make install DESTDIR=$PKG
 
 cd $PKG
@@ -258,20 +222,22 @@ fi
 
 # Install icons:
 for PX in 16 32 48 ; do
-	mkdir -p $PKG/usr/share/icons/hicolor/${PX}x${PX}/apps
-	ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/browser/chrome/icons/default/default${PX}.png \
-	       $PKG/usr/share/icons/hicolor/${PX}x${PX}/apps/$PRGNAM.png
+  mkdir -p $PKG/usr/share/icons/hicolor/${PX}x${PX}/apps
+  ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/browser/chrome/icons/default/default${PX}.png \
+        $PKG/usr/share/icons/hicolor/${PX}x${PX}/apps/$PRGNAM.png
 done
 # ... and the 128px icon file too:
 mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps
 ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/browser/icons/mozicon128.png \
-	$PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
+      $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/palemoon.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $TMP/$SRCNAM-${VERSION}_Release/LICENSE $TMP/$SRCNAM-${VERSION}_Release/README.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a \
+  $TMP/$SRCNAM/LEGAL $TMP/$SRCNAM/LICENSE $TMP/$SRCNAM/README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info
index e33e90a07b..1e8f9c81aa 100644
--- a/network/palemoon/palemoon.info
+++ b/network/palemoon/palemoon.info
@@ -1,9 +1,9 @@
 PRGNAM="palemoon"
-VERSION="27.9.4"
+VERSION="28.0.0"
 HOMEPAGE="http://www.palemoon.org/"
-DOWNLOAD="https://github.com/MoonchildProductions/Pale-Moon/archive/27.9.4_Release/Pale-Moon-27.9.4_Release.tar.gz \
+DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.0.0_Release/UXP-PM28.0.0_Release.tar.gz \
           http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz"
-MD5SUM="9b0bd412351b69b20b6af317cd323fa6 \
+MD5SUM="962a423e7e66833caa46bed50e8fd70f \
         f2994d302cf736e7e71974edfa51da3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""