diff options
| -rw-r--r-- | testing/firefox/APKBUILD | 23 | ||||
| -rw-r--r-- | testing/firefox/fix-bug-1261392.patch | 14 | ||||
| -rw-r--r-- | testing/firefox/fix-tools.patch | 48 |
3 files changed, 35 insertions, 50 deletions
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD index 7e51c24bb2..e3876c6a1c 100644 --- a/testing/firefox/APKBUILD +++ b/testing/firefox/APKBUILD @@ -1,16 +1,13 @@ # Contributor: # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=firefox -pkgver=66.0.5 -_pkgver=$pkgver -_xulver=$pkgver -pkgrel=1 +pkgver=67.0.4 +pkgrel=0 pkgdesc="Firefox web browser" url="https://www.firefox.com/" # limited by rust and cargo arch="x86_64" -license="GPL LGPL MPL" -depends="" +license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0" makedepends=" alsa-lib-dev autoconf2.13 @@ -37,7 +34,7 @@ makedepends=" libvorbis-dev libxt-dev libxcomposite-dev - llvm5-dev + llvm8 mesa-dev nasm nodejs @@ -54,7 +51,6 @@ makedepends=" zip " -install="" source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz stab.h @@ -83,14 +79,11 @@ ldpath="$_mozappdir" prepare() { default_prepare - cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1341234 - mkdir -p "$builddir"/objdir - echo "ac_add_options BINDGEN_CFLAGS='-I/usr/include/nspr -I/usr/include/pixman-1'" >>objdir/.mozconfig } build() { + mkdir -p "$builddir"/objdir cd "$builddir"/objdir sed -e 's/checkImpl/checkFFImpl/g' -i ../js/src/vm/JSContext*.h @@ -216,18 +209,18 @@ __EOF__ rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so } -sha512sums="6e62e7bb95a7341471521c372506d9df276249d0c0863d059b0bd27537cddb1060c51f0ee103f79239226d34c6277f3855e1511a083bc4cc442718fc7c5db650 firefox-66.0.5.source.tar.xz +sha512sums="42abc837b5808a55e68273db6aa45fa73f8fe1df3c9072c94d8d049b6803ce8758745cc0a68af64c4ce9f86e5dd3b3619824ba67fabddce428204605894d9ee7 firefox-67.0.4.source.tar.xz 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5 fix-fortify-inline.patch 183a4ef62cd79728117797235fe46ecd3e4336c008d615c2b2a64c707477e403aed1ee5e19feb86611b93ebecc00df339aa28a73735e045e38f0d1ce3080341b fix-seccomp-bpf.patch ded76edfbc43637cd2e73100ea2244f97d95d452af61b9cd4f2db341cb0dbae8a5e846edeb4eafbe47dc1d30724869407d188e42b06518c67c4701745ea9adfa fix-toolkit.patch -48683964624bb58b5a2a2a5c89da56e3b8dcd04f8d42c6910bea5365010a77d6d82bdd48259774ca54341edc05b6768eaa6aa1b453718c02f760361197e78b52 fix-tools.patch +8de2edb1338754a0b6f1792fc795ef004cacd6223f91ba0b34f7f00471e8392f10267aacdb6a085d59bd0792abaabc42cff97ce0ccc8e546c4e7eadf6f33ec32 fix-tools.patch 4ea267fbe395ed8865f3ec18dd129d1c78cdbf23983a9c6c9e70b0536cdf2de8953e36444a10dfbdbd522a638fd90a6a51b2f7d5396ef6c98084ddd1ea34d0ff mallinfo.patch 3671bf7623c1825c977668efec62b57873bc6052becfd8a68ddcbc2d0ba96e0c3966c61b24716e6c48167d44280d3e690a4ff986907ceba5811a653e87770fff mozilla-build-arm.patch 019ab248a050bef305637dc4229596c06d9596879bbb1db985b96c5a680211996d714d4a1f6e9a66544cc4562a80364b1ee37ecf7964eb974ffef2566c5c2986 disable-moz-stackwalk.patch 42cc44fda4b05259b38f055d6f51461746aa89a474cedc5e92fb9d20879da0d12b1b515b273a549e7302cda9c7eddde20d5fdba09853e5c658784ad6d0b20078 fix-rust-target.patch -8b776f0da8dfad0ae81670623fa55ddcff91b78a1a569bb5e6b5f5130392249dfbebe84752c846c8aa5b4878643f0369cd7d9bfaf2b9dd0c841af302dcb48896 fix-bug-1261392.patch +294378108ecd8f90953beecbeb1e80bab6907d74ee1d36438a350e039b8c115093a408551fc45eb06d11f13884a6edde98eff507587b06327765047ebeb7cc8a fix-bug-1261392.patch 40768d2458adb87fc15ad17b430cf0bebabde583910e55624bf282d4a69b3f9b9165289a7a9c2b50bfb9de1a16e2546f8d0b5ce33c1920000cffb588410b9e9e fix-webrtc-glibcisms.patch e725a6e9b2361cd566ae2f90861dbce9f2231f16721ec02f4b9f9986b7dc82cc006ea6a500ae7f30c095ce746132a5bd1d9532c4cf0d1541dcc672a20aef8807 sandbox-membarrier.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop diff --git a/testing/firefox/fix-bug-1261392.patch b/testing/firefox/fix-bug-1261392.patch index 0b4f131bbd..cf5d8a0b1c 100644 --- a/testing/firefox/fix-bug-1261392.patch +++ b/testing/firefox/fix-bug-1261392.patch @@ -1,12 +1,12 @@ diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h -index 5f0fb69..086a511 100644 +index 8379eb0347..4246d8138c 100644 --- a/tools/profiler/core/platform.h +++ b/tools/profiler/core/platform.h -@@ -42,10 +42,11 @@ - #include "PlatformMacros.h" - #include <vector> +@@ -39,10 +39,11 @@ + #include <functional> + #include <stdint.h> --// We need a definition of gettid(), but glibc doesn't provide a +-// We need a definition of gettid(), but old glibc versions don't provide a -// wrapper for it. -#if defined(__GLIBC__) +// We need a definition of gettid(), but Linux libc implementations don't @@ -15,9 +15,9 @@ index 5f0fb69..086a511 100644 # include <unistd.h> +#if !defined(__BIONIC__) # 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(GP_OS_darwin) -@@ -61,6 +62,7 @@ static inline pid_t gettid() { return (pid_t)syscall(SYS_thread_selfid); } +@@ -58,6 +59,7 @@ # define getpid _getpid # endif #endif diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch index edecb7f678..800b6599b3 100644 --- a/testing/firefox/fix-tools.patch +++ b/testing/firefox/fix-tools.patch @@ -1,14 +1,23 @@ ---- a/tools/profiler/core/platform.h -+++ b/tools/profiler/core/platform.h -@@ -29,6 +29,8 @@ - #ifndef TOOLS_PLATFORM_H_ - #define TOOLS_PLATFORM_H_ - -+#include <sys/types.h> -+ - #include <stdint.h> - #include <math.h> - #include "MainThreadUtils.h" +diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp +index 19d0a5c56d..b64b543066 100644 +--- a/tools/profiler/core/platform-linux-android.cpp ++++ b/tools/profiler/core/platform-linux-android.cpp +@@ -498,8 +498,10 @@ static void PlatformInit(PSLockRef aLock) {} + ucontext_t sSyncUContext; + + void Registers::SyncPopulate() { +- if (!getcontext(&sSyncUContext)) { +- PopulateRegsFromContext(*this, &sSyncUContext); +- } ++ #if defined(__GLIBC__) ++ if (!getcontext(&sSyncUContext)) { ++ PopulateRegsFromContext(*this, &sSyncUContext); ++ } ++ #endif + } + #endif +diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp +index 9998d04d0d..348a7086fc 100644 --- a/tools/profiler/lul/LulElf.cpp +++ b/tools/profiler/lul/LulElf.cpp @@ -469,10 +469,10 @@ string FormatIdentifier(unsigned char identifier[16]) { @@ -25,21 +34,4 @@ + string base = p ? p+1 : c_filename; return base; } - ---- a/tools/profiler/core/platform-linux-android.cpp -+++ b/tools/profiler/core/platform-linux-android.cpp -@@ -497,8 +497,10 @@ static void PlatformInit(PSLockRef aLock) {} - ucontext_t sSyncUContext; - - void Registers::SyncPopulate() { -- if (!getcontext(&sSyncUContext)) { -- PopulateRegsFromContext(*this, &sSyncUContext); -- } -+ #if defined(__GLIBC__) -+ if (!getcontext(&sSyncUContext)) { -+ PopulateRegsFromContext(*this, &sSyncUContext); -+ } -+ #endif - } - #endif |