firefox: update to 47.0.1.
There are some issues with the configure scripts as they have changed there something, the pregenerated configure scripts were renamed to `old-configure` and `configure` is now a shell script which executes `configure.py`. The new patch `disable-hunspell_hooks.patch` is needed for musl, it shouldnt be needed but somehow STATIC_HUNSPELL is defined even tough we use --enable-system-hunspell. Test build went through on glibc and musl x86_64, this realese is already a month old and 46 has some secruity issues, I skip more testing.
This commit is contained in:
Duncaen
parent
d73ded41e2
commit
8dc53ede03
5 changed files with 41 additions and 53 deletions
11
srcpkgs/firefox/patches/disable-hunspell_hooks.patch
Normal file
11
srcpkgs/firefox/patches/disable-hunspell_hooks.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200
|
||||
+++ mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200
|
||||
@@ -54,7 +54,7 @@
|
||||
* HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in,
|
||||
* unless --enable-system-hunspell is defined.
|
||||
*/
|
||||
-#if defined(HUNSPELL_STATIC)
|
||||
+#if 0
|
||||
#include "hunspell_alloc_hooks.h"
|
||||
#include "hunspell_fopen_hooks.h"
|
||||
#endif
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- configure.orig 2015-05-29 18:30:41.474423097 +0200
|
||||
+++ configure 2015-05-29 18:30:53.451550589 +0200
|
||||
@@ -10966,8 +10966,8 @@ ac_have_llvm_pr8927="no"
|
||||
--- old-configure.orig 2015-05-29 18:30:41.474423097 +0200
|
||||
+++ old-configure 2015-05-29 18:30:53.451550589 +0200
|
||||
@@ -11311,8 +11311,8 @@ ac_have_llvm_pr8927="no"
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
|
|
@ -9,18 +9,3 @@
|
|||
+ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5'
|
||||
+ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
|
||||
--- js/src/configure.orig 2015-05-29 18:31:25.049874012 +0200
|
||||
+++ js/src/configure 2015-05-29 18:31:36.898995291 +0200
|
||||
@@ -9820,8 +9820,8 @@ ac_have_llvm_pr8927="no"
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
+ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5'
|
||||
+ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,18 @@
|
|||
--- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig 2016-07-05 21:00:03.672000517 +0200
|
||||
+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200
|
||||
@@ -1134,6 +1134,12 @@
|
||||
#ifndef __NR_fallocate
|
||||
#define __NR_fallocate 285
|
||||
#endif
|
||||
+
|
||||
+#undef __NR_pread
|
||||
+#define __NR_pread __NR_pread64
|
||||
+#undef __NR_pwrite
|
||||
+#define __NR_pwrite __NR_pwrite64
|
||||
+
|
||||
/* End of x86-64 definitions */
|
||||
#elif defined(__mips__)
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI32
|
||||
--- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000
|
||||
+++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000
|
||||
@@ -45,6 +45,7 @@
|
||||
|
|
@ -23,29 +38,16 @@
|
|||
namespace google_breakpad {
|
||||
--- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000
|
||||
+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000
|
||||
@@ -53,9 +53,10 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_A_OUT_H
|
||||
+#if 0
|
||||
#include <a.out.h>
|
||||
#endif
|
||||
+
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
#ifdef HAVE_MACH_O_NLIST_H
|
||||
#include <mach-o/nlist.h>
|
||||
-#elif defined(HAVE_A_OUT_H)
|
||||
+#elif 0
|
||||
#include <a.out.h>
|
||||
#endif
|
||||
--- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-03-15 05:19:37.000000000 +0000
|
||||
+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-04-17 10:24:33.793431933 +0000
|
||||
@@ -2813,7 +2813,7 @@
|
||||
LSS_INLINE _syscall6(void*, mmap, void*, s,
|
||||
size_t, l, int, p,
|
||||
int, f, int, d,
|
||||
- __off64_t, o)
|
||||
+ off_t, o)
|
||||
|
||||
LSS_INLINE _syscall4(int, newfstatat, int, d,
|
||||
const char *, p,
|
||||
|
||||
|
||||
--- toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000
|
||||
+++ toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000
|
||||
@@ -105,7 +105,7 @@
|
||||
|
|
|
|||
|
|
@ -1,13 +1,3 @@
|
|||
--- tools/profiler/gecko/local_debug_info_symbolizer.cc
|
||||
+++ tools/profiler/gecko/local_debug_info_symbolizer.cc
|
||||
@@ -3,6 +3,7 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include "PlatformMacros.h"
|
||||
#include "nsAutoPtr.h"
|
||||
|
||||
--- tools/profiler/core/platform.h
|
||||
+++ tools/profiler/core/platform.h
|
||||
@@ -29,6 +29,8 @@
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Template build file for 'firefox'.
|
||||
pkgname=firefox
|
||||
version=46.0.1
|
||||
revision=2
|
||||
version=47.0.1
|
||||
revision=1
|
||||
short_desc="Lightweight gecko-based web browser"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="https://www.mozilla.org/firefox/"
|
||||
license="MPL-1.1, GPL-2, LGPL-2.1"
|
||||
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
|
||||
checksum=98b8292a31b7e3e426f3204de1fed2a6ab38dcf64dd27bdfae556b407a198bf9
|
||||
checksum=5ac36c3481dde80ef2e36237badef6cb8ec5fe7e3b5ac1728839477de0cc034c
|
||||
|
||||
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
|
||||
nopie=yes
|
||||
|
|
@ -15,7 +15,7 @@ lib32disabled=yes
|
|||
build_options="gtk3"
|
||||
desc_option_gtk3="Build the GTK+3 toolkit UI"
|
||||
|
||||
hostmakedepends="unzip zip pkg-config perl python yasm"
|
||||
hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm"
|
||||
makedepends="
|
||||
nss-devel libjpeg-turbo-devel libpng-devel gtk+-devel
|
||||
icu-devel pixman-devel sqlite-devel pulseaudio-devel
|
||||
|
|
@ -35,7 +35,7 @@ pre_configure() {
|
|||
esac
|
||||
|
||||
# configure script misdetects the preprocessor without an optimization level
|
||||
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
|
||||
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' old-configure
|
||||
|
||||
# Google API key (see http://www.chromium.org/developers/how-tos/api-keys)
|
||||
# Note: This is for Void Linux use ONLY.
|
||||
|
|
|
|||
Loading…
Reference in a new issue