From 4fdf87ff7f94144d5769b13734b6289f48b0b5e9 Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 23 Oct 2018 16:01:49 +0200 Subject: [PATCH] firefox: update to 63.0. --- srcpkgs/firefox/patches/fix-xpcom.patch | 29 ++++++++++++------- .../patches/rust-unitialized-field.patch | 19 ------------ srcpkgs/firefox/template | 8 ++--- 3 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/firefox/patches/rust-unitialized-field.patch diff --git a/srcpkgs/firefox/patches/fix-xpcom.patch b/srcpkgs/firefox/patches/fix-xpcom.patch index 38dd582d96b..71265736c81 100644 --- a/srcpkgs/firefox/patches/fix-xpcom.patch +++ b/srcpkgs/firefox/patches/fix-xpcom.patch @@ -1,11 +1,18 @@ ---- xpcom/base/nsMemoryReporterManager.cpp.orig 2015-12-16 11:53:14.211144456 +0100 -+++ xpcom/base/nsMemoryReporterManager.cpp 2015-12-16 11:55:26.859476381 +0100 -@@ -46,7 +46,7 @@ using namespace mozilla; - # include "mozmemory.h" - #endif // MOZ_MEMORY - --#if defined(XP_LINUX) -+#if defined(XP_LINUX) && defined(__GLIBC__) - - #include - #include +--- xpcom/base/nsMemoryReporterManager.cpp.orig 2018-10-25 01:03:36.267772091 +0200 ++++ xpcom/base/nsMemoryReporterManager.cpp 2018-10-25 01:42:08.863831518 +0200 +@@ -133,6 +133,7 @@ + return GetProcSelfSmapsPrivate(aN); + } + ++#ifdef __GLIBC__ + #ifdef HAVE_MALLINFO + #define HAVE_SYSTEM_HEAP_REPORTER 1 + static MOZ_MUST_USE nsresult +@@ -154,6 +155,7 @@ + return NS_OK; + } + #endif ++#endif + + #elif defined(__DragonFly__) || defined(__FreeBSD__) \ + || defined(__NetBSD__) || defined(__OpenBSD__) \ diff --git a/srcpkgs/firefox/patches/rust-unitialized-field.patch b/srcpkgs/firefox/patches/rust-unitialized-field.patch deleted file mode 100644 index 67ef3a02ab8..00000000000 --- a/srcpkgs/firefox/patches/rust-unitialized-field.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./media/audioipc/audioipc/src/cmsg.rs.orig 2018-05-09 22:19:14.748631939 +0200 -+++ ./media/audioipc/audioipc/src/cmsg.rs 2018-05-09 22:19:22.961620862 +0200 -@@ -106,11 +106,11 @@ impl ControlMsgBuilder { - return Err(Error::NoSpace); - } - -- let cmsghdr = cmsghdr { -- cmsg_len: cmsg_len as _, -- cmsg_level: level, -- cmsg_type: kind, -- }; -+ use std::mem; -+ let mut cmsghdr: cmsghdr = unsafe { mem::zeroed() }; -+ cmsghdr.cmsg_len = cmsg_len as _; -+ cmsghdr.cmsg_level = level; -+ cmsghdr.cmsg_type = kind; - - let cmsghdr = unsafe { - slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::()) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index f4ebf0cca63..19bf84e1eaf 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,20 +3,20 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=62.0.3 -revision=2 +version=63.0 +revision=1 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=c1d506eb7b1225e52398b2e4587085e77ff5f1fbf07728ba0fee60bbeae94636 +checksum=3f95b028571ab9ffb3bf637761534a685aed224de3b87eb8ad7e1d0831995c07 only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo - llvm clang" + llvm clang nodejs cbindgen" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel