From bb591077bf65804906c68d0e1720ef2be395556a Mon Sep 17 00:00:00 2001 From: khronosschoty Date: Wed, 23 Oct 2019 12:26:29 +0700 Subject: network/palemoon: Updated for version 28.7.1. Signed-off-by: Willy Sudiarto Raharjo --- network/palemoon/glibc-2.30+.patch | 43 ++++++++++++++++++++++++++++++++++++ network/palemoon/palemoon.SlackBuild | 8 +++++-- network/palemoon/palemoon.info | 6 ++--- 3 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 network/palemoon/glibc-2.30+.patch diff --git a/network/palemoon/glibc-2.30+.patch b/network/palemoon/glibc-2.30+.patch new file mode 100644 index 0000000000..b67945d12a --- /dev/null +++ b/network/palemoon/glibc-2.30+.patch @@ -0,0 +1,43 @@ +--- 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 + #include +-static inline pid_t gettid() +-{ +- return (pid_t) syscall(SYS_gettid); +-} ++#define gettid() static_cast(syscall(SYS_gettid)) + #elif defined(XP_MACOSX) + #include + #include +-static inline pid_t gettid() +-{ +- return (pid_t) syscall(SYS_thread_selfid); +-} ++#define gettid() static_cast(syscall(SYS_thread_selfid)) + #elif defined(LINUX) + #include +-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 + # include + # include +-static pid_t +-gettid() +-{ +- return syscall(__NR_gettid); +-} ++# define gettid() static_cast(syscall(__NR_gettid)) + # endif + + #else diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild index 935f206937..41074dd2b7 100644 --- a/network/palemoon/palemoon.SlackBuild +++ b/network/palemoon/palemoon.SlackBuild @@ -26,7 +26,7 @@ # Special thanks to Ponce PRGNAM=palemoon -VERSION=${VERSION:-28.7.0} +VERSION=${VERSION:-28.7.1} SRCNAM=${SRCNAM:-UXP-PM${VERSION}_Release} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -83,7 +83,6 @@ elif [ "$BRANDING" = "unstable" ]; then BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unstable" fi - rm -rf $PKG $TMP/gold $TMP/$OBJ mkdir -p $TMP $PKG $OUTPUT $TMP/gold $TMP/$OBJ @@ -150,6 +149,11 @@ 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 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info index 440884bd66..14ba99b2e2 100644 --- a/network/palemoon/palemoon.info +++ b/network/palemoon/palemoon.info @@ -1,9 +1,9 @@ PRGNAM="palemoon" -VERSION="28.7.0" +VERSION="28.7.1" HOMEPAGE="http://www.palemoon.org/" -DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.7.0_Release/UXP-PM28.7.0_Release.tar.gz \ +DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.7.1_Release/UXP-PM28.7.1_Release.tar.gz \ http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz" -MD5SUM="d187d401e5eee834b46135b000201297 \ +MD5SUM="55ccedaeb2a3a808d3bc425064d43c16 \ f2994d302cf736e7e71974edfa51da3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -- cgit v1.2.3