diff options
| -rw-r--r-- | network/basilisk/basilisk.SlackBuild | 7 | ||||
| -rw-r--r-- | network/basilisk/basilisk.info | 6 | ||||
| -rw-r--r-- | network/basilisk/glibc-2.30+.patch | 43 |
3 files changed, 52 insertions, 4 deletions
diff --git a/network/basilisk/basilisk.SlackBuild b/network/basilisk/basilisk.SlackBuild index 8d0dc79ace..a3419c2151 100644 --- a/network/basilisk/basilisk.SlackBuild +++ b/network/basilisk/basilisk.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=basilisk SRCNAM=${SRCNAM:-UXP} -VERSION=${VERSION:-2018.12.18} +VERSION=${VERSION:-2019.09.03} RELEASEVER=${RELEASEVER:-52.9.$VERSION} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -142,6 +142,11 @@ cd $SRCNAM-$VERSION echo "$RELEASEVER" > application/basilisk/config/version.txt echo "$VERSION" > application/basilisk/config/version_display.txt +# 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/basilisk/basilisk.info b/network/basilisk/basilisk.info index 4a97b3db63..85057decb3 100644 --- a/network/basilisk/basilisk.info +++ b/network/basilisk/basilisk.info @@ -1,9 +1,9 @@ PRGNAM="basilisk" -VERSION="2018.12.18" +VERSION="2019.09.03" HOMEPAGE="https://github.com/MoonchildProductions/UXP" -DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/v2018.12.18/UXP-2018.12.18.tar.gz \ +DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/v2019.09.03/UXP-2019.09.03.tar.gz \ http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz" -MD5SUM="2aa9f8fa041686da08ea76b8188caa3e \ +MD5SUM="afa2ceea4761d3d8d0df88ffe5e42894 \ f2994d302cf736e7e71974edfa51da3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/basilisk/glibc-2.30+.patch b/network/basilisk/glibc-2.30+.patch new file mode 100644 index 0000000000..b67945d12a --- /dev/null +++ b/network/basilisk/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 <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 |