--- a/ChangeLog Mon Nov 16 05:30:39 2009 +0000
+++ b/ChangeLog Mon Nov 16 06:31:57 2009 +0000
@@ -1,3 +1,10 @@
+2009-11-16 Krishnan Parthasarathi <[email protected]>
+
+ * base-specs/firefox.spec: bump firefox to version 3.5.5
+ * patches/firefox3-04-oggplay.diff: removed
+ * patches/firefox3-28-ss-privacy-level.diff: removed
+ * Fixes CR 6895892
+
2009-11-13 Krishnan Parthasarathi <[email protected]>
* base-specs/nautilus.spec:
--- a/base-specs/firefox.spec Mon Nov 16 05:30:39 2009 +0000
+++ b/base-specs/firefox.spec Mon Nov 16 06:31:57 2009 +0000
@@ -10,8 +10,8 @@
Name: firefox
Summary: Mozilla Firefox Web browser
-Version: 3.5.3
-%define tarball_version 3.5.3
+Version: 3.5.5
+%define tarball_version 3.5.5
Release: 1
Copyright: MPL/LGPL
Group: Applications/Internet
@@ -40,10 +40,6 @@
# bugster:6542910
Patch3: firefox3-03-disable-online-update.diff
-# owner:ginnchen date:2009-04-27 type:bug
-# bugzilla:487197
-Patch4: firefox3-04-oggplay.diff
-
# owner:fujiwara date:2008-04-10 type:bug
# bugster:6686579 bugzilla:285267
Patch5: firefox3-05-g11n-nav-lang.diff
@@ -78,10 +74,6 @@
# owner:hawklu date:2008-04-20 type:branding bugster:664645
Patch20: firefox3-20-gen-devel-files.diff
-# owner:ginnchen date:2009-03-30 type:branding
-# disable sessionstore for form by default
-Patch28 : firefox3-28-ss-privacy-level.diff
-
%if %option_with_indiana_branding
# owner:alfred date:2009-03-02 type:branding
Patch29 : firefox3-29-getting-started.diff
@@ -147,7 +139,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@@ -158,7 +149,6 @@
%patch14 -p1
%patch19 -p1
%patch20 -p1
-%patch28 -p1
%patch31 -p1
%if %option_with_indiana_branding
@@ -351,6 +341,11 @@
%{_datadir}/pixmaps/%{name}-icon.png
%changelog
+* Mon Nov 16 2009 [email protected]
+ Bump to version 3.5.5 to fix CR 6895892
+ patches/firefox3-04-oggplay.diff: removed
+ patches/firefox3-28-ss-privacy-level.diff: removed
+
* Fri Aug 14 2009 [email protected]
Bump to version 3.5.2 to fix CR 6868125
patches/firefox3-12-bug492720.diff:removed (upstreamed)
--- a/patches/firefox3-04-oggplay.diff Mon Nov 16 05:30:39 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-diff -r ed1f93938bf5 media/liboggplay/src/liboggplay/oggplay_yuv2rgb.c
---- a/media/liboggplay/src/liboggplay/oggplay_yuv2rgb.c Thu May 21 20:27:30 2009 -0700
-+++ b/media/liboggplay/src/liboggplay/oggplay_yuv2rgb.c Fri May 22 14:46:17 2009 +0800
-@@ -44,8 +44,15 @@
- #include "oggplay_private.h"
- #include "oggplay_yuv2rgb_template.h"
-
-+#ifdef __SUNPRO_C
-+#define DISABLE_CPU_FEATURES
-+/* gcc inline asm and intristics have problems with Sun Studio.
-+ * We need to fix it.
-+ */
-+#else
- /* cpu extension detection */
- #include "cpu.c"
-+#endif
-
- /**
- * yuv_convert_fptr type is a function pointer type for
-@@ -138,18 +145,25 @@
- #undef CONVERT
- #undef CLEANUP
-
-+#ifndef DISABLE_CPU_FEATURES
- /* although we use cpu runtime detection, we still need these
- * macros as there's no way e.g. we could compile a x86 asm code
- * on a ppc machine and vica-versa
- */
- #if defined(i386) || defined(__x86__) || defined(__x86_64__) || defined(_M_IX86)
-+#define ENABLE_MMX
- #include "x86/oggplay_yuv2rgb_x86.c"
-+#if defined(ATTRIBUTE_ALIGNED_MAX) && ATTRIBUTE_ALIGNED_MAX >= 16
-+#define ENABLE_SSE2
-+#endif
- #elif defined(__ppc__) || defined(__ppc64__)
-+#define ENABLE_ALTIVEC
- //altivec intristics only working with -maltivec gcc flag,
- //but we want runtime altivec detection, hence this has to be
- //fixed!
- //#include "oggplay_yuv2rgb_altivec.c"
- #endif
-+#endif
-
-
- /**
-@@ -184,9 +198,11 @@
- if ( yuv_conv.yuv2rgba == NULL )
- {
- init_vanilla_coeffs ();
-- features = oc_cpu_flags_get();
--#if defined(i386) || defined(__x86__) || defined(__x86_64__) || defined(_M_IX86)
--#if defined(ATTRIBUTE_ALIGNED_MAX) && ATTRIBUTE_ALIGNED_MAX >= 16
-+#ifndef DISABLE_CPU_FEATURES
-+ features = oc_cpu_flags_get();
-+#endif
-+#ifdef ENABLE_MMX
-+#ifdef ENABLE_SSE2
- if (features & OC_CPU_X86_SSE2)
- {
- yuv_conv.yuv2rgba = yuv420_to_rgba_sse2;
-@@ -195,7 +211,7 @@
- return;
- }
- else
--#endif /* ATTRIBUTE_ALIGNED_MAX */
-+#endif /* SSE2 */
- if (features & OC_CPU_X86_MMXEXT)
- {
- yuv_conv.yuv2rgba = yuv420_to_rgba_sse;
-@@ -210,7 +226,7 @@
- yuv_conv.yuv2argb = yuv420_to_argb_mmx;
- return;
- }
--#elif defined(__ppc__) || defined(__ppc64__)
-+#elif defined(ENABLE_ALTIVEC)
- if (features & OC_CPU_PPC_ALTIVEC)
- {
- yuv_conv.yuv2rgba = yuv420_to_abgr_vanilla;
-@@ -219,7 +235,7 @@
- return;
- }
- #endif
-- /*
-+ /*
- * no CPU extension was found... using vanilla converter, with respect
- * to the endianness of the host
- */
--- a/patches/firefox3-28-ss-privacy-level.diff Mon Nov 16 05:30:39 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -729,7 +729,7 @@
- pref("browser.sessionstore.postdata", 0);
- // on which sites to save text data, POSTDATA and cookies
- // 0 = everywhere, 1 = unencrypted sites, 2 = nowhere
--pref("browser.sessionstore.privacy_level", 1);
-+pref("browser.sessionstore.privacy_level", 2);
- // how many tabs can be reopened (per window)
- pref("browser.sessionstore.max_tabs_undo", 10);
- // how many windows can be reopened (per session) - on non-OS X platforms this