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

21 files changed, 38 insertions, 315 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index bf3f7d8cb..621f46e45 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,17 +4,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		5.0.1
+PKG_VERSION:=		24.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6d1f43e402cec84459a3d7f950bd5192
+PKG_MD5SUM:=		06a4c0fe8d3a979aea2fce8d0fdbf328
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libxcursor libffi
-PKG_DEPENDS+=		nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
-PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl librt libgcc
-PKG_DEPENDS+=		harfbuzz
-PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
-PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme
+PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
+PKG_DEPENDS+=		nspr nss libjpeg-turbo libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
+PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt libgcc
+PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates
+PKG_BUILDDEP:=		alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
+PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
+PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_NOPARALLEL:=	1
@@ -31,6 +32,13 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_DEBUG),y)
+CONFIGURE_ARGS+=	--enable-debug --enable-logging
+else
+CONFIGURE_ARGS+=	--disable-debug --disable-logging
+endif
+
+
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_CC="${CC_FOR_BUILD}" \
 			HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
@@ -45,27 +53,36 @@ CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			ac_cv_sqlite_secure_delete=yes \
 			ac_cv_sqlite_threadsafe=yes \
 			ac_cv_sqlite_enable_fts3=yes \
-			ac_cv_sqlite_enable_unlock_notify=yes \
-			ac_cv_thread_keyword=no \
-			ac_cv_sizeof_int_p=4
+			ac_cv_sqlite_enable_unlock_notify=yes
 CONFIGURE_ARGS+=	--enable-application=browser \
 			--enable-official-branding \
 			--with-system-zlib \
+			--with-system-bz2 \
+			--with-system-png \
 			--with-system-cairo \
 			--with-system-pixman \
 			--with-system-jpeg \
 			--with-system-nss \
 			--with-system-nspr \
+			--with-system-pango \
+			--with-system-libvpx \
+			--enable-system-ffi \
 			--enable-system-sqlite \
+			--disable-libnotify \
 			--with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-glib-prefix=${STAGING_TARGET_DIR}/usr \
+			--enable-chrome-format=jar \
+			--enable-necko-protocols=all \
 			--enable-libxul \
-			--disable-libnotify \
+			--enable-alsa \
+			--disable-pulseaudio \
+			--disable-gstreamer \
+			--disable-gio \
+			--disable-gconf \
 			--disable-accessibility \
 			--disable-smil \
 			--disable-dbus \
-			--disable-debug \
-			--disable-logging \
+			--disable-gamepad \
 			--disable-strip \
 			--disable-install-strip \
 			--disable-tests \
@@ -73,6 +90,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-static \
 			--disable-gnomeui \
 			--disable-gnomevfs \
+			--disable-gstreamer \
 			--disable-optimize \
 			--disable-necko-wifi \
 			--disable-svg \
@@ -80,14 +98,18 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-jemalloc \
 			--disable-crashreporter \
 			--disable-updater \
-			--disable-libjpeg-turbo \
 			--disable-xpcom-fastload \
-			--disable-elf-hack
+			--disable-url-classifier \
+			--disable-safe-browsing \
+			--disable-elf-hack 
 
 TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
 XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
+pre-build:
+	-mkdir ${WRKBUILD}/js/src/.deps
+
 firefox-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
