Update to 1.9.2.18

enable_mozilla_crashreporter

.cvsignore

@@ -1,12 +0,0 @@
-xulrunner-1.9.1.1-source.tar.bz2
-xulrunner-1.9.1.2-source.tar.bz2
-xulrunner-1.9.1.3-source.tar.bz2
-xulrunner-1.9.1.4-source.tar.bz2
-xulrunner-1.9.1.5-source.tar.bz2
-xulrunner-1.9.2.1b2.source.tar.bz2
-xulrunner-1.9.2.1b3.source.tar.bz2
-xulrunner-1.9.2.1b4.source.tar.bz2
-xulrunner-1.9.2.1b5.source.tar.bz2
-xulrunner-1.9.2.1rc1.source.tar.bz2
-xulrunner-1.9.2.1rc2.source.tar.bz2
-xulrunner-1.9.2.1.source.tar.bz2

.gitignore

@@ -0,0 +1,11 @@
+xulrunner-1.9.2.7.source.tar.bz2
+/xulrunner-1.9.2.9.source.tar.bz2
+/xulrunner-1.9.2.10.source.tar.bz2
+/xulrunner-1.9.2.11.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
+/xulrunner-1.9.2.16.source.tar.bz2
+/xulrunner-1.9.2.17.source.tar.bz2
+/xulrunner-1.9.2.18.source.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xulrunner
-# $Id: Makefile,v 1.1 2007/06/22 02:18:59 kevin Exp $
-NAME := xulrunner
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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

mozilla-jemalloc-526152.patch

