From d7348bd48dd96ee3653ad028e33f52c5fee76b7a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:07:12 +0000 Subject: [PATCH 01/24] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 7798be0f413caac21580f9817bbd276686c37ac8 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 27 Apr 2009 18:21:10 +0000 Subject: [PATCH 02/24] - 1.9.1 beta 4 --- .cvsignore | 2 +- mfsa-2009-12.patch | 57 ------------------------------------- mfsa-2009-13.patch | 20 ------------- mozilla-191-pkgconfig.patch | 4 +-- sources | 2 +- xulrunner-elif.patch | 12 -------- xulrunner-pango.patch | 30 ------------------- xulrunner.spec | 17 ++++------- 8 files changed, 10 insertions(+), 134 deletions(-) delete mode 100644 mfsa-2009-12.patch delete mode 100644 mfsa-2009-13.patch delete mode 100644 xulrunner-elif.patch delete mode 100644 xulrunner-pango.patch diff --git a/.cvsignore b/.cvsignore index ac9bdc3..3475fdf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.1b3-source.tar.bz2 +xulrunner-1.9.1b4-source.tar.bz2 diff --git a/mfsa-2009-12.patch b/mfsa-2009-12.patch deleted file mode 100644 index 85d7e7f..0000000 --- a/mfsa-2009-12.patch +++ /dev/null @@ -1,57 +0,0 @@ -# HG changeset patch -# User Blake Kaplan -# Date 1238011664 25200 -# Node ID 167d03699cdb98daa726b9024dd80ac3d9e80e06 -# Parent c8c6ed1b96a72df7d47fb0ce014b18ec3f71abc7 -Bug 485217 - Pop the eval context before returning. r+sr=peterv - ---- a/content/xslt/src/xslt/txKeyFunctionCall.cpp Wed Mar 25 22:10:03 2009 +0200 -+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp Wed Mar 25 13:07:44 2009 -0700 -@@ -395,9 +395,9 @@ nsresult txXSLKey::testNode(const txXPat - nsRefPtr exprResult; - rv = mKeys[currKey].useExpr->evaluate(&evalContext, - getter_AddRefs(exprResult)); -- NS_ENSURE_SUCCESS(rv, rv); - - aEs.popEvalContext(); -+ NS_ENSURE_SUCCESS(rv, rv); - - if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = static_cast - -# HG changeset patch -# User Blake Kaplan -# Date 1238052189 25200 -# Node ID 4552d789ad8ff607e2596ad3107d33a3d0e92654 -# Parent f087a48da189d0d6404040bc90a97f2624ab544f -Bug 485286 - Allocate all of these consistently. r+sr=peterv/sicking (a=ss for checkin into a CLOSED TREE). - ---- a/content/xslt/src/xslt/txKeyFunctionCall.cpp Wed Mar 25 16:59:14 2009 -0500 -+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp Thu Mar 26 00:23:09 2009 -0700 -@@ -388,16 +388,19 @@ nsresult txXSLKey::testNode(const txXPat - PRUint32 currKey, numKeys = mKeys.Length(); - for (currKey = 0; currKey < numKeys; ++currKey) { - if (mKeys[currKey].matchPattern->matches(aNode, &aEs)) { -- txSingleNodeContext evalContext(aNode, &aEs); -- nsresult rv = aEs.pushEvalContext(&evalContext); -+ txSingleNodeContext *evalContext = -+ new txSingleNodeContext(aNode, &aEs); -+ NS_ENSURE_TRUE(evalContext, NS_ERROR_OUT_OF_MEMORY); -+ -+ nsresult rv = aEs.pushEvalContext(evalContext); - NS_ENSURE_SUCCESS(rv, rv); - - nsRefPtr exprResult; -- rv = mKeys[currKey].useExpr->evaluate(&evalContext, -+ rv = mKeys[currKey].useExpr->evaluate(evalContext, - getter_AddRefs(exprResult)); -+ NS_ENSURE_SUCCESS(rv, rv); - -- aEs.popEvalContext(); -- NS_ENSURE_SUCCESS(rv, rv); -+ delete aEs.popEvalContext(); - - if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = static_cast - - diff --git a/mfsa-2009-13.patch b/mfsa-2009-13.patch deleted file mode 100644 index 7c6fa4a..0000000 --- a/mfsa-2009-13.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Olli Pettay -# Date 1237909358 -7200 -# Node ID 60caf43ff9c21e7b4d6b07e3d2d8413196a86b25 -# Parent 726d6e0d61def97cd6f9d72949ab283b83902d53 -Bug 484320, r=dveditz, sr=mrbkap, a=blocking1.9.1 - ---- a/layout/xul/base/src/tree/src/nsTreeSelection.cpp Wed Mar 18 11:00:20 2009 +0000 -+++ b/layout/xul/base/src/tree/src/nsTreeSelection.cpp Tue Mar 24 17:42:38 2009 +0200 -@@ -268,6 +268,8 @@ nsTreeSelection::~nsTreeSelection() - nsTreeSelection::~nsTreeSelection() - { - delete mFirstRange; -+ if (mSelectTimer) -+ mSelectTimer->Cancel(); - } - - // QueryInterface implementation for nsBoxObject - - diff --git a/mozilla-191-pkgconfig.patch b/mozilla-191-pkgconfig.patch index 62dfddf..d894533 100644 --- a/mozilla-191-pkgconfig.patch +++ b/mozilla-191-pkgconfig.patch @@ -138,5 +138,5 @@ diff -r f1af606531f5 xulrunner/installer/mozilla-plugin.pc.in Description: Mozilla Plug-In API Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% --Cflags: -I${includedir}/stable -+Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin +-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% ++Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -I${includedir}/java -I${includedir}/plugin diff --git a/sources b/sources index f50f6ea..415a61e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61cd1a7fc587f6d2a33c564033198e2c xulrunner-1.9.1b3-source.tar.bz2 +ff6bf463300cb56bcf750973b2af3d80 xulrunner-1.9.1b4-source.tar.bz2 diff --git a/xulrunner-elif.patch b/xulrunner-elif.patch deleted file mode 100644 index 702d4f1..0000000 --- a/xulrunner-elif.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xulrunner-1.9.1/mozilla-central/toolkit/xre/nsAppRunner.cpp.old xulrunner-1.9.1/mozilla-central/toolkit/xre/nsAppRunner.cpp ---- mozilla-central/toolkit/xre/nsAppRunner.cpp.old 2008-12-10 20:07:01.000000000 +0100 -+++ mozilla-central/toolkit/xre/nsAppRunner.cpp 2009-02-27 17:17:59.000000000 +0100 -@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI - if (NS_FAILED(rv)) - return rv; - --#elif -+#else - #error Oops, you need platform-specific code here - #endif - diff --git a/xulrunner-pango.patch b/xulrunner-pango.patch deleted file mode 100644 index c832cf7..0000000 --- a/xulrunner-pango.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp ---- mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old 2009-02-27 16:19:07.000000000 +0100 -+++ mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp 2009-02-27 16:37:30.000000000 +0100 -@@ -1299,12 +1299,11 @@ gfx_pango_font_map_context_substitute(Pa - - static PangoFcFont * - gfx_pango_font_map_create_font(PangoFcFontMap *fontmap, -- PangoContext *context, -- const PangoFontDescription *desc, -- FcPattern *pattern) -+ PangoFcFontKey *fontkey) - { -+ const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey); - return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT, -- "pattern", pattern, NULL)); -+ "pattern", p_pattern, NULL)); - } - - static void -@@ -1324,9 +1323,8 @@ gfx_pango_font_map_class_init(gfxPangoFo - // context_key_* virtual functions are only necessary if we want to - // dynamically respond to changes in the screen cairo_font_options_t. - -- // context_substitute and get_font are not likely to be used but -+ // get_font is not likely to be used but - // implemented because the class makes them available. -- fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute; - fcfontmap_class->create_font = gfx_pango_font_map_create_font; - } - diff --git a/xulrunner.spec b/xulrunner.spec index 374e9f1..9ca3431 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -3,7 +3,7 @@ %define cairo_version 1.6.0 %define lcms_version 1.17 %define freetype_version 2.1.9 -%define sqlite_version 3.6.7 +%define sqlite_version 3.6.10 %define tarballdir mozilla-1.9.1 %define version_internal 1.9.1 @@ -12,11 +12,11 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1 -Release: 0.11.beta3%{?dist} +Release: 0.20.beta4%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: xulrunner-%{version}b3-source.tar.bz2 +Source0: xulrunner-%{version}b4-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -27,16 +27,12 @@ Patch0: xulrunner-version.patch Patch1: mozilla-build.patch Patch2: mozilla-191-path.patch Patch3: mozilla-jemalloc.patch -Patch4: xulrunner-pango.patch -Patch5: xulrunner-elif.patch # Fedora specific patches Patch10: mozilla-191-pkgconfig.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch -Patch101: mfsa-2009-12.patch -Patch102: mfsa-2009-13.patch # --------------------------------------------------- @@ -151,15 +147,11 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch1 -p1 -b .build %patch2 -p1 -b .path %patch3 -p1 -b .jemalloc -%patch4 -p1 -b .pango -%patch5 -p1 -b .elif %patch10 -p1 -b .pk %patch100 -p1 -b .ps-pdf-simplify-operators -%patch101 -p1 -b .mfsa-2009-12 -%patch102 -p1 -b .mfsa-2009-13 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -452,6 +444,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Apr 27 2009 Christopher Aillon 1.9.1-0.20 +- 1.9.1 beta 4 + * Fri Mar 27 2009 Christopher Aillon 1.9.1-0.11 - Add patches for MFSA-2009-12, MFSA-2009-13 From d73b1e973b1cb1ae7a6e46693fea8a9b65896ff9 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 30 Jun 2009 15:46:27 +0000 Subject: [PATCH 03/24] - Update to 1.9.1 final release --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3475fdf..80011f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.1b4-source.tar.bz2 +xulrunner-1.9.1-source.tar.bz2 diff --git a/sources b/sources index 415a61e..ee01ec8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff6bf463300cb56bcf750973b2af3d80 xulrunner-1.9.1b4-source.tar.bz2 +6dd59399db08963ef022a1d0e5010053 xulrunner-1.9.1-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 9ca3431..daaebe0 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -12,11 +12,11 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1 -Release: 0.20.beta4%{?dist} +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: xulrunner-%{version}b4-source.tar.bz2 +Source0: xulrunner-%{version}-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -444,6 +444,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jun 30 2009 Christopher Aillon 1.9.1-1 +- Update to 1.9.1 final release + * Mon Apr 27 2009 Christopher Aillon 1.9.1-0.20 - 1.9.1 beta 4 From 7b78d5b67daa285c7bfbf6d619eed3cbd87785b7 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 30 Jun 2009 16:05:44 +0000 Subject: [PATCH 04/24] update nspr req --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index daaebe0..39686f9 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -1,4 +1,4 @@ -%define nspr_version 4.7.1 +%define nspr_version 4.8 %define nss_version 3.12.1.1 %define cairo_version 1.6.0 %define lcms_version 1.17 From 478258f0fedfa887d71f03dc3df278cb95398901 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 30 Jun 2009 16:48:27 +0000 Subject: [PATCH 05/24] %exclude %{mozappdir}/update.locale --- xulrunner.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xulrunner.spec b/xulrunner.spec index 39686f9..5e5aab5 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -401,6 +401,8 @@ fi # XXX See if these are needed still %{mozappdir}/updater* +%exclude %{mozappdir}/update.locale + %files devel %defattr(-,root,root,-) %dir %{_datadir}/idl/%{name}*%{version_internal} From 7e06667b487595c8eedd2b70acef1e5465b7de6d Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 30 Jun 2009 21:23:01 +0000 Subject: [PATCH 06/24] - Build using system hunspell --- xulrunner-mozconfig | 2 +- xulrunner.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 52f78cf..f0a1e78 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -13,7 +13,7 @@ ac_add_options --with-system-nss 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-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-cairo ac_add_options --with-pthreads diff --git a/xulrunner.spec b/xulrunner.spec index 5e5aab5..fac87d8 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -12,7 +12,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -446,6 +446,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jun 30 2009 Yanko Kaneti - 1.9.1-2 +- Build using system hunspell + * Tue Jun 30 2009 Christopher Aillon 1.9.1-1 - Update to 1.9.1 final release From 6463ac5fd110816d5f3438ffd546560968de1cd3 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 13 Jul 2009 08:55:39 +0000 Subject: [PATCH 07/24] Fixed wrong version of Firefox when loading 'about:' as location --- mozilla-about-firefox-version.patch | 12 ++++++++++++ xulrunner.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 mozilla-about-firefox-version.patch diff --git a/mozilla-about-firefox-version.patch b/mozilla-about-firefox-version.patch new file mode 100644 index 0000000..115664c --- /dev/null +++ b/mozilla-about-firefox-version.patch @@ -0,0 +1,12 @@ +diff -up mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version mozilla-1.9.1/toolkit/content/Makefile.in +--- mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version 2009-06-29 18:15:23.000000000 +0200 ++++ mozilla-1.9.1/toolkit/content/Makefile.in 2009-07-07 13:43:54.000000000 +0200 +@@ -46,7 +46,7 @@ CHROME_DEPS = buildconfig.html + include $(DEPTH)/config/autoconf.mk + + DEFINES += \ +- -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ ++ -DMOZ_APP_VERSION=$(FIREFOX_VERSION) \ + -Dtarget="$(target)" \ + -Dac_configure_args="$(ac_configure_args)" \ + -DCC="$(CC)" \ diff --git a/xulrunner.spec b/xulrunner.spec index fac87d8..4d39f9c 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -12,7 +12,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -27,6 +27,7 @@ Patch0: xulrunner-version.patch Patch1: mozilla-build.patch Patch2: mozilla-191-path.patch Patch3: mozilla-jemalloc.patch +Patch4: mozilla-about-firefox-version.patch # Fedora specific patches Patch10: mozilla-191-pkgconfig.patch @@ -147,6 +148,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch1 -p1 -b .build %patch2 -p1 -b .path %patch3 -p1 -b .jemalloc +%patch4 -p1 -b .about-firefox-version %patch10 -p1 -b .pk @@ -446,6 +448,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jul 7 2009 Jan Horak - 1.9.1-3 +- Fixed wrong version of Firefox when loading 'about:' as location + * Tue Jun 30 2009 Yanko Kaneti - 1.9.1-2 - Build using system hunspell From c4ff3367dc3dab9c89f00a3e89a33ec5a63277de Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 15 Jul 2009 09:34:39 +0000 Subject: [PATCH 08/24] Fixed multilib issues --- xulrunner.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 4d39f9c..0393ae9 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -12,7 +12,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -277,6 +277,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 "jsconfig" +popd + %{__install} -p -c -m 755 dist/bin/xpcshell \ dist/bin/xpidl \ dist/bin/xpt_dump \ @@ -448,6 +452,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jul 14 2009 Jan Horak - 1.9.1-4 +- Fixed multilib issues + * Tue Jul 7 2009 Jan Horak - 1.9.1-3 - Fixed wrong version of Firefox when loading 'about:' as location From 128d5594a899440873036cde30b23e19b4f161f6 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 16 Jul 2009 09:18:20 +0000 Subject: [PATCH 09/24] Fixed wrong filename in spec file --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 0393ae9..595702e 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -278,7 +278,7 @@ install_file "jsautocfg" popd pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/js -install_file "jsconfig" +install_file "js-config" popd %{__install} -p -c -m 755 dist/bin/xpcshell \ From 0d8ea5e6d52b80ce33a9624d13d2be3643e452c7 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Fri, 17 Jul 2009 01:50:36 +0000 Subject: [PATCH 10/24] - Fix for milw0rm 9137 --- mozilla-503286.patch | 88 ++++++++++++++++++++++++++++++++++++++++++++ xulrunner.spec | 7 +++- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 mozilla-503286.patch diff --git a/mozilla-503286.patch b/mozilla-503286.patch new file mode 100644 index 0000000..316488c --- /dev/null +++ b/mozilla-503286.patch @@ -0,0 +1,88 @@ + +# HG changeset patch +# User Blake Kaplan +# Date 1247525073 25200 +# Node ID a1a6b17a22da99da1b9e4c94a3e215c16799b3ae +# Parent a6f2586c52dc016475bbb6ffb1c8c33ef951cfc1 +Bug 503286 - Use the right sp for sp_adj to account for tree calls fiddling with state.sp after we've deep bailed. r=jorendorff a=gal/vlad/blocking1.9.1.1+ + +--- a/js/src/jstracer.cpp Tue Jul 14 08:58:06 2009 +0100 ++++ b/js/src/jstracer.cpp Mon Jul 13 15:44:33 2009 -0700 +@@ -4622,10 +4622,18 @@ LeaveTree(InterpState& state, VMSideExit + * but we have it now. Box it. + */ + uint8* typeMap = getStackTypeMap(innermost); ++ ++ /* ++ * If there's a tree call around the point that we deep exited at, ++ * then state.sp and state.rp were restored to their original ++ * values before the tree call and sp might be less than deepBailSp, ++ * which we sampled when we were told to deep bail. ++ */ ++ JS_ASSERT(state.deepBailSp >= state.stackBase && state.sp <= state.deepBailSp); + NativeToValue(cx, + cx->fp->regs->sp[-1], + typeMap[innermost->numStackSlots - 1], +- (jsdouble *) state.sp + innermost->sp_adj / sizeof(jsdouble) - 1); ++ (jsdouble *) state.deepBailSp + innermost->sp_adj / sizeof(jsdouble) - 1); + } + JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx); + if (tm->prohibitFlush && --tm->prohibitFlush == 0 && tm->needFlush) +@@ -5476,7 +5484,10 @@ js_DeepBail(JSContext *cx) + debug_only_v(printf("Deep bail.\n");) + LeaveTree(*tracecx->interpState, tracecx->bailExit); + tracecx->bailExit = NULL; +- tracecx->interpState->builtinStatus |= JSBUILTIN_BAILED; ++ ++ InterpState* state = tracecx->interpState; ++ state->builtinStatus |= JSBUILTIN_BAILED; ++ state->deepBailSp = state->sp; + } + + JS_REQUIRES_STACK jsval& +--- a/js/src/jstracer.h Tue Jul 14 08:58:06 2009 +0100 ++++ b/js/src/jstracer.h Mon Jul 13 15:44:33 2009 -0700 +@@ -416,6 +416,9 @@ struct InterpState + * if an error or exception occurred. + */ + uint32 builtinStatus; ++ ++ // Used to communicate the location of the return value in case of a deep bail. ++ double* deepBailSp; + }; + + static JS_INLINE void +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/js/src/xpconnect/crashtests/503286-1.html Mon Jul 13 15:44:33 2009 -0700 +@@ -0,0 +1,23 @@ ++Firefox 3.5 crash ++ ++ ++ ++ +--- a/js/src/xpconnect/crashtests/crashtests.list Tue Jul 14 08:58:06 2009 +0100 ++++ b/js/src/xpconnect/crashtests/crashtests.list Mon Jul 13 15:44:33 2009 -0700 +@@ -18,3 +18,4 @@ load 468552-1.html + load 471366-1.html + load 475185-1.html + load 475291-1.html ++load 503286-1.html + diff --git a/xulrunner.spec b/xulrunner.spec index 595702e..4349d53 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -12,7 +12,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -34,6 +34,7 @@ Patch10: mozilla-191-pkgconfig.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch +Patch101: mozilla-503286.patch # --------------------------------------------------- @@ -153,6 +154,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 .503286 %{__rm} -f .mozconfig @@ -452,6 +454,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Jul 16 2009 Christopher Aillon - 1.9.1-5 +- Fix for milw0rm 9137 + * Tue Jul 14 2009 Jan Horak - 1.9.1-4 - Fixed multilib issues From deecde0dacf1c0179609858b9335115232297f7d Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 17 Jul 2009 06:52:24 +0000 Subject: [PATCH 11/24] Update to 1.9.1.1 --- mozilla-503286.patch | 88 -------------------------------------------- sources | 2 +- xulrunner.spec | 9 +++-- 3 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 mozilla-503286.patch diff --git a/mozilla-503286.patch b/mozilla-503286.patch deleted file mode 100644 index 316488c..0000000 --- a/mozilla-503286.patch +++ /dev/null @@ -1,88 +0,0 @@ - -# HG changeset patch -# User Blake Kaplan -# Date 1247525073 25200 -# Node ID a1a6b17a22da99da1b9e4c94a3e215c16799b3ae -# Parent a6f2586c52dc016475bbb6ffb1c8c33ef951cfc1 -Bug 503286 - Use the right sp for sp_adj to account for tree calls fiddling with state.sp after we've deep bailed. r=jorendorff a=gal/vlad/blocking1.9.1.1+ - ---- a/js/src/jstracer.cpp Tue Jul 14 08:58:06 2009 +0100 -+++ b/js/src/jstracer.cpp Mon Jul 13 15:44:33 2009 -0700 -@@ -4622,10 +4622,18 @@ LeaveTree(InterpState& state, VMSideExit - * but we have it now. Box it. - */ - uint8* typeMap = getStackTypeMap(innermost); -+ -+ /* -+ * If there's a tree call around the point that we deep exited at, -+ * then state.sp and state.rp were restored to their original -+ * values before the tree call and sp might be less than deepBailSp, -+ * which we sampled when we were told to deep bail. -+ */ -+ JS_ASSERT(state.deepBailSp >= state.stackBase && state.sp <= state.deepBailSp); - NativeToValue(cx, - cx->fp->regs->sp[-1], - typeMap[innermost->numStackSlots - 1], -- (jsdouble *) state.sp + innermost->sp_adj / sizeof(jsdouble) - 1); -+ (jsdouble *) state.deepBailSp + innermost->sp_adj / sizeof(jsdouble) - 1); - } - JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx); - if (tm->prohibitFlush && --tm->prohibitFlush == 0 && tm->needFlush) -@@ -5476,7 +5484,10 @@ js_DeepBail(JSContext *cx) - debug_only_v(printf("Deep bail.\n");) - LeaveTree(*tracecx->interpState, tracecx->bailExit); - tracecx->bailExit = NULL; -- tracecx->interpState->builtinStatus |= JSBUILTIN_BAILED; -+ -+ InterpState* state = tracecx->interpState; -+ state->builtinStatus |= JSBUILTIN_BAILED; -+ state->deepBailSp = state->sp; - } - - JS_REQUIRES_STACK jsval& ---- a/js/src/jstracer.h Tue Jul 14 08:58:06 2009 +0100 -+++ b/js/src/jstracer.h Mon Jul 13 15:44:33 2009 -0700 -@@ -416,6 +416,9 @@ struct InterpState - * if an error or exception occurred. - */ - uint32 builtinStatus; -+ -+ // Used to communicate the location of the return value in case of a deep bail. -+ double* deepBailSp; - }; - - static JS_INLINE void ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/js/src/xpconnect/crashtests/503286-1.html Mon Jul 13 15:44:33 2009 -0700 -@@ -0,0 +1,23 @@ -+Firefox 3.5 crash -+ -+ -+ -+ ---- a/js/src/xpconnect/crashtests/crashtests.list Tue Jul 14 08:58:06 2009 +0100 -+++ b/js/src/xpconnect/crashtests/crashtests.list Mon Jul 13 15:44:33 2009 -0700 -@@ -18,3 +18,4 @@ load 468552-1.html - load 471366-1.html - load 475185-1.html - load 475291-1.html -+load 503286-1.html - diff --git a/sources b/sources index ee01ec8..253cc04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6dd59399db08963ef022a1d0e5010053 xulrunner-1.9.1-source.tar.bz2 +f2f68bc69f590eefc8fe98a0038087b1 xulrunner-1.9.1.1-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 4349d53..bdb4283 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,8 +11,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1 -Release: 5%{?dist} +Version: 1.9.1.1 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -34,7 +34,6 @@ Patch10: mozilla-191-pkgconfig.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch -Patch101: mozilla-503286.patch # --------------------------------------------------- @@ -154,7 +153,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch10 -p1 -b .pk %patch100 -p1 -b .ps-pdf-simplify-operators -%patch101 -p1 -b .503286 %{__rm} -f .mozconfig @@ -454,6 +452,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Jul 17 2009 Martin Stransky 1.9.1.1-1 +- Update to 1.9.1.1 + * Thu Jul 16 2009 Christopher Aillon - 1.9.1-5 - Fix for milw0rm 9137 From 2dbb9d417f8e1f79d15ea2470d21eddd6f0a22db Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 3 Aug 2009 21:03:04 +0000 Subject: [PATCH 12/24] Update to 1.9.1.2 --- sources | 2 +- xulrunner.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 253cc04..476a8c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2f68bc69f590eefc8fe98a0038087b1 xulrunner-1.9.1.1-source.tar.bz2 +0de7173e45df009f5a2620fcceb010fb xulrunner-1.9.1.2-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index bdb4283..bac2bfc 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.1 +Version: 1.9.1.2 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -452,6 +452,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Aug 3 2009 Martin Stransky 1.9.1.1-2 +- Update to 1.9.1.2 + * Fri Jul 17 2009 Martin Stransky 1.9.1.1-1 - Update to 1.9.1.1 From 25a300e100fad27d182b4a3a09f842785c7cee37 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 9 Sep 2009 09:03:28 +0000 Subject: [PATCH 13/24] Update to 1.9.1.3 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 80011f7..11a1b86 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xulrunner-1.9.1-source.tar.bz2 +xulrunner-1.9.1.3-source.tar.bz2 diff --git a/sources b/sources index 476a8c4..cb631af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de7173e45df009f5a2620fcceb010fb xulrunner-1.9.1.2-source.tar.bz2 +ca167e69180ab1230aea0763da270a95 xulrunner-1.9.1.3-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index bac2bfc..533ea3e 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.2 +Version: 1.9.1.3 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -452,7 +452,10 @@ fi #--------------------------------------------------------------------- %changelog -* Mon Aug 3 2009 Martin Stransky 1.9.1.1-2 +* Mon Sep 7 2009 Jan Horak - 1.9.1.3-1 +- Update to 1.9.1.3 + +* Mon Aug 3 2009 Martin Stransky 1.9.1.2-1 - Update to 1.9.1.2 * Fri Jul 17 2009 Martin Stransky 1.9.1.1-1 From 165b1b69d8688ca6e0a55cffcf6197c598590a52 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 27 Oct 2009 07:56:01 +0000 Subject: [PATCH 14/24] 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 11a1b86..75bab02 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ xulrunner-1.9.1-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 533ea3e..09b535b 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+ @@ -452,6 +452,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 f4cb63ffcd8ca295eb78c315f488f5b8b5e020fe Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 27 Oct 2009 11:58:04 +0000 Subject: [PATCH 15/24] Using system sqlite disabled due to sqlite >= 3.6.16 is required and it is missing in F11 repos --- xulrunner-mozconfig | 2 +- xulrunner.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index f0a1e78..684301a 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -14,7 +14,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 +#Temporary disabled: ac_add_options --enable-system-sqlite ac_add_options --enable-system-cairo ac_add_options --with-pthreads ac_add_options --disable-strip diff --git a/xulrunner.spec b/xulrunner.spec index 09b535b..9f137c0 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -3,7 +3,7 @@ %define cairo_version 1.6.0 %define lcms_version 1.17 %define freetype_version 2.1.9 -%define sqlite_version 3.6.10 +%define sqlite_version 3.6.16 %define tarballdir mozilla-1.9.1 %define version_internal 1.9.1 @@ -58,7 +58,7 @@ BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: libXt-devel BuildRequires: libXrender-devel BuildRequires: hunspell-devel -BuildRequires: sqlite-devel >= %{sqlite_version} +#Temporary removed, required 3.6.16 which is not in F11 repo yet: BuildRequires: sqlite-devel >= %{sqlite_version} BuildRequires: startup-notification-devel BuildRequires: alsa-lib-devel @@ -97,7 +97,7 @@ Requires: freetype-devel >= %{freetype_version} Requires: libXt-devel Requires: libXrender-devel Requires: hunspell-devel -Requires: sqlite-devel >= ${sqlite_version} +#Temporary removed: Requires: sqlite-devel >= ${sqlite_version} Requires: startup-notification-devel Requires: alsa-lib-devel From f327e9290fadd381c16f729dedcf66f291f52e98 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 5 Nov 2009 09:08:03 +0000 Subject: [PATCH 16/24] Update to 1.9.1.5 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 75bab02..3d2f467 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ xulrunner-1.9.1-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..759a7de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -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 9f137c0..d0e9f26 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+ @@ -452,6 +452,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 73ccf5e6cfe170fc69d9aa6018d6ac303b795ff4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:38 +0000 Subject: [PATCH 17/24] 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 fedfe2ddca03271deff3b19aac0ec6b8f442c928 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 16 Dec 2009 12:32:40 +0000 Subject: [PATCH 18/24] 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 3d2f467..ceabec6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ xulrunner-1.9.1-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 d0e9f26..91e1944 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -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+ @@ -58,7 +58,7 @@ BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: libXt-devel BuildRequires: libXrender-devel BuildRequires: hunspell-devel -#Temporary removed, required 3.6.16 which is not in F11 repo yet: BuildRequires: sqlite-devel >= %{sqlite_version} +BuildRequires: sqlite-devel >= %{sqlite_version} BuildRequires: startup-notification-devel BuildRequires: alsa-lib-devel @@ -452,6 +452,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 c5edff7568cfebb2acc2460b1a334d67584b5708 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 16 Dec 2009 12:58:12 +0000 Subject: [PATCH 19/24] Fix source filename --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 91e1944..b232941 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: xulrunner-%{version}-source.tar.bz2 +Source0: xulrunner-%{version}.source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in From e112cdf9df84a36af65ed176a8755d153413b60c Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 16 Dec 2009 13:17:01 +0000 Subject: [PATCH 20/24] Fix build - sqlite --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index b232941..62db74b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -58,7 +58,7 @@ BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: libXt-devel BuildRequires: libXrender-devel BuildRequires: hunspell-devel -BuildRequires: sqlite-devel >= %{sqlite_version} +#sqlite >= 3.6.16 still missing in F11: BuildRequires: sqlite-devel >= %{sqlite_version} BuildRequires: startup-notification-devel BuildRequires: alsa-lib-devel From a5c014eca7e2a4ec1cebb34bed89b8319c175a83 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 16 Feb 2010 10:43:29 +0000 Subject: [PATCH 21/24] Update to 1.9.1.8 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index ceabec6..3e3c2e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,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 62db74b..8db5b17 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.6 +Version: 1.9.1.8 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -452,6 +452,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Feb 16 2010 Jan Horak - 1.9.1.8-1 +- Update to 1.9.1.8 + * Wed Dec 16 2009 Jan Horak - 1.9.1.6-1 - Update to 1.9.1.6 From b3d4650141dd5ad1a547870272498d3b42641a89 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 30 Mar 2010 07:11:13 +0000 Subject: [PATCH 22/24] Update to 1.9.1.9 --- .cvsignore | 7 +------ sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3e3c2e1..81c9cfb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1 @@ -xulrunner-1.9.1-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 8db5b17..d65e660 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.8 +Version: 1.9.1.9 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -452,6 +452,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 30 2010 Jan Horak - 1.9.1.9-1 +- Update to 1.9.1.9 + * Tue Feb 16 2010 Jan Horak - 1.9.1.8-1 - Update to 1.9.1.8 From 2ae2149ed42a0203d820251d2bd84ccdd408db43 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 22 Jun 2010 20:47:46 +0000 Subject: [PATCH 23/24] Update to 1.9.1.10 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 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 d65e660..d81faba 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -11,7 +11,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.9 +Version: 1.9.1.10 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -452,6 +452,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jun 22 2010 Jan Horak - 1.9.1.10-1 +- Update to 1.9.1.10 + * Tue Mar 30 2010 Jan Horak - 1.9.1.9-1 - Update to 1.9.1.9 From 8ce16fec9d40185d7e2544b9e68ae02cddcb17b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:16:07 +0000 Subject: [PATCH 24/24] 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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11