Update to 1.9.1.15

- dont try and build nanojit on sparc64

.cvsignore

@@ -1,3 +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

.gitignore

@@ -0,0 +1,7 @@
+xulrunner-1.9.1.9.source.tar.bz2
+xulrunner-1.9.1.10.source.tar.bz2
+xulrunner-1.9.1.11.source.tar.bz2
+/xulrunner-1.9.1.12.source.tag.bz2
+/xulrunner-1.9.1.12.source.tar.bz2
+/xulrunner-1.9.1.14.source.tar.bz2
+/xulrunner-1.9.1.15.source.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xulrunner
-# $Id$
-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 $$/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)

mozilla-516124.patch

@@ -0,0 +1,30 @@
+--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
++++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
+@@ -245,23 +245,25 @@ nsAlertsIconListener::StartRequest(const
+   return il->LoadImage(imageUri, nsnull, nsnull, nsnull, this,
+                        nsnull, nsIRequest::LOAD_NORMAL, nsnull, nsnull,
+                        getter_AddRefs(mIconRequest));
+ }
+ 
+ void
+ nsAlertsIconListener::SendCallback()
+ {
+-  mAlertListener->Observe(NULL, "alertclickcallback", mAlertCookie.get());
++  if (mAlertListener)
++    mAlertListener->Observe(NULL, "alertclickcallback", mAlertCookie.get());
+ }
+ 
+ void
+ nsAlertsIconListener::SendClosed()
+ {
+-  mAlertListener->Observe(NULL, "alertfinished", mAlertCookie.get());
++  if (mAlertListener)
++    mAlertListener->Observe(NULL, "alertfinished", mAlertCookie.get());
+ }
+ 
+ nsresult
+ nsAlertsIconListener::InitAlertAsync(const nsAString & aImageUrl,
+                                      const nsAString & aAlertTitle, 
+                                      const nsAString & aAlertText,
+                                      PRBool aAlertTextClickable,
+                                      const nsAString & aAlertCookie,

mozilla-build.patch

@@ -1,23 +0,0 @@
-diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in
---- mozilla/security/manager/Makefile.in.old	2007-10-25 00:25:30.000000000 +0200
-+++ mozilla/security/manager/Makefile.in	2007-11-06 10:57:39.000000000 +0100
-@@ -153,7 +153,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
- DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
- DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
- DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
--DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
- ifdef NSS_DISABLE_DBM 
- DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
- endif
-diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in
---- mozilla/security/manager/ssl/src/Makefile.in.old	2007-10-19 21:16:36.000000000 +0200
-+++ mozilla/security/manager/ssl/src/Makefile.in	2007-11-06 10:57:52.000000000 +0100
-@@ -134,8 +134,6 @@ REQUIRES	= nspr \
- 
- EXTRA_DEPS = $(NSS_DEP_LIBS)
- 
--DEFINES += -DNSS_ENABLE_ECC
--
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
- LOCAL_INCLUDES += $(NSS_CFLAGS)

mozilla-libnotify.patch

@@ -29,7 +29,7 @@ diff -up mozilla-1.9.1/configure.in.libnotify mozilla-1.9.1/configure.in
 @@ -132,6 +132,7 @@ LIBGNOME_VERSION=2.0
  STARTUP_NOTIFICATION_VERSION=0.8
  DBUS_VERSION=0.60
- SQLITE_VERSION=3.6.10
+ SQLITE_VERSION=3.6.16.1
 +LIBNOTIFY_VERSION=0.4
  
  MSMANIFEST_TOOL=

sources

@@ -1 +1 @@
-ca167e69180ab1230aea0763da270a95  xulrunner-1.9.1.3-source.tar.bz2
+876699d59db7419bacc03cae9576f5a1  xulrunner-1.9.1.15.source.tar.bz2

xulrunner-1.9.1-sparc-linux-sync_instruction_memory.patch

@@ -0,0 +1,24 @@
+diff -up xulrunner-1.9.1/mozilla-1.9.1/js/src/nanojit/Assembler.cpp.BAD xulrunner-1.9.1/mozilla-1.9.1/js/src/nanojit/Assembler.cpp
+--- xulrunner-1.9.1/mozilla-1.9.1/js/src/nanojit/Assembler.cpp.BAD	2009-07-01 15:22:47.534707233 -0400
++++ xulrunner-1.9.1/mozilla-1.9.1/js/src/nanojit/Assembler.cpp	2009-07-02 13:18:40.509279263 -0400
+@@ -50,8 +50,20 @@ extern "C" void __clear_cache(char *BEG,
+ #endif
+ 
+ #ifdef AVMPLUS_SPARC
++#ifdef __linux__
++void sync_instruction_memory(caddr_t v, u_int len)
++{
++	caddr_t end = v + len;
++	caddr_t p = v;
++	while (p < end) {
++		asm("flush %0" : : "r" (p));
++		p += 32;
++	}
++}
++#else
+ extern  "C"	void sync_instruction_memory(caddr_t v, u_int len);
+ #endif
++#endif
+ 
+ namespace nanojit
+ {

xulrunner.spec

@@ -3,20 +3,23 @@
 %define nss_version 3.12.3.99
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
-%define sqlite_version 3.6.14
+%define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.1
 
 %define version_internal  1.9.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
+# The actual sqlite version (see #480989):
+%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
+
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.3
+Version:        1.9.1.15
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        %{name}-%{version}-source.tar.bz2
+Source0:        %{name}-%{version}.source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -24,18 +27,19 @@ Source23:       %{name}.1
 
 # build patches
 Patch0:         xulrunner-version.patch
-Patch1:         mozilla-build.patch
 Patch2:         mozilla-191-path.patch
 Patch3:         mozilla-jemalloc.patch
 Patch4:         mozilla-about-firefox-version.patch
 Patch5:         xulrunner-gtk-include.patch
 Patch6:         mozilla-libnotify.patch
+Patch7:         mozilla-516124.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
 
 # Upstream patches
 Patch100:       mozilla-ps-pdf-simplify-operators.patch
+Patch101:       xulrunner-1.9.1-sparc-linux-sync_instruction_memory.patch
 
 # ---------------------------------------------------
 
@@ -68,7 +72,7 @@ BuildRequires:  autoconf213
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
-Requires:       sqlite >= %{sqlite_version}
+Requires:       sqlite >= %{sqlite_build_version}
 Provides:       gecko-libs = %{version}
 
 %description
@@ -150,24 +154,39 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
 
 
-%patch1  -p1 -b .build
 %patch2  -p1 -b .path
 %patch3  -p1 -b .jemalloc
 %patch4  -p1 -b .about-firefox-version
 %patch5  -p1 -b .gtk-include
 %patch6  -p1 -b .libnotify
+%patch7  -p1 -b .516124
 
 %patch10 -p1 -b .pk
 
 %patch100 -p1 -b .ps-pdf-simplify-operators
-
+%patch101 -p2 -b .sparc-linux-sync_instruction_memory
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 
+# Upstream bug filed without resolution
+# for now make sure jit is not enabled on sparc64
+%ifarch sparc64
+echo "ac_add_options --disable-jit" >> .mozconfig
+%endif
+
 #---------------------------------------------------------------------
 
 %build
+# Do not proceed with build if the sqlite require would be broken:
+# make sure the minimum requirement is non-empty, ...
+sqlite_version=$(expr "%{sqlite_version}" : '\([0-9]*\.\)[0-9]*\.') || exit 1
+# ... and that major number of the computed build-time version matches:
+case "%{sqlite_build_version}" in
+  "$sqlite_version"*) ;;
+  *) exit 1 ;;
+esac
+
 cd %{tarballdir}
 
 INTERNAL_GECKO=%{version_internal}
@@ -245,7 +264,7 @@ cd -
   $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/stable
 
 # Fix multilib devel conflicts...
-%ifarch x86_64 ia64 s390x ppc64
+%ifarch x86_64 ia64 s390x ppc64 sparc64
 %define mozbits 64
 %else
 %define mozbits 32
@@ -256,7 +275,7 @@ genheader=$*
 mv ${genheader}.h ${genheader}%{mozbits}.h
 cat > ${genheader}.h << EOF
 /* This file exists to fix multilib conflicts */
-#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__))
 #include "${genheader}64.h"
 #else
 #include "${genheader}32.h"
@@ -284,6 +303,10 @@ pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable
 install_file "jsautocfg"
 popd
 
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/js
+install_file "js-config"
+popd
+
 %{__install} -p -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \
@@ -318,7 +341,7 @@ done
 popd
 
 # GRE stuff
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define gre_conf_file gre64.conf
 %else
 %define gre_conf_file gre.conf
@@ -330,7 +353,7 @@ MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.`
 chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file}
 
 # Library path
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define ld_conf_file xulrunner-64.conf
 %else
 %define ld_conf_file xulrunner-32.conf
@@ -455,6 +478,55 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Oct 27 2010 Martin Stransky <stransky@redhat.com> - 1.9.1.15-1
+- Update to 1.9.1.15
+
+* Tue Oct 19 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.14-1
+- Update to 1.9.1.14
+
+* Mon Sep  6 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.12-1
+- Update to 1.9.1.12
+
+* Fri Jul 23 2010 Christopher Aillon <caillon@redhat.com> - 1.9.1.11-2
+- Add patch for mozbz#575836 (1.9.1.12)
+
+* Tue Jul 20 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.11-1
+- Update to 1.9.1.11
+
+* Tue Jun 22 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.10-1
+- Update to 1.9.1.10
+
+* Mon May 17 2010 Martin Stransky <stransky@redhat.com> - 1.9.1.9-3
+- Added fix for mozbz#499295
+
+* Mon May 10 2010 Martin Stransky <stransky@redhat.com> - 1.9.1.9-2
+- Added fix for mozbz#516124
+
+* Tue Mar 30 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.9-1
+- Update to 1.9.1.9
+
+* Wed Mar 24 2010 Dennis Gilmore <dennis@ausil.us> - 1.9.1.8-2.1
+- fix sparc arch multilib
+- dont try and build nanojit on sparc64
+
+* Wed Feb 17 2010 Martin Stransky <stransky@redhat.com> - 1.9.1.8-2
+- Added fix for #564184 - xulrunner-devel multilib conflict
+
+* Tue Feb 16 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.8-1
+- Update to 1.9.1.8
+
+* Thu Jan 7 2010 Martin Stransky <stransky@redhat.com> - 1.9.1.6-2
+- Added fix for #480989
+
+* Wed Dec 16 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.6-1
+- Update to 1.9.1.6
+
+* Thu Nov  5 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.5-1
+- Update to 1.9.1.5
+
+* Mon Oct 26 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.4-1
+- Update to 1.9.1.4
+
 * Mon Sep  7 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.3-1
 - Update to 1.9.1.3