@@ -1,32 +0,0 @@
-From: David Mandelin <dmandelin@mozilla.com>
-
-diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
---- a/memory/jemalloc/jemalloc.c
-+++ b/memory/jemalloc/jemalloc.c
-@@ -5792,24 +5792,24 @@ __attribute__((noinline))
- #else
- inline
- #endif
- void *
- memalign(size_t alignment, size_t size)
- {
- 	void *ret;
- 
--	assert(((alignment - 1) & alignment) == 0 && alignment >=
--	    sizeof(void *));
-+	assert(((alignment - 1) & alignment) == 0);
- 
- 	if (malloc_init()) {
- 		ret = NULL;
- 		goto RETURN;
- 	}
- 
-+	alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
- 	ret = ipalloc(alignment, size);
- 
- RETURN:
- #ifdef MALLOC_XMALLOC
- 	if (opt_xmalloc && ret == NULL) {
- 		_malloc_message(_getprogname(),
- 		": (malloc) Error in memalign(): out of memory\n", "", "");
- 		abort();

mozilla-plugin.patch

@@ -1,10 +0,0 @@
-diff -up mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in
---- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old	2009-11-25 05:13:11.000000000 +0100
-+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in	2009-12-03 10:14:41.000000000 +0100
-@@ -5,5 +5,5 @@ includedir=%includedir%
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
- Version: %MOZILLA_VERSION%
--Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
-+Cflags: -I${includedir} -DXP_UNIX %ojidef%
- 

mozilla-ps-pdf-simplify-operators.patch

@@ -1,42 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=435313
-
-Index: mozilla/gfx/thebes/public/gfxPDFSurface.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v
-retrieving revision 1.13
-diff -d -u -p -r1.13 gfxPDFSurface.h
---- mozilla/gfx/thebes/public/gfxPDFSurface.h	19 Mar 2008 20:51:42 -0000	1.13
-+++ mozilla/gfx/thebes/public/gfxPDFSurface.h	23 May 2008 00:50:31 -0000
-@@ -63,7 +63,11 @@ public:
-     // this is in points!
-     const gfxSize& GetSize() const { return mSize; }
- 
--    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
-+    virtual PRInt32 GetDefaultContextFlags() const
-+    {
-+        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
-+               gfxContext::FLAG_DISABLE_SNAPPING;
-+    }
- 
- private:
-     nsCOMPtr<nsIOutputStream> mStream;
-Index: mozilla/gfx/thebes/public/gfxPSSurface.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v
-retrieving revision 1.13
-diff -d -u -p -r1.13 gfxPSSurface.h
---- mozilla/gfx/thebes/public/gfxPSSurface.h	19 Mar 2008 20:51:42 -0000	1.13
-+++ mozilla/gfx/thebes/public/gfxPSSurface.h	23 May 2008 00:50:31 -0000
-@@ -63,7 +63,11 @@ public:
-     // this is in points!
-     const gfxSize& GetSize() const { return mSize; }
- 
--    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
-+    virtual PRInt32 GetDefaultContextFlags() const
-+    {
-+        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
-+               gfxContext::FLAG_DISABLE_SNAPPING;
-+    }
- 
- private:
-     nsCOMPtr<nsIOutputStream> mStream;

sources

@@ -1 +1 @@
-458051557ff49e6a352c1d56eee5782a  xulrunner-1.9.2.1.source.tar.bz2
+2f1b6f82c6f3fa59254b32468e29e008  xulrunner-1.9.2.18.source.tar.bz2

xulrunner-mozconfig

@@ -11,7 +11,7 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-sqlite Temporary since System Sqlite library is not compiled with SQLITE_SECURE_DELETE
 ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-strip
@@ -30,6 +30,7 @@ ac_add_options --enable-safe-browsing
 ac_add_options --enable-extensions=default
 ac_add_options --enable-libnotify
 ac_add_options --disable-necko-wifi
+ac_add_options --enable-startup-notification
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1

xulrunner-mozconfig-debuginfo

@@ -0,0 +1,5 @@
+# For mozilla's debuginfo:
+export CFLAGS="$CFLAGS -gdwarf-2"
+export CXXFLAGS="$CXXFLAGS -gdwarf-2"
+export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-crashreporter

xulrunner.spec

@@ -1,10 +1,18 @@
 # Minimal required versions
 %define nspr_version 4.8
-%define nss_version 3.12.3.99
+%define nss_version 3.12.8
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.2
+# 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)
@@ -14,7 +22,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.2.1
+Version:        1.9.2.18
 Release:        1%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -22,6 +30,7 @@ Group:          Applications/Internet
 # You can get sources at ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
 Source0:        %{name}-%{version}%{?pretag}.source.tar.bz2
 Source10:       %{name}-mozconfig
+Source11:       %{name}-mozconfig-debuginfo
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
 Source23:       %{name}.1
@@ -31,16 +40,14 @@ Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
 Patch3:         mozilla-jemalloc.patch
 Patch4:         mozilla-about-firefox-version.patch
-Patch5:         mozilla-jemalloc-526152.patch
 Patch7:         xulrunner-1.9.2.1-build.patch
-Patch8:         mozilla-plugin.patch
 Patch9:         mozilla-build-sbrk.patch
 
 # Fedora specific patches
-Patch10:        mozilla-192-pkgconfig.patch
+Patch20:        mozilla-192-pkgconfig.patch
+Patch24:        crashreporter-remove-static.patch
 
 # Upstream patches
-Patch100:       mozilla-ps-pdf-simplify-operators.patch
 
 # ---------------------------------------------------
 
@@ -111,6 +118,8 @@ Requires: sqlite-devel
 Requires: startup-notification-devel
 Requires: alsa-lib-devel
 Requires: libnotify-devel
+Requires: curl-devel
+BuildRequires: libcurl-devel
 
 %description devel
 Gecko development files.
@@ -128,18 +137,17 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %patch1  -p1 -b .build
 %patch3  -p1 -b .jemalloc
 %patch4  -p1 -b .about-firefox-version
-%patch5  -p1 -b .jemalloc-526152
 %patch7  -p2 -b .del
-%patch8  -p1 -b .plugin
 %patch9  -p2 -b .sbrk
 
-%patch10 -p1 -b .pk
-
-%patch100 -p1 -b .ps-pdf-simplify-operators
-
+%patch20 -p1 -b .pk
+%patch24 -p1 -b .static
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
+%if %{enable_mozilla_crashreporter}
+%{__cat} %{SOURCE11} >> .mozconfig
+%endif
 
 #---------------------------------------------------------------------
 
@@ -160,7 +168,11 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
 
 # Mozilla builds with -Wall with exception of a few warnings which show up
 # everywhere in the code; so, don't override that.
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
+#
+# -fpermissive is needed to build with gcc 4.6+ which has become stricter
+#
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+                      %{__sed} -e 's/-Wall//' )
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
 
@@ -177,6 +189,12 @@ MOZ_SMP_FLAGS=-j1
 export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}"
 make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 
