From 6003c7b9952bc70dcf425ca4a2e089e09acb8cae Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:26:55 +0000 Subject: [PATCH 01/27] Initialize branch F-12 for xulrunner --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From f107f7234e447c6713ab81b873f03687f8ad9ce2 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 27 Oct 2009 08:19:56 +0000 Subject: [PATCH 02/27] Update to 1.9.1.4 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 134fba9..23368be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ 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 diff --git a/sources b/sources index cb631af..dfb248b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca167e69180ab1230aea0763da270a95 xulrunner-1.9.1.3-source.tar.bz2 +0b6ccb1e50d96b7127a18a69399fcf05 xulrunner-1.9.1.4-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 91e525e..ad8d7b2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.3 +Version: 1.9.1.4 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -455,6 +455,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Oct 26 2009 Jan Horak - 1.9.1.4-1 +- Update to 1.9.1.4 + * Mon Sep 7 2009 Jan Horak - 1.9.1.3-1 - Update to 1.9.1.3 From 3aa62530b19dda9337e178478e74b95aa8381976 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 27 Oct 2009 08:42:30 +0000 Subject: [PATCH 03/27] Fixed patch --- mozilla-libnotify.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-libnotify.patch b/mozilla-libnotify.patch index 5155ef9..a090ef7 100644 --- a/mozilla-libnotify.patch +++ b/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 +LIBNOTIFY_VERSION=0.4 MSMANIFEST_TOOL= From 1de2d0d7e5147801d063d2b907f479186c6a5cc4 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 5 Nov 2009 09:13:43 +0000 Subject: [PATCH 04/27] Update to 1.9.1.5 --- .cvsignore | 1 + sources | 1 + xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 23368be..56e6814 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ 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 diff --git a/sources b/sources index dfb248b..d831ba0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0b6ccb1e50d96b7127a18a69399fcf05 xulrunner-1.9.1.4-source.tar.bz2 +b3d92dfb40584141dc1068efc9bdfccc xulrunner-1.9.1.5-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index ad8d7b2..115d584 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.4 +Version: 1.9.1.5 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -455,6 +455,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Nov 5 2009 Jan Horak - 1.9.1.5-1 +- Update to 1.9.1.5 + * Mon Oct 26 2009 Jan Horak - 1.9.1.4-1 - Update to 1.9.1.4 From 6f70efad6b332ca30aef81f191fc35246c4eaafc Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 19 Nov 2009 13:58:43 +0000 Subject: [PATCH 05/27] Removed old sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index d831ba0..759a7de 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -0b6ccb1e50d96b7127a18a69399fcf05 xulrunner-1.9.1.4-source.tar.bz2 b3d92dfb40584141dc1068efc9bdfccc xulrunner-1.9.1.5-source.tar.bz2 From ade4fea2660806f81fb6da3df6d8fa3855552ea2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:38 +0000 Subject: [PATCH 06/27] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e25ce9e..513ebfd 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xulrunner -# $Id$ +# $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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 9745e44efc9b6ad976a2f3e01503a8db2d3e21c7 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 16 Dec 2009 12:32:24 +0000 Subject: [PATCH 07/27] Update to 1.9.1.6 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 56e6814..796e5a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ 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.1.6.source.tar.bz2 diff --git a/sources b/sources index 759a7de..d5daf23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3d92dfb40584141dc1068efc9bdfccc xulrunner-1.9.1.5-source.tar.bz2 +54d73156dfedc6e4981f2a3c46817f9a xulrunner-1.9.1.6.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 115d584..93a8778 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -3,7 +3,7 @@ %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 @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.5 +Version: 1.9.1.6 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -455,6 +455,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Dec 16 2009 Jan Horak - 1.9.1.6-1 +- Update to 1.9.1.6 + * Thu Nov 5 2009 Jan Horak - 1.9.1.5-1 - Update to 1.9.1.5 From d930e36fe25770c7db897552bb71baea6357e3cf Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 16 Dec 2009 13:05:42 +0000 Subject: [PATCH 08/27] Fix source filename --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 93a8778..095f21d 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -16,7 +16,7 @@ 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 From dc32ddcb77e84719ffc66cda58acf5b36ef21dbd Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 16 Dec 2009 14:04:41 +0000 Subject: [PATCH 09/27] Fixed libnotify patch --- mozilla-libnotify.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-libnotify.patch b/mozilla-libnotify.patch index a090ef7..af76c47 100644 --- a/mozilla-libnotify.patch +++ b/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.16 + SQLITE_VERSION=3.6.16.1 +LIBNOTIFY_VERSION=0.4 MSMANIFEST_TOOL= From 71d0b224ab7d25bc59af2008b45bd51a320e5e9c Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 7 Jan 2010 10:54:26 +0000 Subject: [PATCH 10/27] Added fix for #480989 --- xulrunner.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 095f21d..3ebcd86 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,10 +9,13 @@ %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.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -68,7 +71,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 @@ -168,6 +171,15 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ #--------------------------------------------------------------------- %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} @@ -455,6 +467,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Jan 7 2010 Martin Stransky - 1.9.1.6-2 +- Added fix for #480989 + * Wed Dec 16 2009 Jan Horak - 1.9.1.6-1 - Update to 1.9.1.6 From ad25e8ed1677c96415dc8d978c0ed66772d40698 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 16 Feb 2010 10:42:29 +0000 Subject: [PATCH 11/27] Update to 1.9.1.8 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 796e5a9..c129263 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ 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.1.6.source.tar.bz2 +xulrunner-1.9.1.8.source.tar.bz2 diff --git a/sources b/sources index d5daf23..270b542 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54d73156dfedc6e4981f2a3c46817f9a xulrunner-1.9.1.6.source.tar.bz2 +f20fdadf6114e84456775cd4f0f39492 xulrunner-1.9.1.8.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 3ebcd86..8dd0256 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,8 +14,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.6 -Release: 2%{?dist} +Version: 1.9.1.8 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -467,6 +467,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Feb 16 2010 Jan Horak - 1.9.1.8-1 +- Update to 1.9.1.8 + * Thu Jan 7 2010 Martin Stransky - 1.9.1.6-2 - Added fix for #480989 From 3e3a9b6b3ac68ace700c55326ab572957055fd65 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 17 Feb 2010 14:30:57 +0000 Subject: [PATCH 12/27] Added fix for #564184 - xulrunner-devel multilib conflict --- xulrunner.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 8dd0256..cac9ecf 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1.8 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -296,6 +296,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 \ @@ -467,6 +471,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Feb 17 2010 Martin Stransky - 1.9.1.8-2 +- Added fix for #564184 - xulrunner-devel multilib conflict + * Tue Feb 16 2010 Jan Horak - 1.9.1.8-1 - Update to 1.9.1.8 From c40e556a702977519ac5807000d6462d9645f56b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 24 Mar 2010 14:16:08 +0000 Subject: [PATCH 13/27] - fix sparc arch multilib - dont try and build nanojit on sparc64 --- xulrunner.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index cac9ecf..ccbbc5f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1.8 -Release: 2%{?dist} +Release: 2%{?dist}.1 URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -168,6 +168,12 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %{__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 @@ -257,7 +263,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 @@ -268,7 +274,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" @@ -334,7 +340,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 @@ -346,7 +352,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 @@ -471,6 +477,10 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Mar 24 2010 Dennis Gilmore - 1.9.1.8-2.1 +- fix sparc arch multilib +- dont try and build nanojit on sparc64 + * Wed Feb 17 2010 Martin Stransky - 1.9.1.8-2 - Added fix for #564184 - xulrunner-devel multilib conflict From e54f4ed8e716123cdd8278ba9cc91d52cc4f9710 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 24 Mar 2010 15:41:22 +0000 Subject: [PATCH 14/27] add upstreamed patch thats approved but not applied --- ...-sparc-linux-sync_instruction_memory.patch | 24 +++++++++++++++++++ xulrunner.spec | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 xulrunner-1.9.1-sparc-linux-sync_instruction_memory.patch diff --git a/xulrunner-1.9.1-sparc-linux-sync_instruction_memory.patch b/xulrunner-1.9.1-sparc-linux-sync_instruction_memory.patch new file mode 100644 index 0000000..99f5689 --- /dev/null +++ b/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 + { diff --git a/xulrunner.spec b/xulrunner.spec index ccbbc5f..d34af1b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -39,6 +39,7 @@ 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 # --------------------------------------------------- @@ -163,6 +164,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch10 -p1 -b .pk %patch100 -p1 -b .ps-pdf-simplify-operators +%patch101 -p1 -b .sparc-linux-sync_instruction_memory %{__rm} -f .mozconfig From d4796c31b8e99b4e2b061f0385bd52c99f33025e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 24 Mar 2010 16:42:29 +0000 Subject: [PATCH 15/27] sparc patch needs to be applied -p2 --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index d34af1b..09d2233 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -164,7 +164,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch10 -p1 -b .pk %patch100 -p1 -b .ps-pdf-simplify-operators -%patch101 -p1 -b .sparc-linux-sync_instruction_memory +%patch101 -p2 -b .sparc-linux-sync_instruction_memory %{__rm} -f .mozconfig From 3832d4344c4f3e5f997316c42c0f6e52eeceddc1 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 30 Mar 2010 07:11:45 +0000 Subject: [PATCH 16/27] Update to 1.9.1.9 --- .cvsignore | 8 +------- sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index c129263..81c9cfb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1 @@ -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.1.6.source.tar.bz2 -xulrunner-1.9.1.8.source.tar.bz2 +xulrunner-1.9.1.9.source.tar.bz2 diff --git a/sources b/sources index 270b542..58852da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f20fdadf6114e84456775cd4f0f39492 xulrunner-1.9.1.8.source.tar.bz2 +e88edeff88efe2eeb718b184fe5295f8 xulrunner-1.9.1.9.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 09d2233..950617c 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,8 +14,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.8 -Release: 2%{?dist}.1 +Version: 1.9.1.9 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -479,6 +479,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 30 2010 Jan Horak - 1.9.1.9-1 +- Update to 1.9.1.9 + * Wed Mar 24 2010 Dennis Gilmore - 1.9.1.8-2.1 - fix sparc arch multilib - dont try and build nanojit on sparc64 From 4d4b586c1a907e9e71a293dbdee1482f32764656 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 10 May 2010 09:33:50 +0000 Subject: [PATCH 17/27] Added fix for mozbz#516124 --- mozilla-516124.patch | 30 ++++++++++++++++++++++++++++++ xulrunner.spec | 7 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 mozilla-516124.patch diff --git a/mozilla-516124.patch b/mozilla-516124.patch new file mode 100644 index 0000000..85d180c --- /dev/null +++ b/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, diff --git a/xulrunner.spec b/xulrunner.spec index 950617c..2fb3d81 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1.9 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -33,6 +33,7 @@ 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 @@ -160,6 +161,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch4 -p1 -b .about-firefox-version %patch5 -p1 -b .gtk-include %patch6 -p1 -b .libnotify +%patch7 -p1 -b .516124 %patch10 -p1 -b .pk @@ -479,6 +481,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon May 10 2010 Martin Stransky - 1.9.1.9-2 +- Added fix for mozbz#516124 + * Tue Mar 30 2010 Jan Horak - 1.9.1.9-1 - Update to 1.9.1.9 From 3dd0807575feceb7ba5e315c41fbae9e69a3939d Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 17 May 2010 12:08:01 +0000 Subject: [PATCH 18/27] Added fix for mozbz#499295 --- mozilla-499295.patch | 20 ++++++++++++++++++++ xulrunner.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 mozilla-499295.patch diff --git a/mozilla-499295.patch b/mozilla-499295.patch new file mode 100644 index 0000000..d95b234 --- /dev/null +++ b/mozilla-499295.patch @@ -0,0 +1,20 @@ +From: timeless@mozdev.org + +Bug 499295 NULL crash [@ nsPluginInstancePeerImpl::GetJSContext] +r=jst sr=jst + +diff --git a/modules/plugin/base/src/nsPluginInstancePeer.cpp b/modules/plugin/base/src/nsPluginInstancePeer.cpp +--- a/modules/plugin/base/src/nsPluginInstancePeer.cpp ++++ b/modules/plugin/base/src/nsPluginInstancePeer.cpp +@@ -689,8 +689,10 @@ nsPluginInstancePeerImpl::GetJSContext(J + { + *outContext = NULL; + nsresult rv = NS_ERROR_FAILURE; ++ if (!mOwner) ++ return rv; ++ + nsCOMPtr document; +- + rv = mOwner->GetDocument(getter_AddRefs(document)); + + if (NS_SUCCEEDED(rv) && document) { diff --git a/xulrunner.spec b/xulrunner.spec index 2fb3d81..d4e10c2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1.9 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -34,6 +34,7 @@ Patch4: mozilla-about-firefox-version.patch Patch5: xulrunner-gtk-include.patch Patch6: mozilla-libnotify.patch Patch7: mozilla-516124.patch +Patch8: mozilla-499295.patch # Fedora specific patches Patch10: mozilla-191-pkgconfig.patch @@ -162,6 +163,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch5 -p1 -b .gtk-include %patch6 -p1 -b .libnotify %patch7 -p1 -b .516124 +%patch8 -p1 -b .499295 %patch10 -p1 -b .pk @@ -481,6 +483,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon May 17 2010 Martin Stransky - 1.9.1.9-3 +- Added fix for mozbz#499295 + * Mon May 10 2010 Martin Stransky - 1.9.1.9-2 - Added fix for mozbz#516124 From 2e4996010e3ba012b7564e4e0a0085521eb59f31 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 22 Jun 2010 20:41:22 +0000 Subject: [PATCH 19/27] Update to 1.9.1.10 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 81c9cfb..3154cde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xulrunner-1.9.1.9.source.tar.bz2 +xulrunner-1.9.1.10.source.tar.bz2 diff --git a/sources b/sources index 58852da..1f73516 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e88edeff88efe2eeb718b184fe5295f8 xulrunner-1.9.1.9.source.tar.bz2 +38527ad16be09eb932b659df9ab3fb82 xulrunner-1.9.1.10.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index d4e10c2..a959a56 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,8 +14,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.9 -Release: 3%{?dist} +Version: 1.9.1.10 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -483,6 +483,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jun 22 2010 Jan Horak - 1.9.1.10-1 +- Update to 1.9.1.10 + * Mon May 17 2010 Martin Stransky - 1.9.1.9-3 - Added fix for mozbz#499295 From 89e2bece8d57aa5a170762adc76c736f88dbe7d9 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 20 Jul 2010 10:38:20 +0000 Subject: [PATCH 20/27] Update to 1.9.1.11 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3154cde..020fc01 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ xulrunner-1.9.1.9.source.tar.bz2 xulrunner-1.9.1.10.source.tar.bz2 +xulrunner-1.9.1.11.source.tar.bz2 diff --git a/sources b/sources index 1f73516..f80c8c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38527ad16be09eb932b659df9ab3fb82 xulrunner-1.9.1.10.source.tar.bz2 +be1b607d3f610d6c07322859b65ed494 xulrunner-1.9.1.11.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index a959a56..4d70fae 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,7 +14,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.10 +Version: 1.9.1.11 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -483,6 +483,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jul 20 2010 Jan Horak - 1.9.1.11-1 +- Update to 1.9.1.11 + * Tue Jun 22 2010 Jan Horak - 1.9.1.10-1 - Update to 1.9.1.10 From 37235a9b02be18fb359fb8ddafa8fc4e6c13f6f5 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 20 Jul 2010 10:49:26 +0000 Subject: [PATCH 21/27] Removed already included patch --- mozilla-499295.patch | 20 -------------------- xulrunner.spec | 2 -- 2 files changed, 22 deletions(-) delete mode 100644 mozilla-499295.patch diff --git a/mozilla-499295.patch b/mozilla-499295.patch deleted file mode 100644 index d95b234..0000000 --- a/mozilla-499295.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: timeless@mozdev.org - -Bug 499295 NULL crash [@ nsPluginInstancePeerImpl::GetJSContext] -r=jst sr=jst - -diff --git a/modules/plugin/base/src/nsPluginInstancePeer.cpp b/modules/plugin/base/src/nsPluginInstancePeer.cpp ---- a/modules/plugin/base/src/nsPluginInstancePeer.cpp -+++ b/modules/plugin/base/src/nsPluginInstancePeer.cpp -@@ -689,8 +689,10 @@ nsPluginInstancePeerImpl::GetJSContext(J - { - *outContext = NULL; - nsresult rv = NS_ERROR_FAILURE; -+ if (!mOwner) -+ return rv; -+ - nsCOMPtr document; -- - rv = mOwner->GetDocument(getter_AddRefs(document)); - - if (NS_SUCCEEDED(rv) && document) { diff --git a/xulrunner.spec b/xulrunner.spec index 4d70fae..47d1e5b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -34,7 +34,6 @@ Patch4: mozilla-about-firefox-version.patch Patch5: xulrunner-gtk-include.patch Patch6: mozilla-libnotify.patch Patch7: mozilla-516124.patch -Patch8: mozilla-499295.patch # Fedora specific patches Patch10: mozilla-191-pkgconfig.patch @@ -163,7 +162,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch5 -p1 -b .gtk-include %patch6 -p1 -b .libnotify %patch7 -p1 -b .516124 -%patch8 -p1 -b .499295 %patch10 -p1 -b .pk From a580f0b2e09ad14b670c7dde12c84f5e8f6d92ca Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Fri, 23 Jul 2010 20:30:39 +0000 Subject: [PATCH 22/27] - Add patch for mozbz#575836 (1.9.1.12) --- mozilla-575836.patch | 35 +++++++++++++++++++++++++++++++++++ xulrunner.spec | 7 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 mozilla-575836.patch diff --git a/mozilla-575836.patch b/mozilla-575836.patch new file mode 100644 index 0000000..5f21e7b --- /dev/null +++ b/mozilla-575836.patch @@ -0,0 +1,35 @@ +# HG changeset patch +# User Chris Jones +# Date 1279837785 14400 +# Node ID 2f748ad22bbbf50c47fb0783e8f948917f3e8990 +# Parent 3e8356d36728e61162b9d02b54676aef7b07f178 +Bug 575836: Fix logic here. r=jst r=josh a=beltzner + +diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp +--- a/layout/generic/nsObjectFrame.cpp ++++ b/layout/generic/nsObjectFrame.cpp +@@ -3144,9 +3144,10 @@ nsresult nsPluginInstanceOwner::EnsureCa + // to the bottom of the array if there isn't already a "src" specified. + PRUint16 numRealAttrs = mNumCachedAttrs; + nsAutoString data; +- if (mContent->Tag() == nsGkAtoms::object +- && !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) +- && mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data)) { ++ if (mContent->Tag() == nsGkAtoms::object && ++ !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) && ++ mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data) && ++ !data.IsEmpty()) { + mNumCachedAttrs++; + } + +@@ -3194,7 +3195,7 @@ nsresult nsPluginInstanceOwner::EnsureCa + } + + // if the conditions above were met, copy the "data" attribute to a "src" array entry +- if (data.Length()) { ++ if (!data.IsEmpty()) { + mCachedAttrParamNames [nextAttrParamIndex] = ToNewUTF8String(NS_LITERAL_STRING("SRC")); + mCachedAttrParamValues[nextAttrParamIndex] = ToNewUTF8String(data); + nextAttrParamIndex++; + + diff --git a/xulrunner.spec b/xulrunner.spec index 47d1e5b..76a3443 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1.11 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -41,6 +41,7 @@ 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 +Patch102: mozilla-575836.patch # --------------------------------------------------- @@ -167,6 +168,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch100 -p1 -b .ps-pdf-simplify-operators %patch101 -p2 -b .sparc-linux-sync_instruction_memory +%patch102 -p1 -b .575837 %{__rm} -f .mozconfig @@ -481,6 +483,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Jul 23 2010 Christopher Aillon - 1.9.1.11-2 +- Add patch for mozbz#575836 (1.9.1.12) + * Tue Jul 20 2010 Jan Horak - 1.9.1.11-1 - Update to 1.9.1.11 From ec1deb2241c34ec86885236add6942a8986bc293 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:15:37 +0000 Subject: [PATCH 23/27] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 513ebfd..0000000 --- a/Makefile +++ /dev/null @@ -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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From ec0aa7d4aa86ffd63c848df3b097d39b5ee3d005 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 7 Sep 2010 09:50:47 +0200 Subject: [PATCH 24/27] Update to 3.5.12 --- .gitignore | 2 ++ mozilla-575836.patch | 35 ----------------------------------- sources | 2 +- xulrunner.spec | 10 +++++----- 4 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 mozilla-575836.patch diff --git a/.gitignore b/.gitignore index 020fc01..f875a80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ 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 diff --git a/mozilla-575836.patch b/mozilla-575836.patch deleted file mode 100644 index 5f21e7b..0000000 --- a/mozilla-575836.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Chris Jones -# Date 1279837785 14400 -# Node ID 2f748ad22bbbf50c47fb0783e8f948917f3e8990 -# Parent 3e8356d36728e61162b9d02b54676aef7b07f178 -Bug 575836: Fix logic here. r=jst r=josh a=beltzner - -diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp ---- a/layout/generic/nsObjectFrame.cpp -+++ b/layout/generic/nsObjectFrame.cpp -@@ -3144,9 +3144,10 @@ nsresult nsPluginInstanceOwner::EnsureCa - // to the bottom of the array if there isn't already a "src" specified. - PRUint16 numRealAttrs = mNumCachedAttrs; - nsAutoString data; -- if (mContent->Tag() == nsGkAtoms::object -- && !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) -- && mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data)) { -+ if (mContent->Tag() == nsGkAtoms::object && -+ !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) && -+ mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data) && -+ !data.IsEmpty()) { - mNumCachedAttrs++; - } - -@@ -3194,7 +3195,7 @@ nsresult nsPluginInstanceOwner::EnsureCa - } - - // if the conditions above were met, copy the "data" attribute to a "src" array entry -- if (data.Length()) { -+ if (!data.IsEmpty()) { - mCachedAttrParamNames [nextAttrParamIndex] = ToNewUTF8String(NS_LITERAL_STRING("SRC")); - mCachedAttrParamValues[nextAttrParamIndex] = ToNewUTF8String(data); - nextAttrParamIndex++; - - diff --git a/sources b/sources index f80c8c6..6c2a41c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be1b607d3f610d6c07322859b65ed494 xulrunner-1.9.1.11.source.tar.bz2 +bd1e27ef2494954dd920dede9165e9db xulrunner-1.9.1.12.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 76a3443..97a6715 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,8 +14,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.11 -Release: 2%{?dist} +Version: 1.9.1.12 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -41,7 +41,6 @@ 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 -Patch102: mozilla-575836.patch # --------------------------------------------------- @@ -168,8 +167,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch100 -p1 -b .ps-pdf-simplify-operators %patch101 -p2 -b .sparc-linux-sync_instruction_memory -%patch102 -p1 -b .575837 - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -483,6 +480,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Sep 6 2010 Jan Horak - 1.9.1.12-1 +- Update to 1.9.1.12 + * Fri Jul 23 2010 Christopher Aillon - 1.9.1.11-2 - Add patch for mozbz#575836 (1.9.1.12) From 105a3160872fa57c62fc61658df65d0ca88b8631 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 19 Oct 2010 12:20:15 +0200 Subject: [PATCH 25/27] Update to 1.9.1.14 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f875a80..cb644de 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 diff --git a/sources b/sources index 6c2a41c..22e641f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd1e27ef2494954dd920dede9165e9db xulrunner-1.9.1.12.source.tar.bz2 +547b36fda36b9de89ce8c2d8336deabc xulrunner-1.9.1.14.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 97a6715..25aaf62 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,7 +14,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.12 +Version: 1.9.1.14 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -480,6 +480,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Oct 19 2010 Jan Horak - 1.9.1.14-1 +- Update to 1.9.1.14 + * Mon Sep 6 2010 Jan Horak - 1.9.1.12-1 - Update to 1.9.1.12 From 481ddc4b5a278559802885669463cb8202a9b974 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 19 Oct 2010 17:58:58 +0200 Subject: [PATCH 26/27] Removed unrequired patch --- mozilla-build.patch | 23 ----------------------- xulrunner.spec | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 mozilla-build.patch diff --git a/mozilla-build.patch b/mozilla-build.patch deleted file mode 100644 index a956e5f..0000000 --- a/mozilla-build.patch +++ /dev/null @@ -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) diff --git a/xulrunner.spec b/xulrunner.spec index 25aaf62..de9f7c2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -27,7 +27,6 @@ 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 @@ -155,7 +154,6 @@ 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 From 953ca3face80247ed285b28e8d4a1f8a7d7b44b1 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 27 Oct 2010 17:44:44 +0200 Subject: [PATCH 27/27] Update to 1.9.1.15 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cb644de..405930f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ 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 diff --git a/sources b/sources index 22e641f..d2ad1e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -547b36fda36b9de89ce8c2d8336deabc xulrunner-1.9.1.14.source.tar.bz2 +876699d59db7419bacc03cae9576f5a1 xulrunner-1.9.1.15.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index de9f7c2..ffa215b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,7 +14,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.14 +Version: 1.9.1.15 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -478,6 +478,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Oct 27 2010 Martin Stransky - 1.9.1.15-1 +- Update to 1.9.1.15 + * Tue Oct 19 2010 Jan Horak - 1.9.1.14-1 - Update to 1.9.1.14