From e496d39130b8b3e0eb7637c917a0c88c59d40e43 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 Oct 2015 08:17:48 +0200 Subject: firefox: update to latest --- package/firefox/patches/patch-configure | 41 ---------------------- package/firefox/patches/patch-gfx_2d_Logging_h | 12 +++++++ .../patch-gfx_angle_src_common_angleutils_cpp | 12 +++---- package/firefox/patches/patch-js_src_Makefile_in | 6 ++-- .../patches/patch-media_libcubeb_src_cubeb_alsa_c | 10 ------ ...thon_mozbuild_mozbuild_backend_recursivemake_py | 11 ------ .../patch-tools_profiler_UnwinderThread2_cpp | 10 ------ .../patches/patch-tools_profiler_platform-linux_cc | 27 -------------- .../firefox/patches/patch-xpcom_ds_nsMathUtils_h | 6 ++-- .../patches/patch-xpcom_io_nsLocalFileUnix_cpp | 21 ----------- 10 files changed, 24 insertions(+), 132 deletions(-) delete mode 100644 package/firefox/patches/patch-configure create mode 100644 package/firefox/patches/patch-gfx_2d_Logging_h delete mode 100644 package/firefox/patches/patch-media_libcubeb_src_cubeb_alsa_c delete mode 100644 package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py delete mode 100644 package/firefox/patches/patch-tools_profiler_UnwinderThread2_cpp delete mode 100644 package/firefox/patches/patch-tools_profiler_platform-linux_cc delete mode 100644 package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp (limited to 'package/firefox/patches') diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure deleted file mode 100644 index 52210624e..000000000 --- a/package/firefox/patches/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ ---- mozilla-release.orig/configure 2015-01-09 05:39:04.000000000 +0100 -+++ mozilla-release/configure 2015-02-04 11:49:00.000000000 +0100 -@@ -8156,38 +8156,6 @@ EOF - - fi - --MOZ_ENABLE_PROFILER_SPS=1 -- --case "${OS_TARGET}" in --Android) -- case "${CPU_ARCH}" in -- x86 | arm) ;; -- *) -- MOZ_ENABLE_PROFILER_SPS= -- esac -- ;; --Linux) -- case "${CPU_ARCH}" in -- x86 | x86_64) ;; -- *) -- MOZ_ENABLE_PROFILER_SPS= -- esac -- ;; --WINNT|Darwin) ;; --*) -- MOZ_ENABLE_PROFILER_SPS= -- ;; --esac -- --if test -n "$MOZ_ENABLE_PROFILER_SPS"; then -- cat >> confdefs.pytmp <<\EOF -- (''' MOZ_ENABLE_PROFILER_SPS ''', ' 1 ') --EOF --cat >> confdefs.h <<\EOF --#define MOZ_ENABLE_PROFILER_SPS 1 --EOF -- --fi - - # Check whether --enable-shark or --disable-shark was given. - if test "${enable_shark+set}" = set; then diff --git a/package/firefox/patches/patch-gfx_2d_Logging_h b/package/firefox/patches/patch-gfx_2d_Logging_h new file mode 100644 index 000000000..78da23499 --- /dev/null +++ b/package/firefox/patches/patch-gfx_2d_Logging_h @@ -0,0 +1,12 @@ +--- mozilla-release.orig/gfx/2d/Logging.h 2015-10-14 23:41:53.000000000 +0200 ++++ mozilla-release/gfx/2d/Logging.h 2015-10-22 21:47:47.852599070 +0200 +@@ -11,9 +11,7 @@ + #include + #include + +-#ifdef MOZ_LOGGING + #include "mozilla/Logging.h" +-#endif + + #if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID) + #include "nsDebug.h" diff --git a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp index bcf9ac30a..3839a6551 100644 --- a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp +++ b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp @@ -1,10 +1,10 @@ ---- mozilla-release.orig/gfx/angle/src/common/angleutils.cpp 2015-01-09 05:38:28.000000000 +0100 -+++ mozilla-release/gfx/angle/src/common/angleutils.cpp 2015-02-03 04:42:10.000000000 +0100 -@@ -7,6 +7,7 @@ - #include "common/angleutils.h" - +--- mozilla-release.orig/gfx/angle/src/common/angleutils.cpp 2015-10-14 23:41:53.000000000 +0200 ++++ mozilla-release/gfx/angle/src/common/angleutils.cpp 2015-10-22 21:35:50.503893962 +0200 +@@ -8,6 +8,7 @@ + #include "debug.h" + #include #include +#include - std::string FormatString(const char *fmt, va_list vararg) + size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector& outBuffer) { diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in index b536ab3f5..b340774ee 100644 --- a/package/firefox/patches/patch-js_src_Makefile_in +++ b/package/firefox/patches/patch-js_src_Makefile_in @@ -1,6 +1,6 @@ ---- mozilla-release.orig/js/src/Makefile.in 2015-01-09 05:38:17.000000000 +0100 -+++ mozilla-release/js/src/Makefile.in 2015-01-29 17:03:28.000000000 +0100 -@@ -21,7 +21,7 @@ NO_EXPAND_LIBS = 1 +--- mozilla-release.orig/js/src/Makefile.in 2015-10-14 23:41:38.000000000 +0200 ++++ mozilla-release/js/src/Makefile.in 2015-10-22 21:35:50.515893169 +0200 +@@ -16,7 +16,7 @@ run_for_side_effects := $(shell echo 'MA ifdef JS_HAS_CTYPES ifdef MOZ_NATIVE_FFI diff --git a/package/firefox/patches/patch-media_libcubeb_src_cubeb_alsa_c b/package/firefox/patches/patch-media_libcubeb_src_cubeb_alsa_c deleted file mode 100644 index f681a127a..000000000 --- a/package/firefox/patches/patch-media_libcubeb_src_cubeb_alsa_c +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla-release.orig/media/libcubeb/src/cubeb_alsa.c 2013-09-11 01:15:15.000000000 +0200 -+++ mozilla-release/media/libcubeb/src/cubeb_alsa.c 2013-10-23 16:28:38.000000000 +0200 -@@ -5,6 +5,7 @@ - * accompanying file LICENSE for details. - */ - #undef NDEBUG -+#define _POSIX_SOURCE - #define _BSD_SOURCE - #define _XOPEN_SOURCE 500 - #include diff --git a/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py b/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py deleted file mode 100644 index 3f9aa337d..000000000 --- a/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-release.orig/python/mozbuild/mozbuild/backend/recursivemake.py 2015-01-09 05:38:28.000000000 +0100 -+++ mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py 2015-01-29 16:46:28.000000000 +0100 -@@ -940,7 +940,7 @@ INSTALL_TARGETS += %(prefix)s - def _handle_idl_manager(self, manager): - build_files = self._install_manifests['xpidl'] - -- for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done', -+ for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done', - 'xpt/.mkdir.done'): - build_files.add_optional_exists(p) - diff --git a/package/firefox/patches/patch-tools_profiler_UnwinderThread2_cpp b/package/firefox/patches/patch-tools_profiler_UnwinderThread2_cpp deleted file mode 100644 index 75c073d55..000000000 --- a/package/firefox/patches/patch-tools_profiler_UnwinderThread2_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla-release.orig/tools/profiler/UnwinderThread2.cpp 2013-09-11 01:15:26.000000000 +0200 -+++ mozilla-release/tools/profiler/UnwinderThread2.cpp 2013-10-23 16:28:38.000000000 +0200 -@@ -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 - #include - #include - #include diff --git a/package/firefox/patches/patch-tools_profiler_platform-linux_cc b/package/firefox/patches/patch-tools_profiler_platform-linux_cc deleted file mode 100644 index 96b97381b..000000000 --- a/package/firefox/patches/patch-tools_profiler_platform-linux_cc +++ /dev/null @@ -1,27 +0,0 @@ ---- mozilla-release.orig/tools/profiler/platform-linux.cc 2015-01-09 05:38:28.000000000 +0100 -+++ mozilla-release/tools/profiler/platform-linux.cc 2015-01-29 16:46:28.000000000 +0100 -@@ -57,7 +57,7 @@ - #include // open - #include // sysconf - #include --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && ! defined(__UCLIBC__) - #include // backtrace, backtrace_symbols - #endif // def __GLIBC__ - #include // index -@@ -92,14 +92,12 @@ - - #define SIGNAL_SAVE_PROFILE SIGUSR2 - --#if defined(__GLIBC__) --// glibc doesn't implement gettid(2). -+// glibc/musl doesn't implement gettid(2). - #include - pid_t gettid() - { - return (pid_t) syscall(SYS_gettid); - } --#endif - - /* static */ Thread::tid_t - Thread::GetCurrentId() diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h index 578dc64c6..a22b709eb 100644 --- a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h +++ b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h @@ -1,6 +1,6 @@ ---- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2015-01-09 05:38:29.000000000 +0100 -+++ mozilla-release/xpcom/ds/nsMathUtils.h 2015-01-29 21:37:27.000000000 +0100 -@@ -104,12 +104,16 @@ NS_finite(double aNum) +--- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2015-10-14 23:41:52.000000000 +0200 ++++ mozilla-release/xpcom/ds/nsMathUtils.h 2015-10-22 21:35:50.563890005 +0200 +@@ -105,12 +105,16 @@ NS_finite(double aNum) #ifdef WIN32 // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. return !!_finite(aNum); diff --git a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp deleted file mode 100644 index 71899d1a6..000000000 --- a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp 2015-01-09 05:38:29.000000000 +0100 -+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp 2015-01-30 14:13:49.000000000 +0100 -@@ -1407,10 +1407,18 @@ nsLocalFile::GetDiskSpaceAvailable(int64 - #endif - && dq.dqb_bhardlimit) { - int64_t QuotaSpaceAvailable = 0; -+#if defined(__UCLIBC__) -+ if (dq.dqb_bhardlimit > dq.dqb_curblocks) { -+ QuotaSpaceAvailable = -+ int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curblocks)); -+ } -+#else - if (dq.dqb_bhardlimit > dq.dqb_curspace) { - QuotaSpaceAvailable = - int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curspace)); - } -+#endif -+ - if (QuotaSpaceAvailable < *aDiskSpaceAvailable) { - *aDiskSpaceAvailable = QuotaSpaceAvailable; - } -- cgit v1.2.3