- removed obsolete libpng patch

Changed files:
    icedove-libpng.patch -> 1.7
    icedove.spec -> 1.147

diff --git a/icedove-libpng.patch b/icedove-libpng.patch
deleted file mode 100644 (file)
index 13e1658..0000000
--- a/icedove-libpng.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xulrunner-9.0.1/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h.orig       2011-12-21 00:28:33.000000000 +0100
-+++ xulrunner-9.0.1/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h    2012-01-16 18:43:35.830209631 +0100
-@@ -76,7 +76,7 @@
-   // Checks if the info header contains valid information
-   bool HasValidInfo() const 
-   {
--    return mInfo && mInfo->valid;
-+    return mInfo && png_get_valid(mPNG, mInfo, 0xFFFFFFFFU);
-   }
- 
-   // Obtain the pixel depth if available or 0 otherwise
-@@ -85,7 +85,8 @@
-     if (!mInfo) {
-       return 0;
-     }
--    return mInfo->pixel_depth;
-+    // XXX: shouldn't png_get_pixel_depth() be available?
-+    return png_get_bit_depth(mPNG, mInfo) * png_get_channels(mPNG, mInfo);
-   }
- 
- public:

diff --git a/icedove.spec b/icedove.spec
index e9ab9bfd2e1761fd980e8afb473bd89f65465ed6..68366ed8382419ee41e735925b77d84192efe32c 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -57,7 +57,7 @@ Patch5:               %{name}-hunspell.patch
 Patch6:                %{name}-prefs.patch
 Patch7:                system-mozldap.patch
 Patch8:                %{name}-makefile.patch
-#Patch9:               %{name}-libpng.patch
+
 Patch10:       %{name}-extensiondir.patch
 Patch11:       crashreporter.patch
 Patch12:       no-subshell.patch
@@ -197,7 +197,6 @@ cd mozilla
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
-#%%patch9 -p1
 %patch10 -p2
 %patch11 -p2
 %patch12 -p1