+# create debuginfo for crash-stats.mozilla.com
+%if %{enable_mozilla_crashreporter}
+#cd %{moz_objdir}
+make buildsymbols
+%endif
+
 #---------------------------------------------------------------------
 
 %install
@@ -259,6 +277,10 @@ pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
 install_file "jsautocfg"
 popd
 
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
+install_file "js-config"
+popd
+
 %{__install} -p -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \
@@ -330,6 +352,14 @@ ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat
 
+# Add debuginfo for crash-stats.mozilla.com 
+%if %{enable_mozilla_crashreporter}
+# Debug symbols are stored in /usr/lib even in x86_64 arch
+DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"`
+mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
+cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
+%endif
+
 #---------------------------------------------------------------------
 
 %clean
@@ -382,12 +412,20 @@ fi
 %{mozappdir}/platform.ini
 %{mozappdir}/dependentlibs.list
 %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
+%{mozappdir}/plugin-container
 
 # XXX See if these are needed still
 %{mozappdir}/updater*
 %exclude %{mozappdir}/update.locale
 %exclude %{mozappdir}/components/components.list
 
+%if %{enable_mozilla_crashreporter}
+%{mozappdir}/crashreporter
+%{mozappdir}/crashreporter.ini
+%{mozappdir}/Throbber-small.gif
+%{mozappdir}/plugin-container
+%endif
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_libdir}/%{name}-sdk-*
@@ -406,6 +444,60 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jun 21 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.18-1
+- Update to 1.9.2.18
+
+* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.17-2
+- Update to 1.9.2.17
+
+* Tue Mar 22 2011 Christopher Aillon <caillon@redhat.com> - 3.6.16-1
+- Update to 1.9.2.16
+
+* Mon Mar  7 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.15-1
+- Update to 1.9.2.15
+
+* Tue Mar  1 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.14-1
+- Update to 1.9.2.14
+
+* Thu Dec  9 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.13-1
+- Update to 1.9.2.13
+
+* Wed Oct 27 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.12-1
+- Update to 1.9.2.12
+
+* Tue Oct 19 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.11-1
+- Update to 1.9.2.11
+
+* Mon Sep 20 2010 Martin Stransky <stransky@redhat.com> 1.9.2.10-1
+- Update to 1.9.2.10
+
+* Mon Sep  6 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.9-1
+- Update to 1.9.2.9
+
+* Fri Jul 23 2010 Christopher Aillon <caillon@redhat.com> - 1.9.2.7-2
+- Add patch for mozbz#575836 (1.9.2.8)
+
+* Tue Jul 20 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.7-1
+- Update to 1.9.2.7
+
+* Wed Jun 30 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.6-1
+- Update to 1.9.2.6
+
+* Tue Jun 22 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.4-1
+- Update to 1.9.2.4
+
+* Fri Apr 2 2010 Martin Stransky <stransky@redhat.com> 1.9.2.3-1
+- Update to 1.9.2.3
+
+* Tue Mar 23 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.2-1
+- Update to 1.9.2.2
+
+* Mon Mar 15 2010 Colin Walters <walters@verbum.org> 1.9.2.1-3
+- Enable startup notification, closes #445543
+
+* Wed Feb 17 2010 Martin Stransky <stransky@redhat.com> 1.9.2.1-2
+- Added fix for #564184 - xulrunner-devel multilib conflict
+
 * Fri Jan 22 2010 Martin Stransky <stransky@redhat.com> 1.9.2.1-1
 - Update to 1.9.2.1