deleted file mode 100644
index e996423f4..000000000
--- a/package/firefox/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla-release.orig/configure	2011-07-08 03:30:27.000000000 +0200
-+++ mozilla-release/configure	2013-04-04 16:11:25.000000000 +0200
-@@ -12617,7 +12617,7 @@ fi
- 
- if test "x$ac_cv_va_val_copy" = "xno"; then
-    cat >> confdefs.h <<\EOF
--#define HAVE_VA_LIST_AS_ARRAY 1
-+#define HAVE_VA_LIST_AS_ARRAY 0
- EOF
- 
- fi
-@@ -23504,6 +23504,9 @@ fi
-     fi
- fi
- 
-+HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags`
-+HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs`
-+
- if test -n "$CROSS_COMPILE"; then
-     case "$target" in
-     *-mingw*)
diff --git a/package/firefox/patches/patch-content_base_public_nsContentUtils_h b/package/firefox/patches/patch-content_base_public_nsContentUtils_h
deleted file mode 100644
index 7f4a8f0dd..000000000
--- a/package/firefox/patches/patch-content_base_public_nsContentUtils_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/content/base/public/nsContentUtils.h	2011-07-08 03:15:15.000000000 +0200
-+++ mozilla-release/content/base/public/nsContentUtils.h	2011-07-29 15:50:34.000000000 +0200
-@@ -1928,7 +1928,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini
- #ifdef WIN32
-   return _finite(f);
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
diff --git a/package/firefox/patches/patch-content_media_nsAudioStream_cpp b/package/firefox/patches/patch-content_media_nsAudioStream_cpp
deleted file mode 100644
index 23525db87..000000000
--- a/package/firefox/patches/patch-content_media_nsAudioStream_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/content/media/nsAudioStream.cpp	2011-07-08 03:15:16.000000000 +0200
-+++ mozilla-release/content/media/nsAudioStream.cpp	2011-07-29 15:50:34.000000000 +0200
-@@ -566,7 +566,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOff
- #if defined(XP_WIN)
-   positionType = SA_POSITION_WRITE_HARDWARE;
- #endif
--  PRInt64 position = 0;
-+  int64_t position = 0;
-   if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
-                              positionType, &position) == SA_SUCCESS) {
-     return position / sizeof(short);
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
deleted file mode 100644
index da3ec2866..000000000
--- a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
+++ /dev/null
@@ -1,35 +0,0 @@
---- mozilla-2.0.orig/ipc/chromium/src/base/debug_util_posix.cc	2011-03-19 00:33:46.000000000 +0100
-+++ mozilla-2.0/ipc/chromium/src/base/debug_util_posix.cc	2011-04-24 07:55:10.000000000 +0200
-@@ -11,10 +11,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
--#ifndef ANDROID
--#include <execinfo.h>
--#include <sys/sysctl.h>
--#endif
- 
- #include "base/basictypes.h"
- #include "base/eintr_wrapper.h"
-@@ -119,11 +115,7 @@ StackTrace::StackTrace() {
-   const int kMaxCallers = 256;
- 
-   void* callers[kMaxCallers];
--#ifndef ANDROID
--  int count = backtrace(callers, kMaxCallers);
--#else
-   int count = 0;
--#endif
- 
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we still still exclude them because they would break the
-@@ -138,9 +130,6 @@ StackTrace::StackTrace() {
- 
- void StackTrace::PrintBacktrace() {
-   fflush(stderr);
--#ifndef ANDROID
--  backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
--#endif
- }
- 
- void StackTrace::OutputToStream(std::ostream* os) {
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc
deleted file mode 100644
index 882ed195a..000000000
--- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.cc	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util.cc	2012-10-03 13:44:11.000000000 +0200
-@@ -8,9 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
- #include <unistd.h>
--#endif
- 
- #include <fstream>
- 
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc
deleted file mode 100644
index eb3e50b3b..000000000
--- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc	2012-10-03 13:50:20.000000000 +0200
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #include <string>
- #include <vector>
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_process_util_h b/package/firefox/patches/patch-ipc_chromium_src_base_process_util_h
deleted file mode 100644
index ef7d44628..000000000
--- a/package/firefox/patches/patch-ipc_chromium_src_base_process_util_h
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/process_util.h	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/process_util.h	2011-07-29 16:26:23.000000000 +0200
-@@ -62,7 +62,8 @@ enum ProcessArchitecture {
-   PROCESS_ARCH_I386 = 0x1,
-   PROCESS_ARCH_X86_64 = 0x2,
-   PROCESS_ARCH_PPC = 0x4,
--  PROCESS_ARCH_ARM = 0x8
-+  PROCESS_ARCH_ARM = 0x8,
-+  PROCESS_ARCH_MIPS = 0xf
- };
- 
- static ProcessArchitecture GetCurrentProcessArchitecture()
-@@ -76,6 +77,8 @@ static ProcessArchitecture GetCurrentPro
-   currentArchitecture = base::PROCESS_ARCH_PPC;
- #elif defined(ARCH_CPU_ARMEL)
-   currentArchitecture = base::PROCESS_ARCH_ARM;
-+#elif defined(ARCH_CPU_MIPS)
-+  currentArchitecture = base::PROCESS_ARCH_MIPS;
- #endif
-   return currentArchitecture;
- }
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc
deleted file mode 100644
index 7d0bc5934..000000000
--- a/package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/time_posix.cc	2012-10-03 13:54:12.000000000 +0200
-@@ -164,7 +164,7 @@ TimeTicks TimeTicks::Now() {
-   // With numer and denom = 1 (the expected case), the 64-bit absolute time
-   // reported in nanoseconds is enough to last nearly 585 years.
- 
--#elif defined(OS_POSIX) && \
-+#elif defined(__linux__) || defined(OS_POSIX) && \
-       defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
- 
-   struct timespec ts;
diff --git a/package/firefox/patches/patch-ipc_chromium_src_build_build_config_h b/package/firefox/patches/patch-ipc_chromium_src_build_build_config_h
deleted file mode 100644
index a281ad81e..000000000
--- a/package/firefox/patches/patch-ipc_chromium_src_build_build_config_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/build/build_config.h	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/build/build_config.h	2011-07-29 16:23:31.000000000 +0200
-@@ -60,6 +60,12 @@
- #elif defined(__ppc__)
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
-+#elif defined(__mips__)
-+#define ARCH_CPU_MIPS 1
-+#define ARCH_CPU_32_BITS 1
-+#elif defined(__mips64__)
-+#define ARCH_CPU_MIPS 1
-+#define ARCH_CPU_64_BITS 1
- #else
- #error Please add support for your architecture in build/build_config.h
- #endif
diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in
deleted file mode 100644
index f2dc6e8df..000000000
--- a/package/firefox/patches/patch-js_src_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/js/src/Makefile.in	2011-07-08 03:15:23.000000000 +0200
-+++ mozilla-release/js/src/Makefile.in	2011-07-29 15:50:36.000000000 +0200
-@@ -391,7 +391,7 @@ CPPSRCS += 	checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
- 
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
- 
- VPATH +=	$(srcdir)/assembler \
- 		$(srcdir)/assembler/wtf \
diff --git a/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp b/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp
deleted file mode 100644
index e7796d5d2..000000000
--- a/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/js/src/ctypes/CTypes.cpp	2011-03-19 00:33:47.000000000 +0100
-+++ mozilla-2.0/js/src/ctypes/CTypes.cpp	2011-06-15 05:56:10.076952202 +0200
-@@ -464,7 +464,7 @@ static inline bool FloatIsFinite(jsdoubl
- #ifdef WIN32
-   return _finite(f) != 0;
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
diff --git a/package/firefox/patches/patch-js_src_jscpucfg_cpp b/package/firefox/patches/patch-js_src_jscpucfg_cpp
deleted file mode 100644
index e41e74f24..000000000
--- a/package/firefox/patches/patch-js_src_jscpucfg_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla-release.orig/js/src/jscpucfg.cpp	2011-07-08 03:15:24.000000000 +0200
-+++ mozilla-release/js/src/jscpucfg.cpp	2013-02-08 09:41:16.000000000 +0100
-@@ -177,6 +177,11 @@ int main(int argc, char **argv)
- 
-     printf("#endif /* js_cpucfg___ */\n");
- 
-+#if defined __GNUC__ && defined __x86_64__
-+    printf("#define HAVE_VA_LIST_AS_ARRAY\n");
-+    printf("\n");
-+#endif
-+
-     return EXIT_SUCCESS;
- }
- 
diff --git a/package/firefox/patches/patch-js_src_jsnum_h b/package/firefox/patches/patch-js_src_jsnum_h
deleted file mode 100644
index f2e6abe81..000000000
--- a/package/firefox/patches/patch-js_src_jsnum_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/js/src/jsnum.h	2011-03-19 00:33:50.000000000 +0100
-+++ mozilla-2.0/js/src/jsnum.h	2011-04-23 23:18:01.000000000 +0200
-@@ -101,7 +101,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
- #ifdef WIN32
-     return _finite(d);
- #else
--    return finite(d);
-+    return isfinite(d);
- #endif
- }
- 
diff --git a/package/firefox/patches/patch-js_src_jsprf_cpp b/package/firefox/patches/patch-js_src_jsprf_cpp
deleted file mode 100644
index c793f6bac..000000000
--- a/package/firefox/patches/patch-js_src_jsprf_cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla-release.orig/js/src/jsprf.cpp	2011-07-08 03:15:24.000000000 +0200
-+++ mozilla-release/js/src/jsprf.cpp	2013-04-04 16:21:34.000000000 +0200
-@@ -54,17 +54,7 @@
- 
- using namespace js;
- 
--/*
--** Note: on some platforms va_list is defined as an array,
--** and requires array notation.
--*/
--#ifdef HAVE_VA_COPY
--#define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
--#elif defined(HAVE_VA_LIST_AS_ARRAY)
--#define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
--#else
- #define VARARGS_ASSIGN(foo, bar)        (foo) = (bar)
--#endif
- 
- /*
- ** WARNING: This code may *NOT* call JS_LOG (because JS_LOG calls it)
diff --git a/package/firefox/patches/patch-js_src_xpconnect_src_xpcconvert_cpp b/package/firefox/patches/patch-js_src_xpconnect_src_xpcconvert_cpp
deleted file mode 100644
index 86a9445dc..000000000
--- a/package/firefox/patches/patch-js_src_xpconnect_src_xpcconvert_cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla-release.orig/js/src/xpconnect/src/xpcconvert.cpp	2011-07-08 03:15:26.000000000 +0200
-+++ mozilla-release/js/src/xpconnect/src/xpcconvert.cpp	2013-04-04 16:30:18.000000000 +0200
-@@ -1842,17 +1842,7 @@ XPCConvert::JSErrorToXPCException(XPCCal
- 
- /***************************************************************************/
- 
--/*
--** Note: on some platforms va_list is defined as an array,
--** and requires array notation.
--*/
--#ifdef HAVE_VA_COPY
--#define VARARGS_ASSIGN(foo, bar)	VA_COPY(foo,bar)
--#elif defined(HAVE_VA_LIST_AS_ARRAY)
--#define VARARGS_ASSIGN(foo, bar)	foo[0] = bar[0]
--#else
- #define VARARGS_ASSIGN(foo, bar)	(foo) = (bar)
--#endif
- 
- // We assert below that these formats all begin with "%i".
- const char* XPC_ARG_FORMATTER_FORMAT_STRINGS[] = {"%ip", "%iv", "%is", nsnull};
diff --git a/package/firefox/patches/patch-security_coreconf_Linux_mk b/package/firefox/patches/patch-security_coreconf_Linux_mk
deleted file mode 100644
index 26a3dc8f3..000000000
--- a/package/firefox/patches/patch-security_coreconf_Linux_mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla-1.9.2.orig/security/coreconf/Linux.mk	2010-12-03 16:48:49.000000000 +0100
-+++ mozilla-1.9.2/security/coreconf/Linux.mk	2011-01-20 20:18:26.904905227 +0100
-@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
- 	IMPL_STRATEGY = _PTH
- endif
- 
--CC			= gcc
--CCC			= g++
--RANLIB			= ranlib
-+CC			?= gcc
-+CCC			?= g++
-+RANLIB			?= ranlib
- 
- DEFAULT_COMPILER = gcc
- 
diff --git a/package/firefox/patches/patch-security_coreconf_command_mk b/package/firefox/patches/patch-security_coreconf_command_mk
deleted file mode 100644
index fcf73b8a8..000000000
--- a/package/firefox/patches/patch-security_coreconf_command_mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-1.9.2.orig/security/coreconf/command.mk	2010-12-03 16:48:49.000000000 +0100
-+++ mozilla-1.9.2/security/coreconf/command.mk	2011-01-20 20:18:56.214904993 +0100
-@@ -48,7 +48,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
- CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- PERL          = perl
--RANLIB        = echo
-+RANLIB        = ranlib
- TAR           = /bin/tar
- #
- # For purify
diff --git a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
deleted file mode 100644
index e2c3244b8..000000000
--- a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/security/nss/lib/freebl/stubs.c	2011-03-19 00:34:05.000000000 +0100
-+++ mozilla-2.0/security/nss/lib/freebl/stubs.c	2011-04-23 23:18:01.000000000 +0200
-@@ -539,7 +539,7 @@ freebl_InitNSSUtil(void *lib)
-  * fetch the library if it's loaded. For NSS it should already be loaded
-  */
- #define freebl_getLibrary(libName)  \
--    dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
-+    dlopen (libName, RTLD_LAZY)
- 
- #define freebl_releaseLibrary(lib) \
-     if (lib) dlclose(lib)
diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
deleted file mode 100644
index 7c5b42fb6..000000000
--- a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/xpcom/ds/nsMathUtils.h	2011-07-08 03:15:44.000000000 +0200
-+++ mozilla-release/xpcom/ds/nsMathUtils.h	2011-08-01 14:40:58.343424403 +0200
-@@ -170,7 +170,7 @@ inline NS_HIDDEN_(bool) NS_finite(double
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+    return isfinite(d);
- #endif
- }
- 
diff --git a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
deleted file mode 100644
index ebe95827e..000000000
--- a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- mozilla-2.0.orig/xpcom/threads/nsThread.cpp	2011-03-19 00:34:14.000000000 +0100
-+++ mozilla-2.0/xpcom/threads/nsThread.cpp	2011-06-15 19:51:07.078202253 +0200
-@@ -50,11 +50,13 @@
-                       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
-                       !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
- 
-+#include <features.h>
- #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
-   && defined(_GNU_SOURCE)
--# define MOZ_CANARY
- # include <unistd.h>
-+#if !defined(__UCLIBC__)
- # include <execinfo.h>
-+#endif
- # include <signal.h>
- # include <fcntl.h>
- # include "nsXULAppAPI.h"