Revert "fix conflict, autoseect libgcj"

This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.

11 files changed, 158 insertions, 42 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 67baa2d20..2053a117a 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,16 +4,16 @@
 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 libnotify libpng
+PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libnotify
 PKG_DEPENDS+=		nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx
 PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf
 PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
-PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng
+PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_NOPARALLEL:=	1
@@ -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
 
@@ -47,16 +47,11 @@ CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_RANLIB="ranlib" HOST_AR="ar" \
 			CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \
 			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
 CONFIGURE_ARGS+=	--enable-application=browser \
 			--enable-official-branding \
 			--with-system-zlib \
-			--with-system-cairo \
-			--with-system-pixman \
 			--with-system-jpeg \
 			--with-system-png \
 			--with-system-nss \
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 42b39365b..6ab49e7f0 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,36 +1,52 @@
---- mozilla-2.0.orig/configure	2011-03-19 00:48:56.000000000 +0100
-+++ mozilla-2.0/configure	2011-03-28 12:25:19.041814743 +0200
-@@ -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)'
  
--if test -z "$CROSS_COMPILE"; then
--    if test -z "$HOST_LIBIDL_CONFIG"; then
+ 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 -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_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_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
new file mode 100644
index 000000000..833e94185
--- /dev/null
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
@@ -0,0 +1,29 @@
+--- 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];
+@@ -128,11 +131,16 @@ StackTrace::StackTrace() {
+   } else {
+     trace_.resize(0);
+   }
++#endif
+ }
+ 
+ void StackTrace::PrintBacktrace() {
++#ifdef CHROMIUM_MOZILLA_BUILD
++  return;
++#else
+   fflush(stderr);
+   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_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-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)