Automatic import for version 10.0

.abf.yml

@@ -1,3 +1,3 @@
 ---
 sources:
-  firefox-9.0.1.source.tar.bz2: e0748d86753eead5c0929d74158c601bf33b5db0
+  firefox-10.0.source.tar.bz2: cbf1fb0efe0a3a2b2dafaa324b136736e93de70c

firefox-9.0-libpng15x.diff

@@ -1,55 +0,0 @@
-
-https://hg.mozilla.org/mozilla-central/rev/aff1bd412058
-
-diff -Naurp mozilla-release/modules/libpr0n/decoders/nsICODecoder.cpp mozilla-release.oden/modules/libpr0n/decoders/nsICODecoder.cpp
---- mozilla-release/modules/libpr0n/decoders/nsICODecoder.cpp	2011-12-16 21:29:37.000000000 +0100
-+++ mozilla-release.oden/modules/libpr0n/decoders/nsICODecoder.cpp	2011-12-21 11:14:51.059478943 +0100
-@@ -385,8 +385,7 @@ nsICODecoder::WriteInternal(const char*
- 
-     // Raymond Chen says that 32bpp only are valid PNG ICOs
-     // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
--    if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && 
--        static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
-+    if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
-       PostDataError();
-     }
-     return;
-diff -Naurp mozilla-release/modules/libpr0n/decoders/nsPNGDecoder.h mozilla-release.oden/modules/libpr0n/decoders/nsPNGDecoder.h
---- mozilla-release/modules/libpr0n/decoders/nsPNGDecoder.h	2011-12-16 21:29:37.000000000 +0100
-+++ mozilla-release.oden/modules/libpr0n/decoders/nsPNGDecoder.h	2011-12-21 11:15:04.692567378 +0100
-@@ -73,19 +73,25 @@ public:
- 
-   void EndImageFrame();
- 
--  // Checks if the info header contains valid information
--  bool HasValidInfo() const 
-+  // Check if PNG is valid ICO (32bpp RGBA)
-+  // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
-+  bool IsValidICO() const
-   {
--    return mInfo && mInfo->valid;
--  }
-+    png_uint_32
-+        png_width,  // Unused
-+        png_height; // Unused
- 
--  // Obtain the pixel depth if available or 0 otherwise
--  PRInt32 GetPixelDepth() const
--  {
--    if (!mInfo) {
--      return 0;
-+    int png_bit_depth,
-+        png_color_type;
-+
-+    if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
-+                     &png_color_type, NULL, NULL, NULL)) {
-+
-+      return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-+              png_bit_depth == 8);
-+    } else {
-+      return false;
-     }
--    return mInfo->pixel_depth;
-   }
- 
- public:

firefox.spec

@@ -1,5 +1,5 @@
-%define major 9
-%define realver %{major}.0.1
+%define major 10
+%define realver %{major}.0
 
 # (tpg) MOZILLA_FIVE_HOME
 %define mozillalibdir %{_libdir}/%{name}-%{realver}
@@ -8,7 +8,7 @@
 
 %if %mandriva_branch == Cooker
 # Cooker
-%define release 1
+%define release 0.1
 %else
 # Old distros
 %define subrel 1
@@ -45,7 +45,6 @@ Patch41:	mozilla-kde.patch
 # the default web browser" is used fix mdv bug#58784
 Patch5:		firefox-3.6.3-appname.patch
 Patch6:		firefox-5.0-asciidel.patch
-Patch7:		firefox-9.0-libpng15x.diff
 BuildRequires:	gtk+2-devel
 Requires:	%{mklibname sqlite3_ 0} >= %{sqlite3_version}
 BuildRequires:	sqlite3-devel >= 3.7.1
@@ -58,7 +57,7 @@ BuildRequires:	libproxy-devel
 BuildRequires:	libalsa-devel
 BuildRequires:	libiw-devel
 BuildRequires:	libevent-devel >= 1.4.7
-BuildRequires:	libvpx-devel >= 0.9.5
+BuildRequires:	libvpx-devel >= 0.9.7
 BuildRequires:	unzip
 BuildRequires:	zip
 #(tpg) older versions doesn't support apng extension
@@ -105,11 +104,10 @@ Files and macros mainly for building Firefox extensions.
 %patch2 -p1 -b .vendor
 %patch3 -p1 -b .defaultbrowser
 %patch6 -p1 -b .wintitle
-%patch7 -p1 -b .libpng15x
 ## KDE INTEGRATION
 # copy current files and patch them later to keep them in sync
-%patch4 -p1 -b .kde
-%patch41 -F 1 -p1 -b .kdemoz
+# %%patch4 -p1 -b .kde
+# %%patch41 -F 1 -p1 -b .kdemoz
 # install kde.js
 install -m 644 %{SOURCE9} browser/app/profile/kde.js
 
@@ -276,6 +274,14 @@ fi
 
 
 %changelog
+* Thu Feb 02 2012 Oden Eriksson <oeriksson@mandriva.com> 10.0-0.1
++ Revision: 770749
+- disable the kde patches for now
+- fix deps
+- 10.0
+- rediffed P4 (kde patch)
+- dropped P7 (fixed upstream)
+
 * Fri Jan 13 2012 Oden Eriksson <oeriksson@mandriva.com> 9.0.1-1
 + Revision: 760609
 - sync with MDVA-2011:096