[arch-commits] Commit in seamonkey/trunk (PKGBUILD libpng15.patch)

[Ionut Biru]

    Date: Thursday, February 2, 2012 @ 11:48:30
  Author: ibiru
Revision: 148494

update to 2.7

Modified:
  seamonkey/trunk/PKGBUILD
Deleted:
  seamonkey/trunk/libpng15.patch

----------------+
 PKGBUILD       |   13 +++++--------
 libpng15.patch |   52 ----------------------------------------------------
 2 files changed, 5 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-02 15:30:16 UTC (rev 148493)
+++ PKGBUILD	2012-02-02 16:48:30 UTC (rev 148494)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=seamonkey
-pkgver=2.6.1
-pkgrel=2
+pkgver=2.7
+pkgrel=1
 pkgdesc="SeaMonkey internet suite"
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -13,18 +13,15 @@
 source=(ftp://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2
         mozconfig
         seamonkey.desktop
-        seamonkey-2.0-lang.patch
-        libpng15.patch)
-md5sums=('69a43877107f97cfc7504829405ba319'
+        seamonkey-2.0-lang.patch)
+md5sums=('a566e49ab96ba93ceea1a3c636757435'
          'd02b5f002a7cdf8d15dccd2548d09256'
          '6119a2254716752c9d08e366f8d4c048'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         'dc77000ddcbb6d9e17220c759fdcb94e')
+         '25b6fe16ac24cd5c852213e5c1adb272')
 
 build() {
   cd "$srcdir/comm-release"
   patch -Np1 -i "$srcdir/seamonkey-2.0-lang.patch"
-  patch -Np1 -i "$srcdir/libpng15.patch"
 
   cp "$srcdir/mozconfig" .mozconfig
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"

Deleted: libpng15.patch
===================================================================
--- libpng15.patch	2012-02-02 15:30:16 UTC (rev 148493)
+++ libpng15.patch	2012-02-02 16:48:30 UTC (rev 148494)
@@ -1,52 +0,0 @@
-diff -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
---- comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp	2012-01-29 19:29:28.121217854 +0000
-+++ comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp	2012-01-29 19:32:05.489944419 +0000
-@@ -385,8 +385,7 @@
- 
-     // 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 -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
---- comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h	2012-01-29 19:29:28.121217854 +0000
-+++ comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h	2012-01-29 19:32:05.489944419 +0000
-@@ -73,19 +73,25 @@
- 
-   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: