[xulrunner] Update to 2.0b6

[Martin Stransky]

commit 5411179aa6cf11e922d595169101f30d08ed8767
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Sep 21 16:26:02 2010 +0200

    Update to 2.0b6

 mozilla-libjpeg-turbo.patch |   30 +++++-------------------------
 xulrunner-mozconfig         |    3 ++-
 xulrunner.spec              |   11 +++++++----
 3 files changed, 14 insertions(+), 30 deletions(-)
---
diff --git a/mozilla-libjpeg-turbo.patch b/mozilla-libjpeg-turbo.patch
index 9abd0e9..6ddb090 100644
--- a/mozilla-libjpeg-turbo.patch
+++ b/mozilla-libjpeg-turbo.patch
@@ -1,27 +1,7 @@
-diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
---- xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo	2010-08-06 03:09:15.000000000 +0200
-+++ xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp	2010-08-16 11:19:17.000000000 +0200
-@@ -58,19 +58,6 @@
- 
- extern "C" {
- #include "iccjpeg.h"
--
--/* Colorspace conversion (copied from jpegint.h) */
--struct jpeg_color_deconverter {
--  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
--				JSAMPIMAGE input_buf, JDIMENSION input_row,
--				JSAMPARRAY output_buf, int num_rows));
--};
--
--METHODDEF(void)
--ycc_rgb_convert_argb (j_decompress_ptr cinfo,
--                 JSAMPIMAGE input_buf, JDIMENSION input_row,
--                 JSAMPARRAY output_buf, int num_rows);
- }
- 
- NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder)
-@@ -443,14 +430,6 @@ nsresult nsJPEGDecoder::Write(const char
+diff -up xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp.jpeg-turbo xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp
+--- xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp.jpeg-turbo	2010-09-14 16:15:14.000000000 +0200
++++ xulrunner-2.0/mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp	2010-09-21 10:28:59.000000000 +0200
+@@ -422,14 +422,6 @@ nsJPEGDecoder::WriteInternal(const char 
        return NS_OK; /* I/O suspension */
      }
  
@@ -36,7 +16,7 @@ diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGD
      /* If this is a progressive JPEG ... */
      mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
    }
-@@ -616,15 +595,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s
+@@ -594,15 +586,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s
        PRUint32 *imageRow = ((PRUint32*)mImageData) +
                             (mInfo.output_scanline * mInfo.output_width);
  
diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig
index 479b147..ffbb0fe 100644
--- a/xulrunner-mozconfig
+++ b/xulrunner-mozconfig
@@ -1,5 +1,4 @@
 . $topsrcdir/xulrunner/config/mozconfig
-
 # --with-system-png is disabled because Mozilla requires APNG support in libpng
 #ac_add_options --with-system-png
 
@@ -33,9 +32,11 @@ ac_add_options --enable-libnotify
 ac_add_options --disable-necko-wifi
 ac_add_options --enable-startup-notification
 ac_add_options --disable-cpp-exceptions
+ac_add_options --enable-shared-js
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
 
diff --git a/xulrunner.spec b/xulrunner.spec
index 4937c3d..c138ad3 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -17,14 +17,14 @@
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
 
-%define version_internal  1.9.3
+%define version_internal  2
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
-%define pretag            b4
+%define pretag            b6
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.3.0
-Release:        0.2%{?pretag}%{?dist}
+Version:        2.0
+Release:        0.1%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -452,6 +452,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 21 2010 Martin Stransky <stransky at redhat.com> 2.0-0.1.b6
+- Update to 2.0b6
+
 * Tue Sep  7 2010 Tom "spot" Callaway <tcallawa at redhat.com> 1.9.3.0-0.2.b4
 - spec file cleanup