diff --git a/srcpkgs/firefox/patches/fix-ipc.patch b/srcpkgs/firefox/patches/fix-ipc.patch deleted file mode 100644 index ba936756620..00000000000 --- a/srcpkgs/firefox/patches/fix-ipc.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- ipc/chromium/src/base/file_util.h -+++ ipc/chromium/src/base/file_util.h -@@ -14,10 +14,15 @@ - #include - #elif defined(ANDROID) - #include -+#define NO_FTS - #elif defined(OS_POSIX) - #include --#include - #include -+#ifdef __GLIBC__ -+#include -+#else -+#define NO_FTS -+#endif - #endif - - #include ---- ipc/chromium/src/base/file_util_posix.cc -+++ ipc/chromium/src/base/file_util_posix.cc -@@ -8,13 +8,13 @@ - #include - #include - #include --#ifndef ANDROID -+#ifndef NO_FTS - #include - #endif - #include - #include - #include --#include -+#include - #include - #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures - #include -@@ -67,7 +67,7 @@ - if (!recursive) - return (rmdir(path_str) == 0); - --#ifdef ANDROID -+#ifdef NO_FTS - // XXX Need ftsless impl for bionic - return false; - #else -@@ -140,7 +140,7 @@ - return false; - } - --#ifdef ANDROID -+#ifdef NO_FTS - // XXX Need ftsless impl for bionic - return false; - #else diff --git a/srcpkgs/firefox/patches/fix-toolkit.patch b/srcpkgs/firefox/patches/fix-toolkit.patch index a360db4db3b..b5575335374 100644 --- a/srcpkgs/firefox/patches/fix-toolkit.patch +++ b/srcpkgs/firefox/patches/fix-toolkit.patch @@ -75,70 +75,3 @@ return rv; } ---- toolkit.orig/xre/nsSigHandlers.cpp 2014-03-15 05:19:38.000000000 +0000 -+++ toolkit/xre/nsSigHandlers.cpp 2014-04-17 10:24:33.796765327 +0000 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include "prthread.h" - #include "plstr.h" - #include "prenv.h" -@@ -152,7 +153,7 @@ - status->__invalid = status->__denorm = status->__zdiv = status->__ovrfl = status->__undfl = - status->__precis = status->__stkflt = status->__errsumm = 0; - -- __uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; -+ u_int32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; - *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ - *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ - #endif -@@ -172,13 +173,13 @@ - *sw &= ~FPU_STATUS_FLAGS; - #endif - #if defined(__amd64__) -- __uint16_t *cw = &uc->uc_mcontext.fpregs->cwd; -+ u_int16_t *cw = &uc->uc_mcontext.fpregs->cwd; - *cw |= FPU_EXCEPTION_MASK; - -- __uint16_t *sw = &uc->uc_mcontext.fpregs->swd; -+ u_int16_t *sw = &uc->uc_mcontext.fpregs->swd; - *sw &= ~FPU_STATUS_FLAGS; - -- __uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; -+ u_int32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; - *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ - *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ - #endif -@@ -187,24 +188,24 @@ - ucontext_t *uc = (ucontext_t *)context; - - #if defined(__i386) -- uint32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; -+ u_int32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; - *cw |= FPU_EXCEPTION_MASK; - -- uint32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; -+ u_int32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; - *sw &= ~FPU_STATUS_FLAGS; - - /* address of the instruction that caused the exception */ -- uint32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; -+ u_int32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; - uc->uc_mcontext.gregs[REG_PC] = *ip; - #endif - #if defined(__amd64__) -- uint16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; -+ u_int16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; - *cw |= FPU_EXCEPTION_MASK; - -- uint16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; -+ u_int16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; - *sw &= ~FPU_STATUS_FLAGS; - -- uint32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; -+ u_int32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; - *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ - *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ - #endif diff --git a/srcpkgs/firefox/patches/fix-tools.patch b/srcpkgs/firefox/patches/fix-tools.patch index d057b96d709..3552f5c5ff0 100644 --- a/srcpkgs/firefox/patches/fix-tools.patch +++ b/srcpkgs/firefox/patches/fix-tools.patch @@ -8,17 +8,6 @@ #include "PlatformMacros.h" #include "nsAutoPtr.h" ---- tools/profiler/platform-linux.cc -+++ tools/profiler/platform-linux.cc -@@ -84,7 +84,7 @@ - - #define SIGNAL_SAVE_PROFILE SIGUSR2 - --#if defined(__GLIBC__) -+#if 1 - // glibc doesn't implement gettid(2). - #include - pid_t gettid() --- tools/profiler/platform.h +++ tools/profiler/platform.h @@ -29,6 +29,8 @@ @@ -63,3 +52,24 @@ } 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); + +-// We need a definition of gettid(), but glibc doesn'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. + #include + #include + static inline pid_t gettid() + { + return (pid_t) syscall(SYS_gettid); + } +-#endif + + // A singleton instance of the library. + extern lul::LUL* sLUL; diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 67c2f8e39c3..914e6005e3f 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,6 +1,6 @@ # Template build file for 'firefox'. pkgname=firefox -version=39.0.3 +version=40.0.2 revision=1 wrksrc="mozilla-release" short_desc="Lightweight gecko-based web browser" @@ -8,7 +8,7 @@ maintainer="Juan RP " 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.bz2" -checksum=8c16df4ce94b30f1308655f9ed6ac3e76aaa2eb3643739b9263226c086d0177b +checksum=057dd75d6fb4fd264cd175788518d458cb7792fd905a6fa450968526305121fd lib32disabled=yes