diff options
author | khronosschoty <khronosschoty@posteo.org> | 2022-03-18 10:25:25 -0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-19 09:20:58 +0700 |
commit | 376f2fccb20cebf8f0e786eb2cc35d880e39f7cc (patch) | |
tree | 8333df8561e5116e321350790ba7f9cec40a3e79 /network | |
parent | b1feb037ef7a6d7924cf0e9fde7e72cc59bafaf2 (diff) |
network/palemoon: updated for version 30.0.0
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r-- | network/palemoon/0001-Issue-7-Add-GCC-11-initial-support.patch | 37 | ||||
-rw-r--r-- | network/palemoon/README | 4 | ||||
-rw-r--r-- | network/palemoon/basilisk-include-limits.patch | 34 | ||||
-rw-r--r-- | network/palemoon/palemoon.SlackBuild | 54 | ||||
-rw-r--r-- | network/palemoon/palemoon.info | 8 |
5 files changed, 71 insertions, 66 deletions
diff --git a/network/palemoon/0001-Issue-7-Add-GCC-11-initial-support.patch b/network/palemoon/0001-Issue-7-Add-GCC-11-initial-support.patch new file mode 100644 index 0000000000000..38ec82aad9727 --- /dev/null +++ b/network/palemoon/0001-Issue-7-Add-GCC-11-initial-support.patch @@ -0,0 +1,37 @@ +From 27b19218f0d3df9aaf76e784ed2348dc308437d7 Mon Sep 17 00:00:00 2001 +From: khronosschoty <khronosschoty@posteo.org> +Date: Fri, 4 Mar 2022 07:15:50 -0800 +Subject: [PATCH 1/1] Issue #7 - Add GCC 11 initial support + +--- + platform/system/graphics/2d/BaseRect.h | 1 + + platform/system/network/base/nsURLParsers.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/platform/system/graphics/2d/BaseRect.h b/platform/system/graphics/2d/BaseRect.h +index 57d01ba09..b1eed9ddb 100644 +--- a/platform/system/graphics/2d/BaseRect.h ++++ b/platform/system/graphics/2d/BaseRect.h +@@ -9,6 +9,7 @@ + #include <algorithm> + #include <cmath> + #include <ostream> ++#include <limits> + + #include "mozilla/Assertions.h" + #include "mozilla/FloatingPoint.h" +diff --git a/platform/system/network/base/nsURLParsers.cpp b/platform/system/network/base/nsURLParsers.cpp +index b75ee0c4d..ed4a216a8 100644 +--- a/platform/system/network/base/nsURLParsers.cpp ++++ b/platform/system/network/base/nsURLParsers.cpp +@@ -4,6 +4,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + #include <string.h> ++#include <limits> + + #include "mozilla/RangedPtr.h" + +-- +2.35.1 + diff --git a/network/palemoon/README b/network/palemoon/README index 61cdab4bc1c2d..8894515c8eb0d 100644 --- a/network/palemoon/README +++ b/network/palemoon/README @@ -39,10 +39,6 @@ This assumes you have dictionaries such as hunspell-en or hunspell-es installed in /usr/share/hunspell -- the location that a few SlackBuilds at SBo install them. -To remove the "AdNauseam" extension from the Pale Moon blocklist, do - - ADNAUSEAM=unblock ./palemoon.SlackBuild - 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). diff --git a/network/palemoon/basilisk-include-limits.patch b/network/palemoon/basilisk-include-limits.patch deleted file mode 100644 index 22a8dc247458b..0000000000000 --- a/network/palemoon/basilisk-include-limits.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur basilisk-2021.11.14-source_orig/platform/gfx/2d/BaseRect.h basilisk-2021.11.14-source/platform/gfx/2d/BaseRect.h ---- basilisk-2021.11.14-source_orig/platform/gfx/2d/BaseRect.h 2021-11-12 17:10:16.000000000 -0500 -+++ basilisk-2021.11.14-source/platform/gfx/2d/BaseRect.h 2021-11-15 17:32:59.411746189 -0500 -@@ -9,6 +9,7 @@ - #include <algorithm> - #include <cmath> - #include <ostream> -+#include <limits> - - #include "mozilla/Assertions.h" - #include "mozilla/FloatingPoint.h" -diff -Naur basilisk-2021.11.14-source_orig/platform/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc basilisk-2021.11.14-source/platform/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc ---- basilisk-2021.11.14-source_orig/platform/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc 2021-11-12 17:10:36.000000000 -0500 -+++ basilisk-2021.11.14-source/platform/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc 2021-11-15 17:35:40.787737049 -0500 -@@ -7,7 +7,7 @@ - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -- -+#include <limits> - #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h" - - #include "webrtc/base/checks.h" -diff -Naur basilisk-2021.11.14-source_orig/platform/netwerk/base/nsURLParsers.cpp basilisk-2021.11.14-source/platform/netwerk/base/nsURLParsers.cpp ---- basilisk-2021.11.14-source_orig/platform/netwerk/base/nsURLParsers.cpp 2021-11-12 17:10:38.000000000 -0500 -+++ basilisk-2021.11.14-source/platform/netwerk/base/nsURLParsers.cpp 2021-11-15 17:33:50.427743299 -0500 -@@ -4,6 +4,7 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - #include <string.h> -+#include <limits> - - #include "mozilla/RangedPtr.h" - 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 diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info index 1bb766146fb8e..d495a982cdaff 100644 --- a/network/palemoon/palemoon.info +++ b/network/palemoon/palemoon.info @@ -1,9 +1,11 @@ PRGNAM="palemoon" -VERSION="29.4.4" +VERSION="30.0.0" HOMEPAGE="http://www.palemoon.org/" -DOWNLOAD="http://archive.palemoon.org/source/palemoon-29.4.4.source.tar.xz \ +DOWNLOAD="http://repo.schotynet.org/sources/palemoon/Pale-Moon-30.0.0_Release.tar.gz \ + http://repo.schotynet.org/sources/GRE/GRE-RELBASE_20220310.tar.gz \ http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz" -MD5SUM="84aaa73e058742c0a0dfe3d7f42c9ef0 \ +MD5SUM="57b9accd80f17553be2a6f4042db0560 \ + 9d4d6715cf475a11455cae4e6fc6cefe \ f2994d302cf736e7e71974edfa51da3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" |