[xulrunner/f13/master] Update to 1.9.2.15

[Jan Horak]

commit 5cc6049159fc0d5b6629023ba55c11bb0941245b
Author: Jan Horak <jhorak at redhat.com>
Date:   Mon Mar 7 12:26:53 2011 +0100

    Update to 1.9.2.15

 .gitignore                        |    1 +
 crashreporter-remove-static.patch |   11 +++++++++++
 sources                           |    2 +-
 xulrunner-mozconfig-debuginfo     |    4 ++--
 xulrunner.spec                    |   16 ++++++++++++++--
 5 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2d4c9f..ad30c72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xulrunner-1.9.2.7.source.tar.bz2
 /xulrunner-1.9.2.12.source.tar.bz2
 /xulrunner-1.9.2.13.source.tar.bz2
 /xulrunner-1.9.2.14.source.tar.bz2
+/xulrunner-1.9.2.15.source.tar.bz2
diff --git a/crashreporter-remove-static.patch b/crashreporter-remove-static.patch
new file mode 100644
index 0000000..b94d165
--- /dev/null
+++ b/crashreporter-remove-static.patch
@@ -0,0 +1,11 @@
+diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+--- mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static	2010-06-23 19:47:11.000000000 +0200
++++ mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in	2010-07-12 15:51:41.000000000 +0200
+@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
+ 
+ #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
+ # due to them having an older libstdc++
+-HOST_LDFLAGS += -static
++#HOST_LDFLAGS += -static
+ 
+ include $(topsrcdir)/config/rules.mk
diff --git a/sources b/sources
index cd95fea..54c799f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab0d00cd33e6b2388429dda1c01abd01  xulrunner-1.9.2.14.source.tar.bz2
+fcf8042948d91f1f3d9c33599b79cf35  xulrunner-1.9.2.15.source.tar.bz2
diff --git a/xulrunner-mozconfig-debuginfo b/xulrunner-mozconfig-debuginfo
index a0ef07a..4dd2427 100644
--- a/xulrunner-mozconfig-debuginfo
+++ b/xulrunner-mozconfig-debuginfo
@@ -1,5 +1,5 @@
 # For mozilla's debuginfo:
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
+export CFLAGS="$CFLAGS -gdwarf-2"
+export CXXFLAGS="$CXXFLAGS -gdwarf-2"
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-crashreporter
diff --git a/xulrunner.spec b/xulrunner.spec
index 1939f00..9326821 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -5,7 +5,14 @@
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.2
-%define enable_mozilla_crashreporter       0
+# crash reporter and out-of-process-plugins work only on x86/x86_64
+%ifarch %{ix86} x86_64
+%global enable_mozilla_crashreporter 1
+%global moz_out_of_process_plugins   1
+%else
+%global enable_mozilla_crashreporter 0
+%global moz_out_of_process_plugins   0
+%endif
 
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
@@ -15,7 +22,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.2.14
+Version:        1.9.2.15
 Release:        1%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -38,6 +45,7 @@ Patch9:         mozilla-build-sbrk.patch
 
 # Fedora specific patches
 Patch20:        mozilla-192-pkgconfig.patch
+Patch24:        crashreporter-remove-static.patch
 
 # Upstream patches
 
@@ -131,6 +139,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %patch9  -p2 -b .sbrk
 
 %patch20 -p1 -b .pk
+%patch24 -p1 -b .static
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -428,6 +437,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Mar  7 2011 Jan Horak <jhorak at redhat.com> - 1.9.2.15-1
+- Update to 1.9.2.15
+
 * Tue Mar  1 2011 Jan Horak <jhorak at redhat.com> - 1.9.2.14-1
 - Update to 1.9.2.14