diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | e31d79e8da99456247df84c2f99ba9083d46efe1.patch | 57 |
3 files changed, 80 insertions, 17 deletions
@@ -27,8 +27,10 @@ pkgbase = palemoon optdepends = ffmpeg: various video and audio support source = git+https://github.com/MoonchildProductions/UXP#tag=PM28.7.1_Release source = mozconfig.in - md5sums = SKIP - md5sums = f6a92ca06a9ec853396f17610fa0f703 + source = e31d79e8da99456247df84c2f99ba9083d46efe1.patch + sha1sums = SKIP + sha1sums = 802731e5af4d117961d3d6fc61bd1e23f69fd384 + sha1sums = dcea3eeeff37747c09d266f7a1af453d81f5f291 pkgname = palemoon @@ -16,21 +16,25 @@ makedepends=('git' 'python2' 'autoconf2.13' 'unzip' 'zip' 'yasm' 'gconf' optdepends=('libpulse: PulseAudio audio driver' 'ffmpeg: various video and audio support') source=(git+"https://github.com/MoonchildProductions/UXP#tag=PM${pkgver}_Release" - mozconfig.in) -md5sums=('SKIP' - 'f6a92ca06a9ec853396f17610fa0f703') + mozconfig.in + e31d79e8da99456247df84c2f99ba9083d46efe1.patch) +sha1sums=('SKIP' + '802731e5af4d117961d3d6fc61bd1e23f69fd384' + 'dcea3eeeff37747c09d266f7a1af453d81f5f291') prepare() { - sed 's#%SRCDIR%#'"$srcdir"'#g' mozconfig.in > mozconfig + sed 's#%SRCDIR%#'"${srcdir}"'#g' mozconfig.in > mozconfig sed -i 's#xlocale#locale#' UXP/intl/icu/source/i18n/digitlst.cpp + cd UXP + patch -Np1 -i "${srcdir}/e31d79e8da99456247df84c2f99ba9083d46efe1.patch" } build() { cd UXP - export MOZBUILD_STATE_PATH="$srcdir/mozbuild" - export MOZCONFIG="$srcdir/mozconfig" - export CPPFLAGS="$CPPFLAGS -O2 -Wno-format-overflow" + export MOZBUILD_STATE_PATH="${srcdir}/mozbuild" + export MOZCONFIG="${srcdir}/mozconfig" + export CPPFLAGS="${CPPFLAGS} -O2 -Wno-format-overflow" python2 mach build } @@ -38,20 +42,20 @@ package() { cd pmbuild make package cd dist - install -d "$pkgdir"/usr/{bin,lib} - cp -r palemoon/ "$pkgdir/usr/lib/$pkgname" - ln -s "../lib/$pkgname/palemoon" "$pkgdir/usr/bin/palemoon" + install -d "${pkgdir}"/usr/{bin,lib} + cp -r palemoon/ "${pkgdir}/usr/lib/${pkgname}" + ln -s "../lib/${pkgname}/palemoon" "${pkgdir}/usr/bin/palemoon" # icons install -Dm644 palemoon/browser/chrome/icons/default/default16.png \ - "$pkgdir/usr/share/icons/hicolor/16x16/apps/$pkgname.png" + "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png" install -Dm644 palemoon/browser/chrome/icons/default/default32.png \ - "$pkgdir/usr/share/icons/hicolor/32x32/apps/$pkgname.png" + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png" install -Dm644 palemoon/browser/chrome/icons/default/default48.png \ - "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png" + "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png" install -Dm644 palemoon/browser/icons/mozicon128.png \ - "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png" # install desktop file - install -Dm644 "$srcdir/UXP/application/palemoon/branding/official/palemoon.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "${srcdir}/UXP/application/palemoon/branding/official/palemoon.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" } diff --git a/e31d79e8da99456247df84c2f99ba9083d46efe1.patch b/e31d79e8da99456247df84c2f99ba9083d46efe1.patch new file mode 100644 index 000000000000..eb265155de8a --- /dev/null +++ b/e31d79e8da99456247df84c2f99ba9083d46efe1.patch @@ -0,0 +1,57 @@ +From e31d79e8da99456247df84c2f99ba9083d46efe1 Mon Sep 17 00:00:00 2001 +From: "Matt A. Tobin" <email@mattatobin.com> +Date: Wed, 16 Oct 2019 12:37:07 -0400 +Subject: [PATCH] Fix build errors with newer glibc versions + +--- + js/src/jsnativestack.cpp | 6 +----- + tools/profiler/tasktracer/GeckoTaskTracer.cpp | 12 +++--------- + 2 files changed, 4 insertions(+), 14 deletions(-) + +diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp +index 98f8fc7416..94a296bd0e 100644 +--- a/js/src/jsnativestack.cpp ++++ b/js/src/jsnativestack.cpp +@@ -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(SYS_gettid)) + # endif + + #else +diff --git a/tools/profiler/tasktracer/GeckoTaskTracer.cpp b/tools/profiler/tasktracer/GeckoTaskTracer.cpp +index ada6956148..36d1bffc38 100644 +--- a/tools/profiler/tasktracer/GeckoTaskTracer.cpp ++++ b/tools/profiler/tasktracer/GeckoTaskTracer.cpp +@@ -20,22 +20,16 @@ + + #include <stdarg.h> + +-// We need a definition of gettid(), but glibc doesn't provide a ++// We need a definition of gettid(), but older glibc versions don't provide a + // wrapper for it. + #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(); |