network/palemoon: updated for version 30.0.0

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

1 files changed, 29 insertions, 25 deletions

diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild
index a6bc228142eb0..87bb76a400391 100644
--- a/network/palemoon/palemoon.SlackBuild
+++ b/network/palemoon/palemoon.SlackBuild
@@ -28,14 +28,16 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=palemoon
-VERSION=${VERSION:-29.4.4}
-SRCNAM1=${SRCNAM1:-$PRGNAM-$VERSION.source}
-SRCNAM2=${SRCNAM2:-$PRGNAM-source}
-SRCNAM3=${SRCNAM3:-$PRGNAM-$VERSION.source}
+VERSION=${VERSION:-30.0.0}
+SRCNAM1=${SRCNAM1:-Pale-Moon-${VERSION}_Release}
+SRCNAM2=${SRCNAM2:-GRE-RELBASE_20220310}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+DOCS="AUTHORS LICENSE README.md"
+DOCS_GRE="AUTHORS LEGAL SECURITY.md"
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -90,9 +92,10 @@ fi
 # master trunck of the Pale Moon github repository.
 BRANDING=${BRANDING:---enable-official-branding}
 if [ "$BRANDING" = "NewMoon" ]; then
-	BRANDING="--disable-official-branding --with-branding=palemoon/branding/unofficial"
-elif [ "$BRANDING" = "unstable" ]; then
-	BRANDING="--disable-official-branding --with-branding=palemoon/branding/unstable"
+     BRANDING="--disable-official-branding --with-branding=browser/branding/unofficial"
+elif
+  [ "$BRANDING" = "unstable" ]; then
+    BRANDING="--disable-official-branding --with-branding=other-licenses/branding/palemoon/unstable"
 fi
 
 rm -rf $PKG $TMP/gold $TMP/$OBJ
@@ -153,20 +156,16 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH
 
 # Build Pale Moon
 cd $TMP
-rm -rf $SRCNAM2
-tar -xvf $CWD/$SRCNAM1.tar.xz
-cd $SRCNAM2
+rm -rf $SRCNAM1
+tar -xvf $CWD/$SRCNAM1.tar.gz --transform="flags=r;s/pale-moon/$SRCNAM1/"
+cd $SRCNAM1
+tar -xvf $CWD/$SRCNAM2.tar.gz --transform="flags=r;s/gre/platform/"
 
+patch -p1 < $CWD/0001-Issue-7-Add-GCC-11-initial-support.patch
 if [ "${ADNAUSEAM:-block}" = "unblock" ]; then
 	patch -p1 < $CWD/adNauseam-unblock.patch
 fi
 
-# Selectively APPLY patch for glibc 2.30+
-if [ "${PATCH_GLIBC:-no}" = "yes" ]; then
-	patch -p0 < $CWD/glibc-2.30+.patch
-fi
-patch -p1 < $CWD/basilisk-include-limits.patch
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -178,7 +177,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/$SRCNAM2/.mozconfig"
+export MOZCONFIG="$TMP/$SRCNAM1/.mozconfig"
 export MOZILLA_OFFICIAL=1
 export MOZ_MAKE_FLAGS=$MAKEFLAGS
 export CFLAGS="$SLKCFLAGS"
@@ -189,6 +188,8 @@ export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 export PYTHON=/usr/bin/python2
 
+# A stale DBUS_SESSION_BUS_ADDRESS var can cause build failures
+unset DBUS_SESSION_BUS_ADDRESS
 
 # 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.
@@ -211,7 +212,7 @@ OPTIONS="\
   --disable-accessibility \
   $DEBUG \
   $DEVTOOLS \
-  --enable-application=$PRGNAM \
+  --enable-application=browser \
   --disable-crashreporter \
   --disable-updater \
   --disable-tests \
@@ -233,9 +234,9 @@ echo "ac_add_options --enable-jack" >> .mozconfig; fi
 ./mach build
 
 ## Clean up; and package Pale Moon.
+DESTDIR=$PKG ./mach install
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 cd $TMP/$OBJ
-make install DESTDIR=$PKG
 
 cd $PKG
 
@@ -256,21 +257,24 @@ 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 \
+  ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/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 \
+ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/icons/mozicon128.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/$SRCNAM2/platform/LEGAL $TMP/$SRCNAM2/LICENSE $TMP/$SRCNAM2/README.md $TMP/$SRCNAM2/AUTHORS \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/GRE
+for i in $DOCS; do
+  cp  $TMP/$SRCNAM1/$i $PKG/usr/doc/$PRGNAM-$VERSION
+done
+for i in $DOCS_GRE; do
+  cp $TMP/$SRCNAM1/platform/$i $PKG/usr/doc/$PRGNAM-$VERSION/GRE/
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install