Merge branch 'master' of git+ssh://openadk.org/git/openadk

22 files changed, 609 insertions, 428 deletions

diff --git a/package/alsa-lib/patches/patch-libtool b/package/alsa-lib/patches/patch-libtool
new file mode 100644
index 000000000..7879d575a
--- /dev/null
+++ b/package/alsa-lib/patches/patch-libtool
@@ -0,0 +1,177 @@
+--- alsa-lib-1.0.27.2.orig/libtool	2013-07-08 14:32:53.000000000 +0200
++++ alsa-lib-1.0.27.2/libtool	2013-12-30 17:42:30.000000000 +0100
+@@ -1,8 +1,8 @@
+-#! /bin/sh
++#! /bin/bash
+ 
+ # libtool - Provide generalized library-building support services.
+ # Generated automatically by config.status (alsa-lib) 1.0.27.2
+-# Libtool was configured on host alsa.alsa-project.org:
++# Libtool was configured on host helium:
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+@@ -40,7 +40,7 @@ available_tags=""
+ # ### BEGIN LIBTOOL CONFIG
+ 
+ # Whether or not to build static libraries.
+-build_old_libs=no
++build_old_libs=yes
+ 
+ # Which release of libtool.m4 was used?
+ macro_version=2.4.2
+@@ -56,7 +56,7 @@ pic_mode=default
+ fast_install=yes
+ 
+ # Shell to use when invoking shell scripts.
+-SHELL="/bin/sh"
++SHELL="/bin/bash"
+ 
+ # An echo program that protects backslashes.
+ ECHO="printf %s\\n"
+@@ -65,38 +65,38 @@ ECHO="printf %s\\n"
+ PATH_SEPARATOR=":"
+ 
+ # The host system.
+-host_alias=
+-host=x86_64-unknown-linux-gnu
++host_alias=i686-openadk-linux
++host=i686-openadk-linux-gnu
+ host_os=linux-gnu
+ 
+ # The build system.
+-build_alias=
+-build=x86_64-unknown-linux-gnu
++build_alias=x86_64-linux-gnu
++build=x86_64-pc-linux-gnu
+ build_os=linux-gnu
+ 
+ # A sed program that does not truncate output.
+-SED="/usr/bin/sed"
++SED="/home/wbx/ibmx40/scripts/sed"
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+ Xsed="$SED -e 1s/^X//"
+ 
+ # A grep program that handles long lines.
+-GREP="/usr/bin/grep"
++GREP="/bin/grep"
+ 
+ # An ERE matcher.
+-EGREP="/usr/bin/grep -E"
++EGREP="/bin/grep -E"
+ 
+ # A literal string matcher.
+-FGREP="/usr/bin/grep -F"
++FGREP="/bin/grep -F"
+ 
+ # A BSD- or MS-compatible name lister.
+-NM="/usr/bin/nm -B"
++NM="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-nm"
+ 
+ # Whether we need soft or hard links.
+ LN_S="ln -s"
+ 
+ # What is the maximum length of a command?
+-max_cmd_len=1572864
++max_cmd_len=3458764513820540925
+ 
+ # Object file suffix (normally "o").
+ objext=o
+@@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop
+ to_tool_file_cmd=func_convert_file_noop
+ 
+ # An object symbol dumper.
+-OBJDUMP="objdump"
++OBJDUMP="i686-openadk-linux-objdump"
+ 
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method="pass_all"
+@@ -141,7 +141,7 @@ DLLTOOL="false"
+ sharedlib_from_linklib_cmd="printf %s\\n"
+ 
+ # The archiver.
+-AR="ar"
++AR="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ar"
+ 
+ # Flags to create an archive.
+ AR_FLAGS="cru"
+@@ -150,10 +150,10 @@ AR_FLAGS="cru"
+ archiver_list_spec="@"
+ 
+ # A symbol stripping program.
+-STRIP="strip"
++STRIP="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip"
+ 
+ # Commands used to install an old-style archive.
+-RANLIB="ranlib"
++RANLIB="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ranlib"
+ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib"
+ old_postuninstall_cmds=""
+ 
+@@ -161,10 +161,10 @@ old_postuninstall_cmds=""
+ lock_old_archive_extraction=no
+ 
+ # A C compiler.
+-LTCC="gcc"
++LTCC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc"
+ 
+ # LTCC compiler flags.
+-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE"
++LTCFLAGS="-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -D_GNU_SOURCE"
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+ global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
+@@ -272,27 +272,27 @@ finish_eval=""
+ hardcode_into_libs=yes
+ 
+ # Compile-time system search path for libraries.
+-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.2 /usr/lib64 /lib64 "
++sys_lib_search_path_spec="/home/wbx/ibmx40/host_i686_musl_musl/lib/gcc/i686-openadk-linux-musl/4.7.3 /home/wbx/ibmx40/host_i686_musl_musl/i686-openadk-linux-musl/lib /home/wbx/ibmx40/target_i686_musl_musl/lib /home/wbx/ibmx40/target_i686_musl_musl/usr/lib "
+ 
+ # Run-time system search path for libraries.
+-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/mysql /usr/lib64/qt-3.3/lib "
++sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu "
+ 
+ # Whether dlopen is supported.
+ dlopen_support=yes
+ 
+ # Whether dlopen of programs is supported.
+-dlopen_self=yes
++dlopen_self=unknown
+ 
+ # Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=yes
++dlopen_self_static=unknown
+ 
+ # Commands to strip libraries.
+-old_striplib="strip --strip-debug"
+-striplib="strip --strip-unneeded"
++old_striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-debug"
++striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-unneeded"
+ 
+ 
+ # The linker used to build libraries.
+-LD="/usr/bin/ld -m elf_x86_64"
++LD="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ld"
+ 
+ # How to create reloadable object files.
+ reload_flag=" -r"
+@@ -302,7 +302,7 @@ reload_cmds="\$LD\$reload_flag -o \$outp
+ old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
+ 
+ # A language specific compiler.
+-CC="gcc"
++CC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc"
+ 
+ # Is the compiler the GNU compiler?
+ with_gcc=yes
+@@ -317,7 +317,7 @@ pic_flag=" -fPIC -DPIC"
+ wl="-Wl,"
+ 
+ # Compiler flag to prevent dynamic linking.
+-link_static_flag=""
++link_static_flag="-static"
+ 
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o="yes"
diff --git a/package/alsa-lib/patches/patch-utils_alsa_pc_in b/package/alsa-lib/patches/patch-utils_alsa_pc_in
new file mode 100644
index 000000000..d04f80248
--- /dev/null
+++ b/package/alsa-lib/patches/patch-utils_alsa_pc_in
@@ -0,0 +1,12 @@
+--- alsa-lib-1.0.27.2.orig/utils/alsa.pc.in	2013-07-08 14:31:36.000000000 +0200
++++ alsa-lib-1.0.27.2/utils/alsa.pc.in	2014-01-01 17:07:29.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: alsa
+ Description: Advanced Linux Sound Architecture (ALSA) - Library
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)
  
