jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

firefox: update to 68.0.

Browse source
This commit is contained in:
Johannes 2019-07-09 21:03:02 +02:00 committed by Johannes
parent 2924c8d964
commit f45ea8dc62
9 changed files with 81 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/firefox/patches/fix-cmsghdr-rust.patch
View file

@ -1,11 +0,0 @@
--- media/audioipc/audioipc/src/cmsg.rs.orig 2019-03-19 21:31:45.177880477 +0100
+++ media/audioipc/audioipc/src/cmsg.rs 2019-03-19 21:32:38.103478999 +0100
@@ -108,7 +108,7 @@
let cmsghdr = cmsghdr {
cmsg_len: cmsg_len as _,
- #[cfg(target_env = "musl")]
+ #[cfg(all(target_env = "musl", target_pointer_width = "64"))]
__pad1: 0,
cmsg_level: level,
cmsg_type: kind,

16
srcpkgs/firefox/patches/fix-musl.patch
View file

@ -1,11 +1,11 @@
--- tools/profiler/core/platform.h.orig 2019-03-19 01:54:25.407952218 +0100
+++ tools/profiler/core/platform.h 2019-03-19 01:54:45.571767946 +0100
@@ -44,7 +44,7 @@
--- tools/profiler/core/platform-linux-android.cpp.orig 2019-07-09 22:58:30.039475686 +0200
+++ tools/profiler/core/platform-linux-android.cpp 2019-07-09 22:58:39.331437677 +0200
@@ -73,7 +73,7 @@
// We need a definition of gettid(), but glibc doesn't provide a
// wrapper for it.
int profiler_current_thread_id() {
// glibc doesn't provide a wrapper for gettid().
-#if defined(__GLIBC__)
+#if defined(__linux__)
# include <unistd.h>
# include <sys/syscall.h>
static inline pid_t gettid() { return (pid_t)syscall(SYS_gettid); }
return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
#else
return static_cast<int>(gettid());

7
srcpkgs/firefox/patches/fix-rust-libc-ppc64-musl.patch
View file

@ -1,7 +0,0 @@
--- Cargo.toml.orig 2019-05-21 07:45:37.809198143 +0200
+++ Cargo.toml 2019-05-21 07:54:57.903418198 +0200
@@ -61,3 +61,4 @@
serde_derive = { git = "https://github.com/servo/serde", branch = "deserialize_from_enums9" }
winapi = { git = "https://github.com/froydnj/winapi-rs", branch = "aarch64" }
cc = { git = "https://github.com/glandium/cc-rs", branch = "1.0.23-clang-cl-aarch64" }
+libc = { git = "https://github.com/rust-lang/libc", rev = "914eba137b25ece7ade3986f1e34df9cf439af22" }

14
srcpkgs/firefox/patches/fix-toolkit.patch
View file

@ -60,15 +60,15 @@
# include <dirent.h>
--- toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000
+++ toolkit/mozapps/update/updater/updater.cpp 2014-04-17 10:24:33.796765327 +0000
@@ -3432,6 +3432,7 @@
int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
{
@@ -3978,6 +3978,7 @@
int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
int rv = OK;
+#if !defined(__linux__) || defined(__GLIBC__)
FTS *ftsdir;
FTSENT *ftsdirEntry;
NS_tchar searchpath[MAXPATHLEN];
@@ -3534,6 +3535,7 @@
FTS* ftsdir;
FTSENT* ftsdirEntry;
mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
@@ -4085,6 +4086,7 @@
}
fts_close(ftsdir);

11
srcpkgs/firefox/patches/fix-webrtc-arm.patch
View file

@ -1,11 +0,0 @@
--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc.orig 2019-01-16 16:52:42.676473795 +0100
+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc 2019-01-16 16:54:22.595598235 +0100
@@ -67,7 +67,7 @@
return 0;
}
-#if !defined(ANDROID)
+#if !defined(ANDROID) && !defined(__linux__)
#ifdef WEBRTC_ARCH_ARM_V7
uint64_t WebRtc_GetCPUFeaturesARM(void) {
return kCPUFeatureARMv7

19
srcpkgs/firefox/patches/ppc-no-static-sizes.patch
View file

@ -1,19 +0,0 @@
# HG changeset patch
# Parent b735e618c2a860972197942f6680c941e3c9a67f
# User Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
Bug 997353 - Do not use compile-time page size for PowerPC.
The PowerPC architecture allows various memory page sizes, making it impossible
to predict the runtime page size.
--- memory/build/mozjemalloc.cpp
+++ memory/build/mozjemalloc.cpp
@@ -182,7 +182,7 @@
// Debug builds are opted out too, for test coverage.
#ifndef MOZ_DEBUG
# if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && \
- !defined(__aarch64__)
+ !defined(__aarch64__) && !defined(__powerpc__) && !defined(__powerpc64__)
# define MALLOC_STATIC_PAGESIZE 1
# endif
#endif

50
srcpkgs/firefox/patches/ppc64le-bug-1512162.patch Normal file
View file

@ -0,0 +1,50 @@
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
--- js/xpconnect/src/XPCWrappedNative.cpp
+++ js/xpconnect/src/XPCWrappedNative.cpp
@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
if (NS_FAILED(rv)) {
return Throw(rv, ccx);
}
JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
return helper.get().Call();
}
+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
+// Work around a compiler bug on ppc64le (bug 1512162).
+__attribute__ ((noinline,noclone))
+#endif
bool CallMethodHelper::Call() {
mCallContext.SetRetVal(JS::UndefinedValue());
mCallContext.GetContext()->SetPendingException(nullptr);
if (mVTableIndex == 0) {
return QueryInterfaceFastPath();
}
@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
return false;
}
}
}
return true;
}
+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
+// Work around a compiler bug on ppc64le (bug 1512162).
+__attribute__ ((noinline,noclone))
+#endif
bool CallMethodHelper::GatherAndConvertResults() {
// now we iterate through the native params to gather and convert results
uint8_t paramCount = mMethodInfo->GetParamCount();
for (uint8_t i = 0; i < paramCount; i++) {
const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
if (!paramInfo.IsOut()) {
continue;
}

18
srcpkgs/firefox/patches/remove-rustc-check.patch → srcpkgs/firefox/patches/rust-configure.patch
View file

@ -1,8 +1,19 @@
Mozilla rustc check does not support crossbuild: let's remove it
Remove calls to unwrap_rustup, they fail if rustup isn't present
--- build/moz.configure/rust.configure 2018-10-01 16:28:31.000000000 +0200
+++ build/moz.configure/rust.configure 2018-10-20 14:21:35.510000000 +0200
@@ -204,26 +204,6 @@
--- build/moz.configure/rust.configure 2019-07-06 03:48:30.000000000 +0200
+++ build/moz.configure/rust.configure 2019-07-09 22:35:23.326851798 +0200
@@ -79,9 +79,6 @@
return unwrap
-rustc = unwrap_rustup(rustc, 'rustc')
-cargo = unwrap_rustup(cargo, 'cargo')
-
set_config('CARGO', cargo)
set_config('RUSTC', rustc)
@@ -294,26 +291,6 @@
os.write(in_fd, source)
os.close(in_fd)
@ -29,4 +40,3 @@ Mozilla rustc check does not support crossbuild: let's remove it
finally:
os.remove(in_path)
os.remove(out_path)

4
srcpkgs/firefox/template
View file

@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
version=67.0.4
version=68.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
checksum=b2fb2d3e64a6947ef4f8212b72649acf2aa2cd4c8f70548abb636dd581fd6dc5
checksum=f7d61a08820088f1280d27f0808e355152c1dd0c94625fd077ced7319e522565
lib32disabled=yes