From ce64829c0d165fe0f25c861117a359b05293ec51 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 24 Apr 2011 17:38:50 +0200 Subject: update to firefox4 --- package/firefox/Makefile | 8 ++- package/firefox/patches/patch-configure | 63 +++------------------- .../patch-content_base_src_nsContentSink_cpp | 10 ---- .../patches/patch-content_media_nsAudioStream_cpp | 8 +-- package/firefox/patches/patch-gfx_qcms_iccread_c | 18 ------- package/firefox/patches/patch-gfx_qcms_qcmstypes_h | 26 --------- ...patch-ipc_chromium_src_base_debug_util_posix_cc | 44 ++++++++------- package/firefox/patches/patch-js_src_jsnum_h | 6 +-- .../patches/patch-security_nss_lib_freebl_stubs_c | 6 +-- .../patches/patch-xpcom_threads_nsThread_cpp | 10 ++++ 10 files changed, 54 insertions(+), 145 deletions(-) delete mode 100644 package/firefox/patches/patch-content_base_src_nsContentSink_cpp delete mode 100644 package/firefox/patches/patch-gfx_qcms_iccread_c delete mode 100644 package/firefox/patches/patch-gfx_qcms_qcmstypes_h create mode 100644 package/firefox/patches/patch-xpcom_threads_nsThread_cpp (limited to 'package/firefox') diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 77f29c0c6..81c97c511 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 3.6.16 +PKG_VERSION:= 4.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 232a3c0160cd1cbe3dcaaaf7e4ae51c2 +PKG_MD5SUM:= 3468a2c463b4fc2788ba621e4b511c30 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-1.9.2 +WRKDIST= ${WRKDIR}/mozilla-2.0 include $(TOPDIR)/mk/package.mk @@ -60,8 +60,6 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-system-cairo \ --with-system-pixman \ --with-system-jpeg \ - --with-system-png \ - --with-system-nss \ --enable-system-sqlite \ --with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \ --with-glib-prefix=${STAGING_TARGET_DIR}/usr \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index cda2ec0e1..221ae4c83 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,63 +1,12 @@ ---- mozilla-1.9.2.orig/configure 2011-03-19 21:39:59.000000000 +0100 -+++ mozilla-1.9.2/configure 2011-04-23 11:35:36.000000000 +0200 -@@ -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= -@@ -13581,9 +13580,9 @@ if test "$SYSTEM_PNG" = 1; then - LIBS="$PNG_LIBS $LIBS" - cat > conftest.$ac_ext < - #include -+#include "confdefs.h" - #include - int main() { - #if PNG_LIBPNG_VER < $MOZPNG -@@ -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 <(mAudioHandle), positionType, &position) == SA_SUCCESS) { - return (position / float(mRate) / mChannels / sizeof(short)); + return position / sizeof(short); diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c deleted file mode 100644 index ea9ab6234..000000000 --- a/package/firefox/patches/patch-gfx_qcms_iccread_c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 - #include - #include -+#include - #include "qcmsint.h" - - //XXX: use a better typename -@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile * - qcms_profile_fini(profile); - } - --#include - 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 deleted file mode 100644 index 80f68661a..000000000 --- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 - #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 - #ifdef __OS2__ - /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ - #include - #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 833e94185..da3ec2866 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,29 +1,35 @@ ---- 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() { - } +--- 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 + #include + #include +-#ifndef ANDROID +-#include +-#include +-#endif - StackTrace::StackTrace() { -+#ifdef CHROMIUM_MOZILLA_BUILD -+ return; -+#else + #include "base/basictypes.h" + #include "base/eintr_wrapper.h" +@@ -119,11 +115,7 @@ StackTrace::StackTrace() { const int kMaxCallers = 256; void* callers[kMaxCallers]; -@@ -128,11 +131,16 @@ StackTrace::StackTrace() { - } else { - trace_.resize(0); - } -+#endif - } +-#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() { -+#ifdef CHROMIUM_MOZILLA_BUILD -+ return; -+#else fflush(stderr); - backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); -+#endif +-#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-js_src_jsnum_h b/package/firefox/patches/patch-js_src_jsnum_h index af999878c..f2e6abe81 100644 --- a/package/firefox/patches/patch-js_src_jsnum_h +++ b/package/firefox/patches/patch-js_src_jsnum_h @@ -1,6 +1,6 @@ ---- 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) +--- 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 diff --git a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c index 233823c91..e2c3244b8 100644 --- a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c +++ b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c @@ -1,6 +1,6 @@ ---- 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) +--- 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) \ diff --git a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp new file mode 100644 index 000000000..67ef28c26 --- /dev/null +++ b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp @@ -0,0 +1,10 @@ +--- mozilla-2.0.orig/xpcom/threads/nsThread.cpp 2011-03-19 00:34:14.000000000 +0100 ++++ mozilla-2.0/xpcom/threads/nsThread.cpp 2011-04-24 08:56:39.000000000 +0200 +@@ -52,7 +52,6 @@ + + #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \ + && defined(_GNU_SOURCE) +-# define MOZ_CANARY + # include + # include + # include -- cgit v1.2.3