diff --git a/package/libXft/patches/patch-src_xftglyphs_c b/package/libXft/patches/patch-src_xftglyphs_c
index 54457857f..c8da32ca4 100644
--- a/package/libXft/patches/patch-src_xftglyphs_c
+++ b/package/libXft/patches/patch-src_xftglyphs_c
@@ -1,16 +1,17 @@
 --- libXft-2.3.1.orig/src/xftglyphs.c	2012-06-02 18:36:35.000000000 +0200
-+++ libXft-2.3.1/src/xftglyphs.c	2013-12-07 12:17:23.000000000 +0100
++++ libXft-2.3.1/src/xftglyphs.c	2014-01-02 14:41:02.000000000 +0100
 @@ -21,10 +21,10 @@
   */
  
  #include "xftint.h"
 -#include <freetype/ftoutln.h>
 -#include <freetype/ftlcdfil.h>
-+#include <ftoutln.h>
-+#include <ftlcdfil.h>
- 
+-
 -#include <freetype/ftsynth.h>
-+#include <ftsynth.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
++#include FT_SYNTHESIS_H
  
  /*
   * Validate the memory info for a font
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 1d43a4998..ea4c3a1f8 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libpng
-PKG_VERSION:=		1.5.15
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		ea24254980fd820964a710e4d2a947c7
+PKG_VERSION:=		1.6.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		29b7065906e2551508a0d7eacd19174e
 PKG_DESCR:=		A library for reading/writing PNG images
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
diff --git a/package/libpng/patches/libpng-1.5.15-apng.patch b/package/libpng/patches/libpng-1.6.8-apng.patch
index b169303e9..02cf32620 100644
--- a/package/libpng/patches/libpng-1.5.15-apng.patch
+++ b/package/libpng/patches/libpng-1.6.8-apng.patch
@@ -1,7 +1,7 @@
-diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h
---- libpng-1.5.15.org/png.h	2013-04-02 20:39:30.000000000 +0900
-+++ libpng-1.5.15/png.h	2013-04-02 20:39:30.000000000 +0900
-@@ -448,6 +448,10 @@
+diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
+--- libpng-1.6.8.org/png.h	2013-12-22 17:03:17.220988502 +0900
++++ libpng-1.6.8/png.h	2013-12-22 17:03:17.287990651 +0900
+@@ -451,6 +451,10 @@
  #   include "pnglibconf.h"
  #endif
  
@@ -10,9 +10,9 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h
 +#define PNG_WRITE_APNG_SUPPORTED
 +
  #ifndef PNG_VERSION_INFO_ONLY
- #  ifndef PNG_BUILDING_SYMBOL_TABLE
-   /*
-@@ -555,6 +559,17 @@
+    /* Machine specific configuration. */
+ #  include "pngconf.h"
+@@ -541,6 +545,17 @@
   * See pngconf.h for base types that vary by machine/system
   */
  
