update firefox and dependencies

13 files changed, 89 insertions, 84 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 69df75db1..f1764e14f 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		24.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		06a4c0fe8d3a979aea2fce8d0fdbf328
+PKG_VERSION:=		26.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		91ce51cc6474f1269484e5327643a59c
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
index 137efacd8..5f7e30a10 100644
--- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h
@@ -1,23 +1,10 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.h	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util.h	2013-10-23 16:28:38.000000000 +0200
-@@ -16,7 +16,11 @@
+--- mozilla-release.orig/ipc/chromium/src/base/file_util.h	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/ipc/chromium/src/base/file_util.h	2014-01-02 15:01:42.000000000 +0100
+@@ -16,7 +16,6 @@
  #include <sys/stat.h>
  #elif defined(OS_POSIX) 
  #include <sys/types.h>
-+#ifndef __GLIBC__
-+#define NO_FTS
-+#else
- #include <fts.h>
-+#endif
+-#include <fts.h>
  #include <sys/stat.h>
  #endif
  
-@@ -466,7 +470,7 @@ class FileEnumerator {
- #if defined(OS_WIN)
-   WIN32_FIND_DATA find_data_;
-   HANDLE find_handle_;
--#elif defined(ANDROID)
-+#elif defined(NO_FTS)
-   void *fts_;
- #elif defined(OS_POSIX)
-   FTS* fts_;
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc
index 6721e44f8..7680a29c4 100644
--- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc
@@ -1,5 +1,5 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc	2013-10-23 16:28:38.000000000 +0200
+--- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc	2014-01-02 14:53:44.000000000 +0100
 @@ -8,13 +8,16 @@
  #include <errno.h>
  #include <fcntl.h>
@@ -19,7 +19,7 @@
  #include <sys/mman.h>
  #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
  #include <sys/stat.h>
-@@ -121,7 +124,7 @@ bool Delete(const FilePath& path, bool r
+@@ -67,7 +70,7 @@ bool Delete(const FilePath& path, bool r
    if (!recursive)
      return (rmdir(path_str) == 0);
  
@@ -28,7 +28,7 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -194,7 +197,7 @@ bool CopyDirectory(const FilePath& from_
+@@ -140,7 +143,7 @@ bool CopyDirectory(const FilePath& from_
      return false;
    }
  
@@ -37,7 +37,7 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -415,7 +418,7 @@ bool CreateNewTempDirectory(const FilePa
+@@ -333,7 +336,7 @@ bool CreateNewTempDirectory(const FilePa
      return false;
    tmpdir = tmpdir.Append(kTempFileName);
    std::string tmpdir_string = tmpdir.value();
@@ -46,30 +46,3 @@
    char* dtemp = NULL;
  #else
    // this should be OK since mkdtemp just replaces characters in place
-@@ -613,7 +616,7 @@ FileEnumerator::FileEnumerator(const Fil
- }
- 
- FileEnumerator::~FileEnumerator() {
--#ifndef ANDROID
-+#ifndef NO_FTS
-   if (fts_)
-     fts_close(fts_);
- #endif
-@@ -625,7 +628,7 @@ void FileEnumerator::GetFindInfo(FindInf
-   if (!is_in_find_op_)
-     return;
- 
--#ifndef ANDROID
-+#ifndef NO_FTS
-   memcpy(&(info->stat), fts_ent_->fts_statp, sizeof(info->stat));
-   info->filename.assign(fts_ent_->fts_name);
- #endif
-@@ -636,7 +639,7 @@ void FileEnumerator::GetFindInfo(FindInf
- // large directories with many files this can be quite deep.
- // TODO(erikkay) - get rid of this recursive pattern
- FilePath FileEnumerator::Next() {
--#ifdef ANDROID
-+#ifdef NO_FTS
-   return FilePath();
- #else
-   if (!is_in_find_op_) {
diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in
index cb1b863f9..d4acee98c 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	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/js/src/Makefile.in	2013-10-14 12:36:25.000000000 +0200
-@@ -112,7 +112,7 @@ ifdef JS_HAS_CTYPES
+--- mozilla-release.orig/js/src/Makefile.in	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/js/src/Makefile.in	2014-01-02 14:53:44.000000000 +0100
+@@ -103,7 +103,7 @@ ifdef JS_HAS_CTYPES
  VPATH += $(srcdir)/ctypes
  
  ifdef MOZ_NATIVE_FFI
diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
index be14ca662..bf6c335de 100644
--- a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
+++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
@@ -1,11 +1,33 @@
---- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-09-11 01:15:16.000000000 +0200
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-10 13:18:17.000000000 +0100
-@@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id:
+--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2014-01-03 13:06:22.000000000 +0100
+@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id:
+ #undef __unused
+ #include <linux/sysctl.h>
+ #endif
++#if defined(__GLIBC__)
+ #include <net/if.h>
++#endif
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
+@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id:
  #include <net/if_dl.h>
  #include <net/if_types.h>
  #include <sys/sockio.h>
 -#else
-+#elif __GLIBC__
++#elif defined(__GLIBC__)
+ #include <linux/sockios.h>
  #include <linux/if.h>
+ #include <linux/kernel.h>
+ #include <linux/wireless.h>
+-#ifndef ANDROID
+ #include <linux/ethtool.h>
+-#endif
++#else
++#include <linux/sockios.h>
++#include <linux/kernel.h>
++#include <linux/wireless.h>
++#include <linux/ethtool.h>
  #endif
  #include <net/route.h>
+ 
diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h
new file mode 100644
index 000000000..7877d65cc
--- /dev/null
+++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h
@@ -0,0 +1,12 @@
+--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/stun.h	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h	2014-01-03 17:19:05.000000000 +0100
+@@ -39,7 +39,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #else
+ #include <sys/param.h>
+ #include <sys/socket.h>
++#if defined(__GLIBC__)
+ #include <net/if.h>
++#endif
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
index 6083460c5..3ee2e0fdc 100644
--- a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
+++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
@@ -1,23 +1,23 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-09-11 01:15:18.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-10-15 12:21:59.000000000 +0200
-@@ -38,11 +38,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-12-05 17:07:50.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2014-01-02 14:58:37.000000000 +0100
+@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
      WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                   "Available number of cores:%d", number_of_cores_);
  
 -#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
--    number_of_cores_ = get_nprocs();
+-    number_of_cores_ = static_cast<uint32_t>(sysconf(_SC_NPROCESSORS_ONLN));
 -    WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
 -                 "Available number of cores:%d", number_of_cores_);
 -
  #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
      int name[] = {
        CTL_HW,
-@@ -63,8 +58,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
                     "Failed to get number of cores");
        number_of_cores_ = 1;
      }
 -#elif defined(_SC_NPROCESSORS_ONLN)
--    _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN);
+-    number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN);
  #else
      WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1,
                   "No function to get number of cores");
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
index 7c262e5ff..ac1d23267 100644
--- a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
+++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
@@ -1,8 +1,8 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-09-11 01:15:18.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-10-15 16:05:38.000000000 +0200
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-12-05 17:07:50.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2014-01-02 14:53:44.000000000 +0100
 @@ -21,6 +21,11 @@ Scott McMurray
- #include "constants.hpp"

- #include <cstring>

+ #include <vector>

+ #include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"

  

 +#include <features.h>

 +#if defined(__UCLIBC__)

diff --git a/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py b/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py
new file mode 100644
index 000000000..30f5edd57
--- /dev/null
+++ b/package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py
@@ -0,0 +1,11 @@
+--- mozilla-release.orig/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-05 17:07:53.000000000 +0100
++++ mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py	2014-01-04 17:58:26.000000000 +0100
+@@ -421,7 +421,7 @@ class RecursiveMakeBackend(CommonBackend
+     def _handle_idl_manager(self, manager):
+         build_files = self._purge_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(p)
+ 
diff --git a/package/firefox/patches/patch-tools_profiler_platform-linux_cc b/package/firefox/patches/patch-tools_profiler_platform-linux_cc
index 7e9a44eba..a331e87fe 100644
--- a/package/firefox/patches/patch-tools_profiler_platform-linux_cc
+++ b/package/firefox/patches/patch-tools_profiler_platform-linux_cc
@@ -1,15 +1,15 @@
---- mozilla-release.orig/tools/profiler/platform-linux.cc	2013-09-11 01:15:26.000000000 +0200
-+++ mozilla-release/tools/profiler/platform-linux.cc	2013-10-23 16:28:38.000000000 +0200
-@@ -53,7 +53,7 @@
- #include <sys/stat.h>   // open
+--- mozilla-release.orig/tools/profiler/platform-linux.cc	2013-12-05 17:07:58.000000000 +0100
++++ mozilla-release/tools/profiler/platform-linux.cc	2014-01-02 14:59:20.000000000 +0100
+@@ -58,7 +58,7 @@
  #include <fcntl.h>      // open
  #include <unistd.h>     // sysconf
+ #include <semaphore.h>
 -#ifdef __GLIBC__
 +#if defined(__GLIBC__) && ! defined(__UCLIBC__)
  #include <execinfo.h>   // backtrace, backtrace_symbols
  #endif  // def __GLIBC__
  #include <strings.h>    // index
-@@ -73,14 +73,12 @@
+@@ -84,14 +84,12 @@
  
  #define SIGNAL_SAVE_PROFILE SIGUSR2
  
diff --git a/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc b/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc
index 8ffa06228..40b8b594d 100644
--- a/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc
+++ b/package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc
@@ -1,11 +1,11 @@
---- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc	2013-09-11 01:15:26.000000000 +0200
-+++ mozilla-release/tools/profiler/shared-libraries-linux.cc	2013-10-23 16:28:38.000000000 +0200
+--- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc	2013-12-05 17:07:58.000000000 +0100
++++ mozilla-release/tools/profiler/shared-libraries-linux.cc	2014-01-02 15:00:00.000000000 +0100
 @@ -14,7 +14,7 @@
  #include "platform.h"
  #include "shared-libraries.h"
  
--#ifndef __GLIBC__
+-#if !defined(__GLIBC__) && ANDROID_VERSION < 18
 +#if 0
- /* a crapy version of getline, because it's not included in bionic */
+ /* a crapy version of getline, because it's not included in old bionics */
  static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
  {
diff --git a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
index e9c2a28ad..868ad69d4 100644
--- a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
+++ b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
@@ -1,6 +1,6 @@
---- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2013-09-11 01:15:27.000000000 +0200
-+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2013-10-14 14:33:08.000000000 +0200
-@@ -1256,8 +1256,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
+--- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2013-12-05 17:08:00.000000000 +0100
++++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2014-01-02 14:53:47.000000000 +0100
+@@ -1234,8 +1234,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
         && dq.dqb_bhardlimit)
      {
          int64_t QuotaSpaceAvailable = 0;
diff --git a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
index eb7d1f21a..0f40d736a 100644
--- a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
+++ b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
@@ -1,6 +1,6 @@
---- mozilla-release.orig/xpcom/threads/nsThread.cpp	2013-09-11 01:15:27.000000000 +0200
-+++ mozilla-release/xpcom/threads/nsThread.cpp	2013-10-14 15:49:25.000000000 +0200
-@@ -20,11 +20,13 @@
+--- mozilla-release.orig/xpcom/threads/nsThread.cpp	2013-12-05 17:08:00.000000000 +0100
++++ mozilla-release/xpcom/threads/nsThread.cpp	2014-01-02 14:53:47.000000000 +0100
+@@ -23,11 +23,13 @@
                        _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
                        !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)