diff options
Diffstat (limited to 'network/palemoon')
| -rw-r--r-- | network/palemoon/README | 49 | ||||
| -rw-r--r-- | network/palemoon/adNauseam-unblock.patch | 16 | ||||
| -rw-r--r-- | network/palemoon/glibc-2.30+.patch | 43 | ||||
| -rw-r--r-- | network/palemoon/palemoon.SlackBuild | 24 | ||||
| -rw-r--r-- | network/palemoon/palemoon.info | 8 |
5 files changed, 44 insertions, 96 deletions
diff --git a/network/palemoon/README b/network/palemoon/README index 72c8031fec..61cdab4bc1 100644 --- a/network/palemoon/README +++ b/network/palemoon/README @@ -11,40 +11,41 @@ This SlackBuild attempts to compile, build and package Pale Moon, Slackware style, in a manner that conforms to official Pale Moon Linux releases; while, at the same time, providing useful and easy ways to deviate if desired. This SlackBuild may conflict with the alternative -SlackBuild known, here at SBo, as "palemoon-bin"; which repackages binaries -offically released by the Pale Moon devs. +SlackBuild known, here at SBo, as "palemoon-bin"; which repackages +binaries offically released by the Pale Moon devs. ----------------------------------------------------------------------------- +------------------------------------------------------------------------ -See http://docs.slackware.com/howtos:software:palemoon for additional tips and -help resources. +See http://docs.slackware.com/howtos:software:palemoon for additional +tips and help resources. Using the Oxygen theme is known to cause Pale Moon to crash; if you are -experiencing crashes, and segfaults, make sure you are not using this theme; -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. +experiencing crashes, and segfaults, make sure you are not using this +theme; 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. -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 -parameter: +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 parameter: - DEVTOOLS=no ./palemoon.SlackBuild + DEVTOOLS=no ./palemoon.SlackBuild -Pale Moon's default is to build, ship, and use its own internal dictionary; -if desired, however, do USE_SYSTEM_HUNSPELL=yes ./palemoon.SlackBuild, to -use the Slackware system Hunspell instead. 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. +Pale Moon's default is to build, ship, and use its own internal +dictionary; if desired, however, do USE_SYSTEM_HUNSPELL=yes +./palemoon.SlackBuild, to use the Slackware system Hunspell instead. +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 + 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). +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 @@ -54,4 +55,4 @@ passing the variable: To enable debug information, pass the script the parameter - ENABLE_DEBUG=yes + ENABLE_DEBUG=yes diff --git a/network/palemoon/adNauseam-unblock.patch b/network/palemoon/adNauseam-unblock.patch deleted file mode 100644 index b1ff1b8bb4..0000000000 --- a/network/palemoon/adNauseam-unblock.patch +++ /dev/null @@ -1,16 +0,0 @@ -*** 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> - <prefs></prefs> - </emItem> -- <emItem blockID="pm110" id="adnauseam@rednoise.org"> -- <versionRange minVersion="0" maxVersion="*" severity="2"> -- </versionRange> -- <prefs></prefs> -- </emItem> - <emItem blockID="pm111" id="customtoolbarsplus@srazzano.com"> - <versionRange minVersion="0" maxVersion="52.4.2" severity="3"> - </versionRange> ---- 2504,2509 ---- diff --git a/network/palemoon/glibc-2.30+.patch b/network/palemoon/glibc-2.30+.patch deleted file mode 100644 index b67945d12a..0000000000 --- a/network/palemoon/glibc-2.30+.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- tools/profiler/tasktracer/GeckoTaskTracer.cpp 2019-08-23 01:47:27.000000000 +0200 -+++ tools/profiler/tasktracer/GeckoTaskTracer.cpp 2019-08-29 18:02:44.541959971 +0200 -@@ -25,20 +25,14 @@ - #if defined(__GLIBC__) - #include <unistd.h> - #include <sys/syscall.h> --static inline pid_t gettid() --{ -- return (pid_t) syscall(SYS_gettid); --} -+#define gettid() static_cast<pid_t>(syscall(SYS_gettid)) - #elif defined(XP_MACOSX) - #include <unistd.h> - #include <sys/syscall.h> --static inline pid_t gettid() --{ -- return (pid_t) syscall(SYS_thread_selfid); --} -+#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid)) - #elif defined(LINUX) - #include <sys/types.h> --pid_t gettid(); -+#pid_t gettid(); - #endif - - // NS_ENSURE_TRUE_VOID() without the warning on the debug build. - - ---- js/src/jsnativestack.cpp 2019-08-29 17:45:10.000000000 +0200 -+++ js/src/jsnativestack.cpp 2019-08-29 17:53:58.382003265 +0200 -@@ -26,11 +26,7 @@ - # include <sys/syscall.h> - # include <sys/types.h> - # include <unistd.h> --static pid_t --gettid() --{ -- return syscall(__NR_gettid); --} -+# define gettid() static_cast<pid_t>(syscall(__NR_gettid)) - # endif - - #else diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild index a1e88e072e..321f5f88d0 100644 --- a/network/palemoon/palemoon.SlackBuild +++ b/network/palemoon/palemoon.SlackBuild @@ -26,8 +26,10 @@ # Special thanks to Ponce PRGNAM=palemoon -VERSION=${VERSION:-28.7.2} -SRCNAM=${SRCNAM:-UXP-PM${VERSION}_Release} +VERSION=${VERSION:-29.1.1} +SRCNAM1=${SRCNAM1:-Pale-Moon-${VERSION}_Release} +SRCNAM2=${SRCNAM2:-pale-moon} +SRCNAM3=${SRCNAM3:-UXP-RELBASE_20210330} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,9 +80,9 @@ fi # master trunck of the Pale Moon github repository. BRANDING=${BRANDING:---enable-official-branding} if [ "$BRANDING" = "NewMoon" ]; then - BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unofficial" + BRANDING="--disable-official-branding --with-branding=palemoon/branding/unofficial" elif [ "$BRANDING" = "unstable" ]; then - BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unstable" + BRANDING="--disable-official-branding --with-branding=palemoon/branding/unstable" fi rm -rf $PKG $TMP/gold $TMP/$OBJ @@ -141,9 +143,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 $SRCNAM2 +tar -xvf $CWD/$SRCNAM1.tar.gz +cd $SRCNAM2 +tar -xvf $CWD/$SRCNAM3.tar.gz -C platform --strip-components 1 if [ "${ADNAUSEAM:-block}" = "unblock" ]; then patch -p1 < $CWD/adNauseam-unblock.patch @@ -165,7 +168,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/$SRCNAM2/.mozconfig" export MOZILLA_OFFICIAL=1 export MOZ_MAKE_FLAGS=$MAKEFLAGS export CFLAGS="$SLKCFLAGS" @@ -217,7 +220,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 +260,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/$SRCNAM2/platform/LEGAL $TMP/$SRCNAM2/LICENSE $TMP/$SRCNAM2/README.md $TMP/$SRCNAM2/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 285ce4b76c..614b3b3b55 100644 --- a/network/palemoon/palemoon.info +++ b/network/palemoon/palemoon.info @@ -1,9 +1,11 @@ PRGNAM="palemoon" -VERSION="28.7.2" +VERSION="29.1.1" HOMEPAGE="http://www.palemoon.org/" -DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.7.2_Release/UXP-PM28.7.2_Release.tar.gz \ +DOWNLOAD="http://repo.khronosschoty.org/Slackware/Pale-Moon/source/Pale-Moon-29.1.1_Release.tar.gz + http://repo.khronosschoty.org/Slackware/Pale-Moon/source/UXP-RELBASE_20210330.tar.gz \ http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz" -MD5SUM="55feba81dc3a939bbca63ab9963a8edc \ +MD5SUM="f522cab929ec62382dc30391a590b039 \ + 535724b8fbb0d791cdf48f456969df9f \ f2994d302cf736e7e71974edfa51da3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" |