@@ -30,7 +30,7 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h
  /* This triggers a compiler error in png.c, if png.c and png.h
   * do not agree upon the version number.
   */
-@@ -838,6 +853,10 @@
+@@ -861,6 +876,10 @@
  #define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
  #define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
  #define PNG_INFO_IDAT 0x8000   /* ESR, 1.0.6 */
@@ -41,7 +41,7 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h
  
  /* This is used for the transformation routines, as some of them
   * change these values for the row.  It also should enable using
-@@ -883,6 +902,10 @@
+@@ -898,6 +917,10 @@
  #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
  typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
  typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
@@ -52,97 +52,97 @@ diff -Naru libpng-1.5.15.org/png.h libpng-1.5.15/png.h
  
  /* The following callback receives png_uint_32 row_number, int pass for the
   * png_bytep data of the row.  When transforming an interlaced image the
-@@ -2702,6 +2725,74 @@
+@@ -3300,6 +3323,74 @@
  /*******************************************************************************
   *  END OF HARDWARE OPTIONS
   ******************************************************************************/
 +#ifdef PNG_APNG_SUPPORTED
-+PNG_EXPORT(237, png_uint_32, png_get_acTL, (png_structp png_ptr,
++PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr,
 +   png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
 +
-+PNG_EXPORT(238, png_uint_32, png_set_acTL, (png_structp png_ptr,
++PNG_EXPORT(246, png_uint_32, png_set_acTL, (png_structp png_ptr,
 +   png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
 +
-+PNG_EXPORT(239, png_uint_32, png_get_num_frames, (png_structp png_ptr,
++PNG_EXPORT(247, png_uint_32, png_get_num_frames, (png_structp png_ptr,
 +   png_infop info_ptr));
 +
-+PNG_EXPORT(240, png_uint_32, png_get_num_plays, (png_structp png_ptr,
++PNG_EXPORT(248, png_uint_32, png_get_num_plays, (png_structp png_ptr,
 +   png_infop info_ptr));
 +
-+PNG_EXPORT(241, png_uint_32, png_get_next_frame_fcTL,
++PNG_EXPORT(249, png_uint_32, png_get_next_frame_fcTL,
 +   (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
 +   png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
 +   png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
 +   png_byte *blend_op));
 +
-+PNG_EXPORT(242, png_uint_32, png_set_next_frame_fcTL,
++PNG_EXPORT(250, png_uint_32, png_set_next_frame_fcTL,
 +   (png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
 +   png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
 +   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
 +   png_byte blend_op));
 +
-+PNG_EXPORT(243, png_uint_32, png_get_next_frame_width,
++PNG_EXPORT(251, png_uint_32, png_get_next_frame_width,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(244, png_uint_32, png_get_next_frame_height,
++PNG_EXPORT(252, png_uint_32, png_get_next_frame_height,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(245, png_uint_32, png_get_next_frame_x_offset,
++PNG_EXPORT(253, png_uint_32, png_get_next_frame_x_offset,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(246, png_uint_32, png_get_next_frame_y_offset,
++PNG_EXPORT(254, png_uint_32, png_get_next_frame_y_offset,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(247, png_uint_16, png_get_next_frame_delay_num,
++PNG_EXPORT(255, png_uint_16, png_get_next_frame_delay_num,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(248, png_uint_16, png_get_next_frame_delay_den,
++PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_den,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(249, png_byte, png_get_next_frame_dispose_op,
++PNG_EXPORT(257, png_byte, png_get_next_frame_dispose_op,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(250, png_byte, png_get_next_frame_blend_op,
++PNG_EXPORT(258, png_byte, png_get_next_frame_blend_op,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(251, png_byte, png_get_first_frame_i