firefox: update to 42.0.

This commit is contained in:
Juan RP 2015-11-04 19:00:00 +01:00
parent 94c1f8eb91
commit 9ba7f5404d
3 changed files with 33 additions and 52 deletions

View File

@ -1,5 +1,5 @@
--- tools/profiler/local_debug_info_symbolizer.cc
+++ tools/profiler/local_debug_info_symbolizer.cc
--- 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/. */
@ -8,8 +8,8 @@
#include "PlatformMacros.h"
#include "nsAutoPtr.h"
--- tools/profiler/platform.h
+++ tools/profiler/platform.h
--- tools/profiler/core/platform.h
+++ tools/profiler/core/platform.h
@@ -29,6 +29,8 @@
#ifndef TOOLS_PLATFORM_H_
#define TOOLS_PLATFORM_H_
@ -19,8 +19,8 @@
#ifdef ANDROID
#include <android/log.h>
#else
--- tools/profiler/LulElf.cpp
+++ tools/profiler/LulElf.cpp
--- tools/profiler/lul/LulElf.cpp
+++ tools/profiler/lul/LulElf.cpp
@@ -579,10 +579,10 @@
// Return the non-directory portion of FILENAME: the portion after the
// last slash, or the whole filename if there are no slashes.
@ -36,8 +36,8 @@
return base;
}
--- tools/profiler/platform-linux.cc.orig 2015-06-11 18:39:35.689739054 +0200
+++ tools/profiler/platform-linux.cc 2015-06-11 18:40:04.479706749 +0200
--- tools/profiler/core/platform-linux.cc.orig 2015-06-11 18:39:35.689739054 +0200
+++ tools/profiler/core/platform-linux.cc 2015-06-11 18:40:04.479706749 +0200
@@ -651,11 +651,13 @@ void OS::Startup() {
void TickSample::PopulateContext(void* aContext)
{
@ -52,24 +52,31 @@
}
void OS::SleepMicro(int microseconds)
--- tools/profiler/platform-linux-lul.h 2015-08-07 17:54:21.000000000 +0200
+++ tools/profiler/platform-linux-lul.h 2015-08-13 11:35:05.321728730 +0200
@@ -16,16 +16,14 @@
void
logging_sink_for_LUL(const char* str);
--- tools/profiler/core/platform.h.orig 2015-11-04 18:27:58.170732586 +0100
+++ tools/profiler/core/platform.h 2015-11-04 18:29:11.898478051 +0100
@@ -60,9 +60,9 @@
#include "v8-support.h"
#include <vector>
-// We need a definition of gettid(), but glibc doesn't provide a
-// wrapper for it.
+// We need a definition of gettid(), but glibc nor musl don't provide a
// wrapper for it.
-#if defined(__GLIBC__)
+// We need a definition of gettid(), but neither glibc nor
+// musl libc provide a wrapper for it.
+#if defined(__linux__)
#include <unistd.h>
#include <sys/syscall.h>
static inline pid_t gettid()
{
return (pid_t) syscall(SYS_gettid);
}
-#endif
// A singleton instance of the library.
extern lul::LUL* sLUL;
--- media/libav/config_unix.h.orig 2015-11-04 18:38:46.660289503 +0100
+++ media/libav/config_unix.h 2015-11-04 18:39:38.620814879 +0100
@@ -223,7 +223,11 @@
#define HAVE_STRERROR_R 1
#define HAVE_STRPTIME 1
#define HAVE_SYSCONF 1
+#if !defined(__linux__) || defined(__GLIBC__)
#define HAVE_SYSCTL 1
+#else
+#define HAVE_SYSCTL 0
+#endif
#define HAVE_USLEEP 1
#define HAVE_VIRTUALALLOC 0
#define HAVE_PTHREADS 0

View File

@ -1,25 +0,0 @@
--- dom/system/OSFileConstants.cpp.orig 2013-04-17 06:17:29.798371189 +0000
+++ dom/system/OSFileConstants.cpp 2013-04-17 06:30:30.032285977 +0000
@@ -509,6 +509,11 @@
INT_CONSTANT(_STAT_VER),
#endif // defined(_STAT_VER)
+ // glibc's stat/lstat/fstat are macros while uclibc's are not
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ { "OSFILE_STAT_MACROS", INT_TO_JSVAL(1) },
+#endif // defined(stat)
+
PROP_END
};
--- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2014-04-03 13:08:26.686409787 +0000
+++ toolkit/components/osfile/modules/osfile_unix_back.jsm 2014-04-03 13:34:14.101716259 +0000
@@ -512,7 +512,7 @@
/*path*/ Type.fd,
/*buf*/ Type.stat.out_ptr
);
- } else if (Const._STAT_VER != undefined) {
+ } else if (Const.OSFILE_STAT_MACROS != undefined) {
const ver = Const._STAT_VER;
let xstat_name, lxstat_name, fxstat_name;
if (OS.Constants.Sys.Name == "SunOS") {

View File

@ -1,14 +1,13 @@
# Template build file for 'firefox'.
pkgname=firefox
version=41.0.2
version=42.0
revision=1
wrksrc="mozilla-release"
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=ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e
checksum=994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
lib32disabled=yes
@ -19,7 +18,7 @@ makedepends="nss-devel libjpeg-turbo-devel libpng-devel
startup-notification-devel dbus-glib-devel alsa-lib-devel pulseaudio-devel
hunspell-devel libXcomposite-devel libSM-devel libXScrnSaver-devel
libXt-devel libXdamage-devel"
depends="desktop-file-utils hicolor-icon-theme"
depends="nss>=3.20.1 desktop-file-utils hicolor-icon-theme"
conflicts="firefox-esr>=0"
pre_configure() {