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

34 files changed, 822 insertions, 653 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 479ad854d..caf9fe384 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxdamage libxfixes libdrm libxxf86vm
 PKG_BUILDDEP:=		libXdamage libXfixes libXxf86vm libdrm
-PKG_BUILDDEP+=		dri2proto glproto expat
+PKG_BUILDDEP+=		dri2proto glproto expat libXext
 PKG_URL:=		http://www.mesa3d.org/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.2/
 PKG_NEED_CXX:=		1
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 13ed514d4..1218e6493 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
-PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11
+PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11 libXrender
 PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 
diff --git a/package/cairo/patches/patch-src_cairo-features_h b/package/cairo/patches/patch-src_cairo-features_h
deleted file mode 100644
index 6466deec7..000000000
--- a/package/cairo/patches/patch-src_cairo-features_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- cairo-1.8.10.orig/src/cairo-features.h	2010-02-19 22:34:38.000000000 +0100
-+++ cairo-1.8.10/src/cairo-features.h	2011-01-14 20:12:28.000000000 +0100
-@@ -10,11 +10,11 @@
- #define CAIRO_HAS_SVG_SURFACE 1
- #define CAIRO_HAS_USER_FONT 1
- #define CAIRO_HAS_XLIB_SURFACE 1
--#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1
- 
- /*#undef CAIRO_HAS_QUARTZ_FONT */
- /*#undef CAIRO_HAS_QUARTZ_SURFACE */
- /*#undef CAIRO_HAS_WIN32_FONT */
- /*#undef CAIRO_HAS_WIN32_SURFACE */
-+/*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */
- 
- #endif
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 338821492..12c513504 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		4.0
+PKG_VERSION:=		3.6.15
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3468a2c463b4fc2788ba621e4b511c30
+PKG_MD5SUM:=		fcf8042948d91f1f3d9c33599b79cf35
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libnotify
@@ -23,7 +23,7 @@ PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el native
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
-WRKDIST=		${WRKDIR}/mozilla-2.0
+WRKDIST=		${WRKDIR}/mozilla-1.9.2
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 733e4aa4c..6ab49e7f0 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,45 +1,52 @@
---- mozilla-2.0.orig/configure	2011-03-19 00:48:56.000000000 +0100
-+++ mozilla-2.0/configure	2011-04-07 18:48:49.000000000 +0200
-@@ -1588,7 +1588,7 @@ test -n "$HOST_CXX" || HOST_CXX=""""
-         HOST_CXXFLAGS="$CXXFLAGS"
-     fi
-     if test -z "$HOST_LDFLAGS"; then
--        HOST_LDFLAGS="$LDFLAGS"
-+        HOST_LDFLAGS="$LDFLAGS_FOR_BUILD"
-     fi
-     if test -z "$HOST_AR_FLAGS"; then
-         HOST_AR_FLAGS="$AR_FLAGS"
-@@ -22573,15 +22573,6 @@ if test "${with_libIDL+set}" = set; then
+--- mozilla-1.9.2.orig/configure	2010-12-03 16:57:11.000000000 +0100
++++ mozilla-1.9.2/configure	2010-12-29 21:52:34.000000000 +0100
+@@ -3970,7 +3970,7 @@ else
+     echo "$ac_t""yes" 1>&6    
  fi
  
+-  for ac_prog in $PYTHON python2.5 python2.4 python
++  for ac_prog in $PYTHON python2.6 python2.5 python2.4 python
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino
+ CYGWIN_WRAPPER=
+ WIN_TOP_SRC=
+ MOZ_USER_DIR=".mozilla"
+-HOST_AR='$(AR)'
+ HOST_AR_FLAGS='$(AR_FLAGS)'
+ 
+ MOZ_JPEG_CFLAGS=
+@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI
+ else
+   
+         if test "$cross_compiling" = yes; then
+-  ac_cv_sqlite_secure_delete=no
++  ac_cv_sqlite_secure_delete=yes
+         
+ else
+   cat > conftest.$ac_ext <<EOF
+@@ -21460,18 +21459,11 @@ fi
+     fi
+ fi
  
--if test -z "$CROSS_COMPILE"; then
--    if test -z "$HOST_LIBIDL_CONFIG"; then
+-if test -n "$CROSS_COMPILE"; then
+-     if test -z "$HOST_LIBIDL_CONFIG"; then
 -        HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
 -    fi
--    if test -z "$HOST_LIBIDL_PREFIX"; then
--        HOST_LIBIDL_PREFIX="$LIBIDL_PREFIX"
+-    if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
+-        HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+-        HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+-    else
+-        HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
+-        HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
 -    fi
 -fi
--
- if test "$SKIP_IDL_CHECK" = "no"
- then
-     _LIBIDL_FOUND=
-@@ -22788,6 +22779,7 @@ fi
-      fi
-   fi
- 
-+
-   # Check whether --with-glib-prefix or --without-glib-prefix was given.
- if test "${with_glib_prefix+set}" = set; then
-   withval="$with_glib_prefix"
-@@ -23542,6 +23534,9 @@ else
-     LIBIDL_LIBS="$HOST_LIBIDL_LIBS"
- 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`
 +
++echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}"
++echo "host libidl libs: ${HOST_LIBIDL_LIBS}"
+ 
  if test -z "$SKIP_PATH_CHECKS"; then
- if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then
-     if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then
+ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
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 0d5d389a4..000000000
--- a/package/firefox/patches/patch-content_base_public_nsContentUtils_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/content/base/public/nsContentUtils.h	2011-03-19 00:33:33.000000000 +0100
-+++ mozilla-2.0/content/base/public/nsContentUtils.h	2011-03-27 21:49:48.303361341 +0200
-@@ -1942,7 +1942,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_base_src_nsContentSink_cpp b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp
new file mode 100644
index 000000000..a97306351
--- /dev/null
+++ b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp
@@ -0,0 +1,10 @@
+--- mozilla-1.9.2.orig/content/base/src/nsContentSink.cpp	2010-10-27 05:01:11.000000000 +0200
++++ mozilla-1.9.2/content/base/src/nsContentSink.cpp	2010-11-11 22:40:48.404995720 +0100
+@@ -1973,7 +1973,6 @@ nsIAtom** const kDefaultAllowedAttribute
+   &nsGkAtoms::nowrap,
+   &nsGkAtoms::open,
+   &nsGkAtoms::optimum,
+-  &nsGkAtoms::pattern,
+   &nsGkAtoms::placeholder,
+   &nsGkAtoms::pointSize,
+   &nsGkAtoms::prompt,
diff --git a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp b/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp
deleted file mode 100644
index bd9eacb42..000000000
--- a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp	2011-03-19 00:33:34.000000000 +0100
-+++ mozilla-2.0/content/canvas/src/nsCanvasRenderingContext2D.cpp	2011-03-27 22:36:34.953370738 +0200
-@@ -159,7 +159,7 @@ DoubleIsFinite(double d)
-     // 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-content_media_nsAudioStream_cpp b/package/firefox/patches/patch-content_media_nsAudioStream_cpp
new file mode 100644
index 000000000..1452b9b6b
--- /dev/null
+++ b/package/firefox/patches/patch-content_media_nsAudioStream_cpp
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/content/media/nsAudioStream.cpp	2010-04-02 18:02:19.000000000 +0200
++++ mozilla-1.9.2/content/media/nsAudioStream.cpp	2010-06-11 21:28:33.522214080 +0200
+@@ -246,7 +246,7 @@ float nsAudioStream::GetPosition()
+ #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 / float(mRate) / mChannels / sizeof(short));
diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c
new file mode 100644
index 000000000..ea9ab6234
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_qcms_iccread_c
@@ -0,0 +1,18 @@
+--- mozilla-1.9.2.orig/gfx/qcms/iccread.c	2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/iccread.c	2010-04-30 14:00:52.430967966 +0200
+@@ -23,6 +23,7 @@
+ #include <math.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include "qcmsint.h"
+ 
+ //XXX: use a better typename
+@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile *
+ 	qcms_profile_fini(profile);
+ }
+ 
+-#include <stdio.h>
+ qcms_profile* qcms_profile_from_file(FILE *file)
+ {
+ 	uint32_t length, remaining_length;
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
new file mode 100644
index 000000000..80f68661a
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
@@ -0,0 +1,26 @@
+--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h	2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h	2010-04-30 17:58:33.490975825 +0200
+@@ -11,22 +11,12 @@
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
+ #else
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
++#include <stdint.h>
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
+ #elif defined(__FreeBSD__)
+ /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */
+-#else
+-typedef PRUptrdiff uintptr_t;
+ #endif
+ #endif
+ 
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
index cc75305d9..833e94185 100644
--- 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
@@ -1,24 +1,29 @@
---- 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-07 20:17:31.000000000 +0200
-@@ -119,11 +119,7 @@ StackTrace::StackTrace() {
+--- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc	2010-10-27 05:01:17.000000000 +0200
++++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc	2010-11-12 11:53:10.614327269 +0100
+@@ -114,6 +114,9 @@ void DebugUtil::BreakDebugger() {
+ }
+ 
+ StackTrace::StackTrace() {
++#ifdef CHROMIUM_MOZILLA_BUILD
++  return;
++#else
    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 +134,6 @@ StackTrace::StackTrace() {
+@@ -128,11 +131,16 @@ StackTrace::StackTrace() {
+   } else {
+     trace_.resize(0);
+   }
++#endif
+ }
  
  void StackTrace::PrintBacktrace() {
++#ifdef CHROMIUM_MOZILLA_BUILD
++  return;
++#else
    fflush(stderr);
--#ifndef ANDROID
--  backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
--#endif
+   backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
++#endif
  }
  
  void StackTrace::OutputToStream(std::ostream* os) {
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 0df200fbf..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-03-27 20:35:10.553370360 +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_jsnum_h b/package/firefox/patches/patch-js_src_jsnum_h
index 54c7064cf..af999878c 100644
--- a/package/firefox/patches/patch-js_src_jsnum_h
+++ b/package/firefox/patches/patch-js_src_jsnum_h
@@ -1,6 +1,6 @@
---- mozilla-2.0.orig/js/src/jsnum.h	2011-03-19 00:33:50.000000000 +0100
-+++ mozilla-2.0/js/src/jsnum.h	2011-03-27 20:18:21.253370504 +0200
-@@ -101,7 +101,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
+--- mozilla-1.9.2.orig/js/src/jsnum.h	2010-04-02 18:02:28.000000000 +0200
++++ mozilla-1.9.2/js/src/jsnum.h	2010-04-11 14:04:14.000000000 +0200
+@@ -98,7 +98,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
  #ifdef WIN32
      return _finite(d);
  #else
diff --git a/package/firefox/patches/patch-modules_libpr0n_decoders_nsPNGDecoder_cpp b/package/firefox/patches/patch-modules_libpr0n_decoders_nsPNGDecoder_cpp
deleted file mode 100644
index 9534c92bd..000000000
--- a/package/firefox/patches/patch-modules_libpr0n_decoders_nsPNGDecoder_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla-2.0.orig/modules/libpr0n/decoders/nsPNGDecoder.cpp	2011-03-19 00:34:02.000000000 +0100
-+++ mozilla-2.0/modules/libpr0n/decoders/nsPNGDecoder.cpp	2011-03-27 22:30:41.783370593 +0200
-@@ -386,7 +386,8 @@ PNGGetColorProfile(png_structp png_ptr, 
-   // First try to see if iCCP chunk is present
-   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
-     png_uint_32 profileLen;
--    char *profileData, *profileName;
-+    png_byte *profileData;
-+    char *profileName;
-     int compression;
- 
-     png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
diff --git a/package/firefox/patches/patch-security_coreconf_Linux_mk b/package/firefox/patches/patch-security_coreconf_Linux_mk
index 32aaf4633..26a3dc8f3 100644
--- a/package/firefox/patches/patch-security_coreconf_Linux_mk
+++ b/package/firefox/patches/patch-security_coreconf_Linux_mk
@@ -1,5 +1,5 @@
---- mozilla-2.0.orig/security/coreconf/Linux.mk	2011-03-19 00:34:04.000000000 +0100
-+++ mozilla-2.0/security/coreconf/Linux.mk	2011-03-28 13:44:58.221818344 +0200
+--- 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
diff --git a/package/firefox/patches/patch-security_coreconf_command_mk b/package/firefox/patches/patch-security_coreconf_command_mk
index 3b4ddc1be..fcf73b8a8 100644
--- a/package/firefox/patches/patch-security_coreconf_command_mk
+++ b/package/firefox/patches/patch-security_coreconf_command_mk
@@ -1,5 +1,5 @@
---- mozilla-2.0.orig/security/coreconf/command.mk	2011-03-19 00:34:04.000000000 +0100
-+++ mozilla-2.0/security/coreconf/command.mk	2011-03-28 13:45:21.461818772 +0200
+--- 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)
diff --git a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
new file mode 100644
index 000000000..233823c91
--- /dev/null
+++ b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/security/nss/lib/freebl/stubs.c	2010-04-02 18:03:06.000000000 +0200
++++ mozilla-1.9.2/security/nss/lib/freebl/stubs.c	2010-04-11 15:37:04.000000000 +0200
+@@ -530,7 +530,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_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h b/package/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h
deleted file mode 100644
index 0b2443c1e..000000000
--- a/package/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla-2.0.orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2011-03-19 00:34:13.000000000 +0100
-+++ mozilla-2.0/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2011-04-07 19:02:44.000000000 +0200
-@@ -67,6 +67,9 @@
- *
- */
- 
-+#define CFRONT_STYLE_THIS_ADJUST
-+
-+#if 0
- #if defined(LINUX) || (defined(__GLIBC__) && (defined(__FreeBSD_kernel__) || defined(__GNU__)))
- 
- #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
-@@ -159,6 +162,7 @@
- #else
- #error "need a platform define if using unixish x86 code"
- #endif
-+#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 ca4be566b..000000000
--- a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
+++ /dev/null
@@ -1,33 +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-03-27 21:47:15.633370362 +0200
-@@ -46,10 +46,13 @@
- #include "prlog.h"
- #include "nsThreadUtilsInternal.h"
- 
-+#include <features.h>
-+
- #define HAVE_UALARM _BSD_SOURCE || (_XOPEN_SOURCE >= 500 ||                 \
-                       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
-                       !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
- 
-+#if !defined(__UCLIBC__)
- #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
-   && defined(_GNU_SOURCE)
- # define MOZ_CANARY
-@@ -59,6 +62,7 @@
- # include <fcntl.h>
- # include "nsXULAppAPI.h"
- #endif
-+#endif
- 
- #include "mozilla/FunctionTimer.h"
- #if defined(NS_FUNCTION_TIMER) && defined(_MSC_VER)
-@@ -562,7 +566,7 @@ void canary_alarm_handler (int signum)
-   const char msg[29] = "event took too long to run:\n";
-   // use write to be safe in the signal handler
-   write(Canary::sOutputFD, msg, sizeof(msg)); 
--  backtrace_symbols_fd(array, backtrace(array, 30), Canary::sOutputFD);
-+  //backtrace_symbols_fd(array, backtrace(array, 30), Canary::sOutputFD);
- }
- 
- #endif
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 3f50b9e91..6158d094f 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--enable-cxx-flags="${TARGET_LDFLAGS}"
 
 # disable honour cflags stuff
-XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index d428a58ec..be5d21e46 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -46,7 +46,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 	$(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib
 endif
 	$(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib
-	-for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
+	for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib; \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib; \
 	done
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index e1c0eb5de..3b88cf9e5 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -12,7 +12,7 @@ PKG_DESCR:=		GTK+ library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
 PKG_BUILDDEP:=		cairo atk pango libXext renderproto libXrender
-PKG_BUILDDEP+=		gdk-pixbuf libXcomposite
+PKG_BUILDDEP+=		gdk-pixbuf libXcomposite libXdamage
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/
 PKG_NEED_CXX:=		1
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 6caddfc93..d99bb7247 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		9beee7f603907840de9d9e73172e74d0
 PKG_DESCR:=		X client interface to extensions of the X protocol
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		libX11
+PKG_BUILDDEP:=		libX11 xextproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBXEXT LIBXEXT_DEV
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 2deced6df..f1d420899 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libpng
-PKG_VERSION:=		1.5.1
+PKG_VERSION:=		1.2.44
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		220035f111ea045a51e290906025e8b5
+PKG_MD5SUM:=		89b62f8daaeeab1342e307d6d1411ff1
 PKG_DESCR:=		A library for reading/writing PNG images
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
@@ -27,7 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS}))
 
-#TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
 
 libpng-install:
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
diff --git a/package/libpng/patches/001-apng.patch b/package/libpng/patches/001-apng.patch
index 3b68eea9f..3af4a0547 100644
--- a/package/libpng/patches/001-apng.patch
+++ b/package/libpng/patches/001-apng.patch
@@ -1,7 +1,51 @@
-diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c
---- libpng-1.5.1.orig/pngget.c	2011-02-03 05:58:17.000000000 +0100
-+++ libpng-1.5.1/pngget.c	2011-03-27 19:43:38.404620874 +0200
-@@ -937,6 +937,167 @@
+diff -Nur libpng-1.2.44.orig/png.c libpng-1.2.44/png.c
+--- libpng-1.2.44.orig/png.c	2010-06-26 02:31:14.000000000 +0200
++++ libpng-1.2.44/png.c	2010-07-08 21:21:33.745873377 +0200
+@@ -56,6 +56,11 @@
+ PNG_tIME;
+ PNG_tRNS;
+ PNG_zTXt;
++#ifdef PNG_APNG_SUPPORTED
++PNG_acTL;
++PNG_fcTL;
++PNG_fdAT;
++#endif
+ 
+ #ifdef PNG_READ_SUPPORTED
+ /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+diff -Nur libpng-1.2.44.orig/pngconf.h libpng-1.2.44/pngconf.h
+--- libpng-1.2.44.orig/pngconf.h	2010-06-26 02:31:14.000000000 +0200
++++ libpng-1.2.44/pngconf.h	2010-07-08 21:21:33.906029659 +0200
+@@ -951,6 +951,10 @@
+ #  define PNG_NO_READ_tEXt
+ #  define PNG_NO_READ_zTXt
+ #endif
++#ifndef PNG_NO_READ_APNG
++#  define PNG_READ_APNG_SUPPORTED
++#  define PNG_APNG_SUPPORTED
++#endif
+ #ifndef PNG_NO_READ_bKGD
+ #  define PNG_READ_bKGD_SUPPORTED
+ #  define PNG_bKGD_SUPPORTED
+@@ -1177,6 +1181,14 @@
+ #    define PNG_TEXT_SUPPORTED
+ #  endif
+ #endif
++#ifndef PNG_NO_WRITE_APNG
++#  ifndef PNG_WRITE_APNG_SUPPORTED
++#    define PNG_WRITE_APNG_SUPPORTED
++#  endif
++#  ifndef PNG_APNG_SUPPORTED
++#    define PNG_APNG_SUPPORTED
++#  endif
++#endif
+ 
+ #ifdef PNG_WRITE_tIME_SUPPORTED
+ #  ifndef PNG_NO_CONVERT_tIME
+diff -Nur libpng-1.2.44.orig/pngget.c libpng-1.2.44/pngget.c
+--- libpng-1.2.44.orig/pngget.c	2010-06-26 02:31:14.000000000 +0200
++++ libpng-1.2.44/pngget.c	2010-07-08 21:21:33.676118515 +0200
+@@ -842,6 +842,167 @@
  }
  #endif
  
@@ -11,7 +55,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c
 +             png_uint_32 *num_frames, png_uint_32 *num_plays)
 +{
 +    png_debug1(1, "in %s retrieval function", "acTL");
-+
++    
 +    if (png_ptr != NULL && info_ptr != NULL &&
 +        (info_ptr->valid & PNG_INFO_acTL) &&
 +        num_frames != NULL && num_plays != NULL)
@@ -20,7 +64,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c
 +        *num_plays = info_ptr->num_plays;
 +        return (1);
 +    }
-+
++    
 +    return (0);
 +}
 +
@@ -28,7 +72,7 @@ diff -Nur libpng-1.5.1.orig/pngget.c libpng-1.5.1/pngget.c
 +png_get_num_frames(png_structp png_ptr, png_infop info_ptr)
 +{
 +    png_debug(1, "in png_get_num_frames()");
-+
++    
 +    if (png_ptr != NULL && info_ptr != NULL)
 +        return (info_ptr->num_frames);