[arch-commits] Commit in kmess/trunk (PKGBUILD giflib-5.0.patch)

[Jan de Groot]

    Date: Wednesday, June 11, 2014 @ 15:27:40
  Author: jgc
Revision: 113013

upgpkg: kmess 2.0.6.2-6

giflib rebuild

Modified:
  kmess/trunk/PKGBUILD
  kmess/trunk/giflib-5.0.patch

------------------+
 PKGBUILD         |    6 +++---
 giflib-5.0.patch |   30 ++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-11 13:18:17 UTC (rev 113012)
+++ PKGBUILD	2014-06-11 13:27:40 UTC (rev 113013)
@@ -5,7 +5,7 @@
 
 pkgname=kmess
 pkgver=2.0.6.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A MSN Messenger client for Linux"
 arch=('i686' 'x86_64')
 url='http://kmess.sourceforge.net/'
@@ -18,7 +18,7 @@
         giflib-5.0.patch
         fix-crash-in-contactlistmodel.patch)
 md5sums=('a2e57911713308bef81b9347135cc5dd'
-         '97734b073bf4a45ed3612d7626541cee'
+         '29f7a0c0e27d6b5cafbc3ad498e3e30f'
          'fdfe837f4bd64a5123edc63019bd5cf2')
 
 prepare() {
@@ -27,7 +27,7 @@
   # Fix invalid PNG images to work with libpng 1.6
   find -name '*.png' -exec optipng -quiet -force -fix {} +
 
-  patch -Np1 -i ../giflib-5.0.patch
+  patch -Np0 -i ../giflib-5.0.patch
 
   # Fix crash in ContactListModel (FS#32402)
   patch -Np1 -i ../fix-crash-in-contactlistmodel.patch

Modified: giflib-5.0.patch
===================================================================
--- giflib-5.0.patch	2014-06-11 13:18:17 UTC (rev 113012)
+++ giflib-5.0.patch	2014-06-11 13:27:40 UTC (rev 113013)
@@ -1,7 +1,15 @@
-diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
---- a/contrib/isf-qt/src/isfqt.cpp	2012-02-18 16:28:01.000000000 +0000
-+++ b/contrib/isf-qt/src/isfqt.cpp	2013-07-30 20:51:06.705394145 +0000
-@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+--- contrib/isf-qt/src/isfqt.cpp.orig	2014-06-11 13:10:43.137321400 +0000
++++ contrib/isf-qt/src/isfqt.cpp	2014-06-11 13:12:23.123474616 +0000
+@@ -249,7 +249,7 @@
+     qWarning() << "Couldn't initialize GIF library!";
+   }
+ 
+-  DGifCloseFile( gifImage );
++  DGifCloseFile( gifImage, NULL );
+   gifData.close();
+ */
+ 
+@@ -484,12 +484,13 @@
    int             width     = isfImage.width();
    int             numColors = 0;
    bool            gifError  = true;
@@ -16,7 +24,7 @@
    if( gifImage == 0 )
    {
      qWarning() << "Couldn't initialize gif library!";
-@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw
+@@ -503,7 +504,7 @@
      numColors = 256;
    }
  
@@ -25,7 +33,7 @@
    if( cmap == 0 && isfImage.numColors() > 1 )
    {
      qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!";
-@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw
+@@ -576,7 +577,7 @@
    else
    {
      // Write the extension
@@ -34,7 +42,7 @@
      {
        qWarning() << "EGifPutExtensionFirst failed!";
        goto writeError;
-@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw
+@@ -590,9 +591,9 @@
      // Write all the full data blocks
      while( length >= MAX_GIF_BYTE )
      {
@@ -46,7 +54,7 @@
          goto writeError;
        }
  
-@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw
+@@ -603,17 +604,17 @@
      // Write the last block
      if( length > 0 )
      {
@@ -68,11 +76,13 @@
          goto writeError;
        }
      }
-@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw
+@@ -623,13 +624,13 @@
+ 
  writeError:
    // Clean up the GIF converter etc
-   EGifCloseFile( gifImage );
+-  EGifCloseFile( gifImage );
 -  FreeMapObject( cmap );
++  EGifCloseFile( gifImage, NULL );
 +  GifFreeMapObject( cmap );
    gifData.close();