From 8d3357a2daf544debcba519ae445052b19cce8a4 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:34:10 +0000 Subject: [PATCH 01/29] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 183e590569d4b964753827c6bbef2cf38aece1d4 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 17 Feb 2010 14:38:09 +0000 Subject: [PATCH 02/29] 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 c45e1b9..8b77ef0 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.1 -Release: 1%{?pretag}%{?dist} +Release: 2%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -259,6 +259,10 @@ pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} install_file "jsautocfg" popd +pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} +install_file "js-config" +popd + %{__install} -p -c -m 755 dist/bin/xpcshell \ dist/bin/xpidl \ dist/bin/xpt_dump \ @@ -406,6 +410,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Feb 17 2010 Martin Stransky 1.9.2.1-2 +- Added fix for #564184 - xulrunner-devel multilib conflict + * Fri Jan 22 2010 Martin Stransky 1.9.2.1-1 - Update to 1.9.2.1 From cef51b106514c219761cf621a46f20f9b3853a5e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 16 Mar 2010 02:40:02 +0000 Subject: [PATCH 03/29] - Enable startup notification, closes #445543 --- xulrunner.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xulrunner.spec b/xulrunner.spec index 8b77ef0..fc48d05 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -410,6 +410,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Mar 15 2010 Colin Walters 1.9.2.1-3 +- Enable startup notification, closes #445543 + * Wed Feb 17 2010 Martin Stransky 1.9.2.1-2 - Added fix for #564184 - xulrunner-devel multilib conflict From 86ea4b6efaee64f3df28d8180d1ae616914d3cf6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 16 Mar 2010 02:48:33 +0000 Subject: [PATCH 04/29] - Enable startup notification, closes #445543 --- xulrunner-mozconfig | 1 + xulrunner.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 94c224b..8c42114 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -30,6 +30,7 @@ ac_add_options --enable-safe-browsing ac_add_options --enable-extensions=default ac_add_options --enable-libnotify ac_add_options --disable-necko-wifi +ac_add_options --enable-startup-notification export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/xulrunner.spec b/xulrunner.spec index fc48d05..828c966 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.1 -Release: 2%{?pretag}%{?dist} +Release: 3%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet From c056ef981c6680af055bd04bad25672787819661 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 23 Mar 2010 10:13:35 +0000 Subject: [PATCH 05/29] Update to 1.9.2.2 --- .cvsignore | 13 +------------ sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8dd7b08..4a83752 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,12 +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.2.1b2.source.tar.bz2 -xulrunner-1.9.2.1b3.source.tar.bz2 -xulrunner-1.9.2.1b4.source.tar.bz2 -xulrunner-1.9.2.1b5.source.tar.bz2 -xulrunner-1.9.2.1rc1.source.tar.bz2 -xulrunner-1.9.2.1rc2.source.tar.bz2 -xulrunner-1.9.2.1.source.tar.bz2 +xulrunner-1.9.2.2.source.tar.bz2 diff --git a/sources b/sources index 7207423..0bcc758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -458051557ff49e6a352c1d56eee5782a xulrunner-1.9.2.1.source.tar.bz2 +a1972a2216ac7139b92b7378a328ec93 xulrunner-1.9.2.2.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 828c966..da60db9 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,8 +14,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.1 -Release: 3%{?pretag}%{?dist} +Version: 1.9.2.2 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -410,6 +410,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 23 2010 Jan Horak - 1.9.2.2-1 +- Update to 1.9.2.2 + * Mon Mar 15 2010 Colin Walters 1.9.2.1-3 - Enable startup notification, closes #445543 From db02dc24c054f3e76990846dc79e1c45cb0f3049 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Sat, 3 Apr 2010 08:12:07 +0000 Subject: [PATCH 06/29] Update to 1.9.2.3 --- sources | 2 +- xulrunner.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 0bcc758..693817a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1972a2216ac7139b92b7378a328ec93 xulrunner-1.9.2.2.source.tar.bz2 +5e4541ab23084b7b14ba228291ce2688 xulrunner-1.9.2.3.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index da60db9..c6fa07d 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -1,6 +1,6 @@ # Minimal required versions %define nspr_version 4.8 -%define nss_version 3.12.3.99 +%define nss_version 3.12.6 %define cairo_version 1.6.0 %define freetype_version 2.1.9 %define sqlite_version 3.6.16 @@ -14,7 +14,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.2 +Version: 1.9.2.3 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -410,6 +410,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Apr 2 2010 Martin Stransky 1.9.2.3-1 +- Update to 1.9.2.3 + * Tue Mar 23 2010 Jan Horak - 1.9.2.2-1 - Update to 1.9.2.2 From f8123e38099883492de0658fc9a64ce65f3493ec Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 22 Jun 2010 16:47:55 +0000 Subject: [PATCH 07/29] Update to 1.9.2.4 --- nspr-build.patch | 35 ++++++++++++++++++++++++++++++++++ xulrunner-mozconfig-debuginfo | 5 +++++ xulrunner.spec | 36 ++++++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 nspr-build.patch create mode 100644 xulrunner-mozconfig-debuginfo diff --git a/nspr-build.patch b/nspr-build.patch new file mode 100644 index 0000000..fe7cc1b --- /dev/null +++ b/nspr-build.patch @@ -0,0 +1,35 @@ +diff --git a/ipc/chromium/src/base/basictypes.h b/ipc/chromium/src/base/basictypes.h +--- a/ipc/chromium/src/base/basictypes.h ++++ b/ipc/chromium/src/base/basictypes.h +@@ -14,29 +14,29 @@ + #error You_must_include_basictypes.h_before_prtypes.h! + #endif + + #ifndef NO_NSPR_10_SUPPORT + #define NO_NSPR_10_SUPPORT + #define NO_NSPR_10_SUPPORT_SAVE + #endif + +-#include "nspr/prtypes.h" ++#include "prtypes.h" + + #ifdef NO_NSPR_10_SUPPORT_SAVE + #undef NO_NSPR_10_SUPPORT_SAVE + #undef NO_NSPR_10_SUPPORT + #endif + + #ifdef _WIN32 + #undef _WIN32 + #define _WIN32_SAVE + #endif + +-#include "nspr/obsolete/protypes.h" ++#include "obsolete/protypes.h" + + #define _INT32 + #define _UINT32 + + #ifdef _WIN32_SAVE + #undef _WIN32_SAVE + #define _WIN32 + #endif diff --git a/xulrunner-mozconfig-debuginfo b/xulrunner-mozconfig-debuginfo new file mode 100644 index 0000000..a0ef07a --- /dev/null +++ b/xulrunner-mozconfig-debuginfo @@ -0,0 +1,5 @@ +# For mozilla's debuginfo: +export CFLAGS="-gstabs+" +export CXXFLAGS="-gstabs+" +export MOZ_DEBUG_SYMBOLS=1 +ac_add_options --enable-crashreporter diff --git a/xulrunner.spec b/xulrunner.spec index c6fa07d..4df7cad 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -5,6 +5,7 @@ %define freetype_version 2.1.9 %define sqlite_version 3.6.16 %define tarballdir mozilla-1.9.2 +%define include_debuginfo 0 # The actual sqlite version (see #480989): %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) @@ -14,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.3 +Version: 1.9.2.4 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -22,6 +23,7 @@ Group: Applications/Internet # You can get sources at ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source Source0: %{name}-%{version}%{?pretag}.source.tar.bz2 Source10: %{name}-mozconfig +Source11: %{name}-mozconfig-debuginfo Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in Source23: %{name}.1 @@ -35,9 +37,10 @@ Patch5: mozilla-jemalloc-526152.patch Patch7: xulrunner-1.9.2.1-build.patch Patch8: mozilla-plugin.patch Patch9: mozilla-build-sbrk.patch +Patch11: nspr-build.patch # Fedora specific patches -Patch10: mozilla-192-pkgconfig.patch +Patch20: mozilla-192-pkgconfig.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch @@ -132,14 +135,18 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch7 -p2 -b .del %patch8 -p1 -b .plugin %patch9 -p2 -b .sbrk +%patch11 -p1 -b .nspr -%patch10 -p1 -b .pk +%patch20 -p1 -b .pk %patch100 -p1 -b .ps-pdf-simplify-operators %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig +%if %{include_debuginfo} +%{__cat} %{SOURCE11} >> .mozconfig +%endif #--------------------------------------------------------------------- @@ -177,6 +184,12 @@ MOZ_SMP_FLAGS=-j1 export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}" make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" +# create debuginfo for crash-stats.mozilla.com +%if %{include_debuginfo} +#cd %{moz_objdir} +make buildsymbols +%endif + #--------------------------------------------------------------------- %install @@ -334,6 +347,13 @@ ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat +# Add debuginfo for crash-stats.mozilla.com +%if %{include_debuginfo} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} +cp dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir} +#cp %{moz_objdir}/mozilla/dist/firefox-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} +%endif + #--------------------------------------------------------------------- %clean @@ -392,6 +412,13 @@ fi %exclude %{mozappdir}/update.locale %exclude %{mozappdir}/components/components.list +%if %{include_debuginfo} +%{mozappdir}/crashreporter +%{mozappdir}/crashreporter.ini +%{mozappdir}/Throbber-small.gif +%{mozappdir}/plugin-container +%endif + %files devel %defattr(-,root,root,-) %dir %{_libdir}/%{name}-sdk-* @@ -410,6 +437,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jun 22 2010 Jan Horak - 1.9.2.4-1 +- Update to 1.9.2.4 + * Fri Apr 2 2010 Martin Stransky 1.9.2.3-1 - Update to 1.9.2.3 From f091debc537a14659537c771db7cca2f0a8facbf Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 22 Jun 2010 16:51:32 +0000 Subject: [PATCH 08/29] Fix build --- .cvsignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 4a83752..1c0557c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xulrunner-1.9.2.2.source.tar.bz2 +xulrunner-1.9.2.4.source.tar.bz2 diff --git a/sources b/sources index 693817a..0af57e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e4541ab23084b7b14ba228291ce2688 xulrunner-1.9.2.3.source.tar.bz2 +66b1610362ed6009d66fe762645679a0 xulrunner-1.9.2.4.source.tar.bz2 From 8e489743f6d39b36f772dd6937fa2ef6c2a1f64c Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 22 Jun 2010 20:23:23 +0000 Subject: [PATCH 09/29] Added missing file plugin-container --- xulrunner.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner.spec b/xulrunner.spec index 4df7cad..4d3de4f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -406,6 +406,7 @@ fi %{mozappdir}/platform.ini %{mozappdir}/dependentlibs.list %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf +%{mozappdir}/plugin-container # XXX See if these are needed still %{mozappdir}/updater* From 26b2ed02bd01cdffc5b2b7104e20338e6993bf79 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 30 Jun 2010 13:01:00 +0000 Subject: [PATCH 10/29] Update to 3.6.6 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c0557c..fb8c366 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ xulrunner-1.9.2.2.source.tar.bz2 xulrunner-1.9.2.4.source.tar.bz2 +xulrunner-1.9.2.6.source.tar.bz2 diff --git a/sources b/sources index 0af57e7..8681f0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66b1610362ed6009d66fe762645679a0 xulrunner-1.9.2.4.source.tar.bz2 +c9a071b31bb90d05edfb93117d0a7537 xulrunner-1.9.2.6.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 4d3de4f..edf5a6c 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.4 +Version: 1.9.2.6 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -438,6 +438,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Jun 30 2010 Jan Horak - 1.9.2.6-1 +- Update to 1.9.2.6 + * Tue Jun 22 2010 Jan Horak - 1.9.2.4-1 - Update to 1.9.2.4 From b1096cab6e16e77a6f7a158fdcaa62aa279d1aa5 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 14 Jul 2010 11:58:33 +0000 Subject: [PATCH 11/29] Rename of confusing include_debuginfo variable to enable_mozilla_crashreporter --- xulrunner.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index edf5a6c..d3ac4d6 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -5,7 +5,7 @@ %define freetype_version 2.1.9 %define sqlite_version 3.6.16 %define tarballdir mozilla-1.9.2 -%define include_debuginfo 0 +%define enable_mozilla_crashreporter 0 # The actual sqlite version (see #480989): %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) @@ -144,7 +144,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig -%if %{include_debuginfo} +%if %{enable_mozilla_crashreporter} %{__cat} %{SOURCE11} >> .mozconfig %endif @@ -185,7 +185,7 @@ export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}" make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" # create debuginfo for crash-stats.mozilla.com -%if %{include_debuginfo} +%if %{enable_mozilla_crashreporter} #cd %{moz_objdir} make buildsymbols %endif @@ -348,7 +348,7 @@ touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat # Add debuginfo for crash-stats.mozilla.com -%if %{include_debuginfo} +%if %{enable_mozilla_crashreporter} mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} cp dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir} #cp %{moz_objdir}/mozilla/dist/firefox-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} @@ -413,7 +413,7 @@ fi %exclude %{mozappdir}/update.locale %exclude %{mozappdir}/components/components.list -%if %{include_debuginfo} +%if %{enable_mozilla_crashreporter} %{mozappdir}/crashreporter %{mozappdir}/crashreporter.ini %{mozappdir}/Throbber-small.gif From f3ed00a3eb7aa12a24d4670e34be4d639e0f0abc Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 20 Jul 2010 10:43:33 +0000 Subject: [PATCH 12/29] Update to 1.9.2.7 --- .cvsignore | 4 +--- mozilla-jemalloc-526152.patch | 32 -------------------------------- nspr-build.patch | 35 ----------------------------------- sources | 2 +- xulrunner.spec | 9 ++++----- 5 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 mozilla-jemalloc-526152.patch delete mode 100644 nspr-build.patch diff --git a/.cvsignore b/.cvsignore index fb8c366..04e5933 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -xulrunner-1.9.2.2.source.tar.bz2 -xulrunner-1.9.2.4.source.tar.bz2 -xulrunner-1.9.2.6.source.tar.bz2 +xulrunner-1.9.2.7.source.tar.bz2 diff --git a/mozilla-jemalloc-526152.patch b/mozilla-jemalloc-526152.patch deleted file mode 100644 index 5f60485..0000000 --- a/mozilla-jemalloc-526152.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: David Mandelin - -diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c ---- a/memory/jemalloc/jemalloc.c -+++ b/memory/jemalloc/jemalloc.c -@@ -5792,24 +5792,24 @@ __attribute__((noinline)) - #else - inline - #endif - void * - memalign(size_t alignment, size_t size) - { - void *ret; - -- assert(((alignment - 1) & alignment) == 0 && alignment >= -- sizeof(void *)); -+ assert(((alignment - 1) & alignment) == 0); - - if (malloc_init()) { - ret = NULL; - goto RETURN; - } - -+ alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment; - ret = ipalloc(alignment, size); - - RETURN: - #ifdef MALLOC_XMALLOC - if (opt_xmalloc && ret == NULL) { - _malloc_message(_getprogname(), - ": (malloc) Error in memalign(): out of memory\n", "", ""); - abort(); diff --git a/nspr-build.patch b/nspr-build.patch deleted file mode 100644 index fe7cc1b..0000000 --- a/nspr-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/ipc/chromium/src/base/basictypes.h b/ipc/chromium/src/base/basictypes.h ---- a/ipc/chromium/src/base/basictypes.h -+++ b/ipc/chromium/src/base/basictypes.h -@@ -14,29 +14,29 @@ - #error You_must_include_basictypes.h_before_prtypes.h! - #endif - - #ifndef NO_NSPR_10_SUPPORT - #define NO_NSPR_10_SUPPORT - #define NO_NSPR_10_SUPPORT_SAVE - #endif - --#include "nspr/prtypes.h" -+#include "prtypes.h" - - #ifdef NO_NSPR_10_SUPPORT_SAVE - #undef NO_NSPR_10_SUPPORT_SAVE - #undef NO_NSPR_10_SUPPORT - #endif - - #ifdef _WIN32 - #undef _WIN32 - #define _WIN32_SAVE - #endif - --#include "nspr/obsolete/protypes.h" -+#include "obsolete/protypes.h" - - #define _INT32 - #define _UINT32 - - #ifdef _WIN32_SAVE - #undef _WIN32_SAVE - #define _WIN32 - #endif diff --git a/sources b/sources index 8681f0d..9322d49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9a071b31bb90d05edfb93117d0a7537 xulrunner-1.9.2.6.source.tar.bz2 +e240541898766e44a407e543c70d4949 xulrunner-1.9.2.7.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index d3ac4d6..ef4019f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.6 +Version: 1.9.2.7 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -33,11 +33,9 @@ Patch0: xulrunner-version.patch Patch1: mozilla-build.patch Patch3: mozilla-jemalloc.patch Patch4: mozilla-about-firefox-version.patch -Patch5: mozilla-jemalloc-526152.patch Patch7: xulrunner-1.9.2.1-build.patch Patch8: mozilla-plugin.patch Patch9: mozilla-build-sbrk.patch -Patch11: nspr-build.patch # Fedora specific patches Patch20: mozilla-192-pkgconfig.patch @@ -131,11 +129,9 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch1 -p1 -b .build %patch3 -p1 -b .jemalloc %patch4 -p1 -b .about-firefox-version -%patch5 -p1 -b .jemalloc-526152 %patch7 -p2 -b .del %patch8 -p1 -b .plugin %patch9 -p2 -b .sbrk -%patch11 -p1 -b .nspr %patch20 -p1 -b .pk @@ -438,6 +434,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jul 20 2010 Jan Horak - 1.9.2.7-1 +- Update to 1.9.2.7 + * Wed Jun 30 2010 Jan Horak - 1.9.2.6-1 - Update to 1.9.2.6 From 2e5527fdad803252cb68e42c6a44c3c3aba25843 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Fri, 23 Jul 2010 20:30:40 +0000 Subject: [PATCH 13/29] - Add patch for mozbz#575836 (1.9.2.8) --- 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..d4a7412 --- /dev/null +++ b/mozilla-575836.patch @@ -0,0 +1,35 @@ +# HG changeset patch +# User Chris Jones +# Date 1279831451 14400 +# Node ID 96ae337c41fbff7c1c96ddca599ee5997ffed406 +# Parent 5d60b8125b69637e8e139b3449936f15892f9bdf +Bug 575836: Fix logic here. r=jst r=josh + +diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp +--- a/layout/generic/nsObjectFrame.cpp ++++ b/layout/generic/nsObjectFrame.cpp +@@ -3588,9 +3588,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++; + } + +@@ -3648,7 +3649,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 ef4019f..58668d8 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -16,7 +16,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.7 -Release: 1%{?pretag}%{?dist} +Release: 2%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -42,6 +42,7 @@ Patch20: mozilla-192-pkgconfig.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch +Patch101: mozilla-575836.patch # --------------------------------------------------- @@ -136,6 +137,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk %patch100 -p1 -b .ps-pdf-simplify-operators +%patch101 -p1 -b .575836 %{__rm} -f .mozconfig @@ -434,6 +436,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Jul 23 2010 Christopher Aillon - 1.9.2.7-2 +- Add patch for mozbz#575836 (1.9.2.8) + * Tue Jul 20 2010 Jan Horak - 1.9.2.7-1 - Update to 1.9.2.7 From c8d52a5c0717df2ead795bb27757b5fa28087d2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:15:29 +0000 Subject: [PATCH 14/29] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From fae1300f80426b5e5f46a2ed98ff2f885bc96629 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 7 Sep 2010 09:39:33 +0200 Subject: [PATCH 15/29] Update to 3.6.9 --- .gitignore | 1 + mozilla-575836.patch | 35 ----------------------------------- sources | 2 +- xulrunner.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 mozilla-575836.patch diff --git a/.gitignore b/.gitignore index 04e5933..872aa6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xulrunner-1.9.2.7.source.tar.bz2 +/xulrunner-1.9.2.9.source.tar.bz2 diff --git a/mozilla-575836.patch b/mozilla-575836.patch deleted file mode 100644 index d4a7412..0000000 --- a/mozilla-575836.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Chris Jones -# Date 1279831451 14400 -# Node ID 96ae337c41fbff7c1c96ddca599ee5997ffed406 -# Parent 5d60b8125b69637e8e139b3449936f15892f9bdf -Bug 575836: Fix logic here. r=jst r=josh - -diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp ---- a/layout/generic/nsObjectFrame.cpp -+++ b/layout/generic/nsObjectFrame.cpp -@@ -3588,9 +3588,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++; - } - -@@ -3648,7 +3649,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 9322d49..3bd8c03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e240541898766e44a407e543c70d4949 xulrunner-1.9.2.7.source.tar.bz2 +100ecafd6c6c5062bc03bb2fb651fc17 xulrunner-1.9.2.9.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 58668d8..826671b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -1,6 +1,6 @@ # Minimal required versions %define nspr_version 4.8 -%define nss_version 3.12.6 +%define nss_version 3.12.7 %define cairo_version 1.6.0 %define freetype_version 2.1.9 %define sqlite_version 3.6.16 @@ -15,8 +15,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.7 -Release: 2%{?pretag}%{?dist} +Version: 1.9.2.9 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -42,7 +42,6 @@ Patch20: mozilla-192-pkgconfig.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch -Patch101: mozilla-575836.patch # --------------------------------------------------- @@ -137,7 +136,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk %patch100 -p1 -b .ps-pdf-simplify-operators -%patch101 -p1 -b .575836 %{__rm} -f .mozconfig @@ -436,6 +434,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Sep 6 2010 Jan Horak - 1.9.2.9-1 +- Update to 1.9.2.9 + * Fri Jul 23 2010 Christopher Aillon - 1.9.2.7-2 - Add patch for mozbz#575836 (1.9.2.8) From b42b12f3e6eee9c477e4187d1c6d9344b5f754fd Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 7 Sep 2010 22:37:50 +0200 Subject: [PATCH 16/29] Removed system sqlite usage due to missing SQLITE_SECURE_DELETE --- xulrunner-mozconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 8c42114..6a007d9 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -11,7 +11,7 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite +#ac_add_options --enable-system-sqlite Temporary since System Sqlite library is not compiled with SQLITE_SECURE_DELETE ac_add_options --enable-system-cairo ac_add_options --with-pthreads ac_add_options --disable-strip From 27079fa8937135ddea48745b55650dcd1517f7f9 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 20 Sep 2010 16:00:05 +0200 Subject: [PATCH 17/29] Update to 1.9.2.10 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 872aa6c..9fc259d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.9.source.tar.bz2 +/xulrunner-1.9.2.10.source.tar.bz2 diff --git a/sources b/sources index 3bd8c03..65ac594 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -100ecafd6c6c5062bc03bb2fb651fc17 xulrunner-1.9.2.9.source.tar.bz2 +59ee60ddfd8b33e99a24788d3b12adb3 xulrunner-1.9.2.10.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 826671b..1554631 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.9 +Version: 1.9.2.10 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -434,6 +434,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Sep 20 2010 Martin Stransky 1.9.2.10-1 +- Update to 1.9.2.10 + * Mon Sep 6 2010 Jan Horak - 1.9.2.9-1 - Update to 1.9.2.9 From 4a944f9b1744211038e6cf41ae638c693d7fc7b1 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 19 Oct 2010 16:54:14 +0200 Subject: [PATCH 18/29] Update to 1.9.2.11 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9fc259d..d34c8d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.9.source.tar.bz2 /xulrunner-1.9.2.10.source.tar.bz2 +/xulrunner-1.9.2.11.source.tar.bz2 diff --git a/sources b/sources index 65ac594..ab78533 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59ee60ddfd8b33e99a24788d3b12adb3 xulrunner-1.9.2.10.source.tar.bz2 +f698dd0f8f145d84933a50f69662c8db xulrunner-1.9.2.11.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 1554631..fb968c6 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -1,6 +1,6 @@ # Minimal required versions %define nspr_version 4.8 -%define nss_version 3.12.7 +%define nss_version 3.12.8 %define cairo_version 1.6.0 %define freetype_version 2.1.9 %define sqlite_version 3.6.16 @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.10 +Version: 1.9.2.11 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -434,6 +434,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Oct 19 2010 Jan Horak - 1.9.2.11-1 +- Update to 1.9.2.11 + * Mon Sep 20 2010 Martin Stransky 1.9.2.10-1 - Update to 1.9.2.10 From c8db8c9c419637d1de0f54a1a5b49220cb02be4b Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 19 Oct 2010 17:19:30 +0200 Subject: [PATCH 19/29] Removed no longer valid patch --- mozilla-ps-pdf-simplify-operators.patch | 42 ------------------------- xulrunner.spec | 4 --- 2 files changed, 46 deletions(-) delete mode 100644 mozilla-ps-pdf-simplify-operators.patch diff --git a/mozilla-ps-pdf-simplify-operators.patch b/mozilla-ps-pdf-simplify-operators.patch deleted file mode 100644 index cab1341..0000000 --- a/mozilla-ps-pdf-simplify-operators.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=435313 - -Index: mozilla/gfx/thebes/public/gfxPDFSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPDFSurface.h ---- mozilla/gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; -Index: mozilla/gfx/thebes/public/gfxPSSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPSSurface.h ---- mozilla/gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; diff --git a/xulrunner.spec b/xulrunner.spec index fb968c6..0a7aea1 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -41,7 +41,6 @@ Patch9: mozilla-build-sbrk.patch Patch20: mozilla-192-pkgconfig.patch # Upstream patches -Patch100: mozilla-ps-pdf-simplify-operators.patch # --------------------------------------------------- @@ -135,9 +134,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk -%patch100 -p1 -b .ps-pdf-simplify-operators - - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{enable_mozilla_crashreporter} From 96015b3d59d8cf50e89f81ce341fcc6209f13e09 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 27 Oct 2010 17:42:34 +0200 Subject: [PATCH 20/29] Update to 1.9.2.12 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d34c8d6..f85d1fc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.9.source.tar.bz2 /xulrunner-1.9.2.10.source.tar.bz2 /xulrunner-1.9.2.11.source.tar.bz2 +/xulrunner-1.9.2.12.source.tar.bz2 diff --git a/sources b/sources index ab78533..b58f370 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f698dd0f8f145d84933a50f69662c8db xulrunner-1.9.2.11.source.tar.bz2 +80f4d83f23a7c45fc3f1904964ea2a5a xulrunner-1.9.2.12.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 0a7aea1..8ece4e3 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.11 +Version: 1.9.2.12 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -430,6 +430,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Oct 27 2010 Jan Horak - 1.9.2.12-1 +- Update to 1.9.2.12 + * Tue Oct 19 2010 Jan Horak - 1.9.2.11-1 - Update to 1.9.2.11 From 0eb367a377292d2833e497d5816d5f9674cd2579 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 9 Dec 2010 13:42:49 +0100 Subject: [PATCH 21/29] Update to 1.9.2.13 --- .gitignore | 1 + mozilla-plugin.patch | 10 ---------- sources | 2 +- xulrunner.spec | 7 ++++--- 4 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 mozilla-plugin.patch diff --git a/.gitignore b/.gitignore index f85d1fc..15f9ce1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.10.source.tar.bz2 /xulrunner-1.9.2.11.source.tar.bz2 /xulrunner-1.9.2.12.source.tar.bz2 +/xulrunner-1.9.2.13.source.tar.bz2 diff --git a/mozilla-plugin.patch b/mozilla-plugin.patch deleted file mode 100644 index 75eac7e..0000000 --- a/mozilla-plugin.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in ---- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old 2009-11-25 05:13:11.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2009-12-03 10:14:41.000000000 +0100 -@@ -5,5 +5,5 @@ includedir=%includedir% - Name: Mozilla Plug-In API - Description: Mozilla Plug-In API - Version: %MOZILLA_VERSION% --Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -+Cflags: -I${includedir} -DXP_UNIX %ojidef% - diff --git a/sources b/sources index b58f370..50ee003 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80f4d83f23a7c45fc3f1904964ea2a5a xulrunner-1.9.2.12.source.tar.bz2 +d7c90aed8209beefa74badf02e8eeae1 xulrunner-1.9.2.13.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 8ece4e3..9a9b60a 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.12 +Version: 1.9.2.13 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -34,7 +34,6 @@ Patch1: mozilla-build.patch Patch3: mozilla-jemalloc.patch Patch4: mozilla-about-firefox-version.patch Patch7: xulrunner-1.9.2.1-build.patch -Patch8: mozilla-plugin.patch Patch9: mozilla-build-sbrk.patch # Fedora specific patches @@ -129,7 +128,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch3 -p1 -b .jemalloc %patch4 -p1 -b .about-firefox-version %patch7 -p2 -b .del -%patch8 -p1 -b .plugin %patch9 -p2 -b .sbrk %patch20 -p1 -b .pk @@ -430,6 +428,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Dec 9 2010 Jan Horak - 1.9.2.13-1 +- Update to 1.9.2.13 + * Wed Oct 27 2010 Jan Horak - 1.9.2.12-1 - Update to 1.9.2.12 From de69660d838835a8b212bb416de2f63a91da862d Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 1 Mar 2011 08:58:05 +0100 Subject: [PATCH 22/29] Update to 1.9.2.14 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 15f9ce1..a2d4c9f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.11.source.tar.bz2 /xulrunner-1.9.2.12.source.tar.bz2 /xulrunner-1.9.2.13.source.tar.bz2 +/xulrunner-1.9.2.14.source.tar.bz2 diff --git a/sources b/sources index 50ee003..cd95fea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7c90aed8209beefa74badf02e8eeae1 xulrunner-1.9.2.13.source.tar.bz2 +ab0d00cd33e6b2388429dda1c01abd01 xulrunner-1.9.2.14.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 9a9b60a..1939f00 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.13 +Version: 1.9.2.14 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -428,6 +428,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 1 2011 Jan Horak - 1.9.2.14-1 +- Update to 1.9.2.14 + * Thu Dec 9 2010 Jan Horak - 1.9.2.13-1 - Update to 1.9.2.13 From 5cc6049159fc0d5b6629023ba55c11bb0941245b Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 7 Mar 2011 12:26:53 +0100 Subject: [PATCH 23/29] Update to 1.9.2.15 --- .gitignore | 1 + crashreporter-remove-static.patch | 11 +++++++++++ sources | 2 +- xulrunner-mozconfig-debuginfo | 4 ++-- xulrunner.spec | 16 ++++++++++++++-- 5 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 crashreporter-remove-static.patch diff --git a/.gitignore b/.gitignore index a2d4c9f..ad30c72 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.12.source.tar.bz2 /xulrunner-1.9.2.13.source.tar.bz2 /xulrunner-1.9.2.14.source.tar.bz2 +/xulrunner-1.9.2.15.source.tar.bz2 diff --git a/crashreporter-remove-static.patch b/crashreporter-remove-static.patch new file mode 100644 index 0000000..b94d165 --- /dev/null +++ b/crashreporter-remove-static.patch @@ -0,0 +1,11 @@ +diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in +--- mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200 +@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1 + + #XXX: bug 554854 causes us to be unable to run binaries on the build slaves + # due to them having an older libstdc++ +-HOST_LDFLAGS += -static ++#HOST_LDFLAGS += -static + + include $(topsrcdir)/config/rules.mk diff --git a/sources b/sources index cd95fea..54c799f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab0d00cd33e6b2388429dda1c01abd01 xulrunner-1.9.2.14.source.tar.bz2 +fcf8042948d91f1f3d9c33599b79cf35 xulrunner-1.9.2.15.source.tar.bz2 diff --git a/xulrunner-mozconfig-debuginfo b/xulrunner-mozconfig-debuginfo index a0ef07a..4dd2427 100644 --- a/xulrunner-mozconfig-debuginfo +++ b/xulrunner-mozconfig-debuginfo @@ -1,5 +1,5 @@ # For mozilla's debuginfo: -export CFLAGS="-gstabs+" -export CXXFLAGS="-gstabs+" +export CFLAGS="$CFLAGS -gdwarf-2" +export CXXFLAGS="$CXXFLAGS -gdwarf-2" export MOZ_DEBUG_SYMBOLS=1 ac_add_options --enable-crashreporter diff --git a/xulrunner.spec b/xulrunner.spec index 1939f00..9326821 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -5,7 +5,14 @@ %define freetype_version 2.1.9 %define sqlite_version 3.6.16 %define tarballdir mozilla-1.9.2 -%define enable_mozilla_crashreporter 0 +# crash reporter and out-of-process-plugins work only on x86/x86_64 +%ifarch %{ix86} x86_64 +%global enable_mozilla_crashreporter 1 +%global moz_out_of_process_plugins 1 +%else +%global enable_mozilla_crashreporter 0 +%global moz_out_of_process_plugins 0 +%endif # The actual sqlite version (see #480989): %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) @@ -15,7 +22,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.14 +Version: 1.9.2.15 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -38,6 +45,7 @@ Patch9: mozilla-build-sbrk.patch # Fedora specific patches Patch20: mozilla-192-pkgconfig.patch +Patch24: crashreporter-remove-static.patch # Upstream patches @@ -131,6 +139,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch9 -p2 -b .sbrk %patch20 -p1 -b .pk +%patch24 -p1 -b .static %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -428,6 +437,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Mar 7 2011 Jan Horak - 1.9.2.15-1 +- Update to 1.9.2.15 + * Tue Mar 1 2011 Jan Horak - 1.9.2.14-1 - Update to 1.9.2.14 From 294255ed2f8e332a4acdef75812f7fcbb3bd094b Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 7 Mar 2011 14:23:51 +0100 Subject: [PATCH 24/29] Added -fpermissive cxxflag --- xulrunner.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 9326821..97c175b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -166,7 +166,11 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO} # Mozilla builds with -Wall with exception of a few warnings which show up # everywhere in the code; so, don't override that. -MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//') +# +# -fpermissive is needed to build with gcc 4.6+ which has become stricter +# +MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \ + %{__sed} -e 's/-Wall//' ) export CFLAGS=$MOZ_OPT_FLAGS export CXXFLAGS=$MOZ_OPT_FLAGS From 1cc9500c3624e8aa76328db52e17351c8dec6637 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 7 Mar 2011 14:46:10 +0100 Subject: [PATCH 25/29] Enabled crash reporter and added required packages --- xulrunner.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 97c175b..3863790 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -118,6 +118,8 @@ Requires: sqlite-devel Requires: startup-notification-devel Requires: alsa-lib-devel Requires: libnotify-devel +Requires: curl-devel +BuildRequires: libcurl-devel %description devel Gecko development files. @@ -352,9 +354,10 @@ touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat # Add debuginfo for crash-stats.mozilla.com %if %{enable_mozilla_crashreporter} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} -cp dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir} -#cp %{moz_objdir}/mozilla/dist/firefox-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} +# Debug symbols are stored in /usr/lib even in x86_64 arch +DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"` +mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} +cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} %endif #--------------------------------------------------------------------- From ba68b828821ecf27cde900df68ec0d7a6c1b6fbb Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 22 Mar 2011 15:35:46 -0700 Subject: [PATCH 26/29] 1.9.2.16 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ad30c72..d258092 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.13.source.tar.bz2 /xulrunner-1.9.2.14.source.tar.bz2 /xulrunner-1.9.2.15.source.tar.bz2 +/xulrunner-1.9.2.16.source.tar.bz2 diff --git a/sources b/sources index 54c799f..0add42a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcf8042948d91f1f3d9c33599b79cf35 xulrunner-1.9.2.15.source.tar.bz2 +232a3c0160cd1cbe3dcaaaf7e4ae51c2 xulrunner-1.9.2.16.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 3863790..707927e 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -22,7 +22,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.15 +Version: 1.9.2.16 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -444,6 +444,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 22 2011 Christopher Aillon - 3.6.16-1 +- Update to 1.9.2.16 + * Mon Mar 7 2011 Jan Horak - 1.9.2.15-1 - Update to 1.9.2.15 From b3f2eb07a2ad58c7c2bc982378cd1304f9aac4dd Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 28 Apr 2011 11:56:20 +0200 Subject: [PATCH 27/29] Update to 1.9.2.17 --- .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d258092..71070c7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.14.source.tar.bz2 /xulrunner-1.9.2.15.source.tar.bz2 /xulrunner-1.9.2.16.source.tar.bz2 +/xulrunner-1.9.2.17.source.tar.bz2 diff --git a/sources b/sources index 0add42a..bdf1b14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -232a3c0160cd1cbe3dcaaaf7e4ae51c2 xulrunner-1.9.2.16.source.tar.bz2 +49509c51010bd91a198aee63780aeaf9 xulrunner-1.9.2.17.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 707927e..9056338 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -22,7 +22,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.16 +Version: 1.9.2.17 Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -444,6 +444,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Apr 28 2011 Jan Horak - 1.9.2.17-1 +- Update to 1.9.2.17 + * Tue Mar 22 2011 Christopher Aillon - 3.6.16-1 - Update to 1.9.2.16 From bfd045db0edca48c80332fda2bf0bcee93de2f48 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 28 Apr 2011 21:59:55 +0200 Subject: [PATCH 28/29] Added comodo/nss patch --- mozilla-comodo-646460.patch | 24 ++++++++++++++++++++++++ xulrunner.spec | 6 ++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 mozilla-comodo-646460.patch diff --git a/mozilla-comodo-646460.patch b/mozilla-comodo-646460.patch new file mode 100644 index 0000000..a9f806d --- /dev/null +++ b/mozilla-comodo-646460.patch @@ -0,0 +1,24 @@ +diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp +--- a/security/manager/ssl/src/nsNSSIOLayer.cpp ++++ b/security/manager/ssl/src/nsNSSIOLayer.cpp +@@ -3339,16 +3339,20 @@ cancel_and_failure(nsNSSSocketInfo* info + { + infoObject->SetCanceled(PR_TRUE); + return SECFailure; + } + + static SECStatus + nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket) + { ++ // cert was revoked, don't do anything else ++ if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE) ++ return SECFailure; ++ + nsNSSShutDownPreventionLock locker; + nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg; + if (!infoObject) + return SECFailure; + + if (nsSSLThread::exitRequested()) + return cancel_and_failure(infoObject); + diff --git a/xulrunner.spec b/xulrunner.spec index 9056338..00c9fd7 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -23,7 +23,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.2.17 -Release: 1%{?pretag}%{?dist} +Release: 2%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -48,6 +48,7 @@ Patch20: mozilla-192-pkgconfig.patch Patch24: crashreporter-remove-static.patch # Upstream patches +Patch30: mozilla-comodo-646460.patch # --------------------------------------------------- @@ -142,6 +143,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk %patch24 -p1 -b .static +%patch30 -p1 -b .646460 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -444,7 +446,7 @@ fi #--------------------------------------------------------------------- %changelog -* Thu Apr 28 2011 Jan Horak - 1.9.2.17-1 +* Thu Apr 28 2011 Jan Horak - 1.9.2.17-2 - Update to 1.9.2.17 * Tue Mar 22 2011 Christopher Aillon - 3.6.16-1 From 3c0ed1cd8962a2eec63f5b9eb5e44a5184379698 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 21 Jun 2011 12:09:40 +0200 Subject: [PATCH 29/29] Update to 1.9.2.18 --- .gitignore | 1 + mozilla-comodo-646460.patch | 24 ------------------------ sources | 2 +- xulrunner.spec | 9 +++++---- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 mozilla-comodo-646460.patch diff --git a/.gitignore b/.gitignore index 71070c7..9968b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.15.source.tar.bz2 /xulrunner-1.9.2.16.source.tar.bz2 /xulrunner-1.9.2.17.source.tar.bz2 +/xulrunner-1.9.2.18.source.tar.bz2 diff --git a/mozilla-comodo-646460.patch b/mozilla-comodo-646460.patch deleted file mode 100644 index a9f806d..0000000 --- a/mozilla-comodo-646460.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp ---- a/security/manager/ssl/src/nsNSSIOLayer.cpp -+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp -@@ -3339,16 +3339,20 @@ cancel_and_failure(nsNSSSocketInfo* info - { - infoObject->SetCanceled(PR_TRUE); - return SECFailure; - } - - static SECStatus - nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket) - { -+ // cert was revoked, don't do anything else -+ if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE) -+ return SECFailure; -+ - nsNSSShutDownPreventionLock locker; - nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg; - if (!infoObject) - return SECFailure; - - if (nsSSLThread::exitRequested()) - return cancel_and_failure(infoObject); - diff --git a/sources b/sources index bdf1b14..48ec94e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49509c51010bd91a198aee63780aeaf9 xulrunner-1.9.2.17.source.tar.bz2 +2f1b6f82c6f3fa59254b32468e29e008 xulrunner-1.9.2.18.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 00c9fd7..f3241a7 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -22,8 +22,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.17 -Release: 2%{?pretag}%{?dist} +Version: 1.9.2.18 +Release: 1%{?pretag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -48,7 +48,6 @@ Patch20: mozilla-192-pkgconfig.patch Patch24: crashreporter-remove-static.patch # Upstream patches -Patch30: mozilla-comodo-646460.patch # --------------------------------------------------- @@ -143,7 +142,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk %patch24 -p1 -b .static -%patch30 -p1 -b .646460 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -446,6 +444,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jun 21 2011 Jan Horak - 1.9.2.18-1 +- Update to 1.9.2.18 + * Thu Apr 28 2011 Jan Horak - 1.9.2.17-2 - Update to 1.9.2.17