[pkgsrc/pkgsrc-2005Q1]: pkgsrc/x11/kdelibs3 Pullup ticket 480 - requested by ...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45fa3a1032ad
branches:  pkgsrc-2005Q1
changeset: 491031:45fa3a1032ad
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu May 12 13:56:25 2005 +0000

description:
Pullup ticket 480 - requested by Mark Davies
fir for regression in kdelibs3

Patch provided by the submitter.

   Module Name:         pkgsrc
   Committed By:        markd
   Date:                Wed May  4 13:45:51 UTC 2005

   Modified Files:
        pkgsrc/x11/kdelibs3: Makefile distinfo
        pkgsrc/x11/kdelibs3/patches: patch-dk

   Log Message:
   Previous patch introduced a regression, breaking reading of .rgb images
   in most cases.
   From http://www.kde.org/info/security/advisory-20050504-1.txt
   Bump PKGREVISION.

diffstat:

 x11/kdelibs3/Makefile         |   4 ++--
 x11/kdelibs3/distinfo         |   4 ++--
 x11/kdelibs3/patches/patch-dk |  11 +----------
 3 files changed, 5 insertions(+), 14 deletions(-)

diffs (56 lines):

diff -r 22605b6de89c -r 45fa3a1032ad x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Wed May 11 14:19:02 2005 +0000
+++ b/x11/kdelibs3/Makefile     Thu May 12 13:56:25 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78.2.2 2005/05/01 22:06:20 salo Exp $
+# $NetBSD: Makefile,v 1.78.2.3 2005/05/12 13:56:25 salo Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
diff -r 22605b6de89c -r 45fa3a1032ad x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Wed May 11 14:19:02 2005 +0000
+++ b/x11/kdelibs3/distinfo     Thu May 12 13:56:25 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51.2.2 2005/05/01 22:06:20 salo Exp $
+$NetBSD: distinfo,v 1.51.2.3 2005/05/12 13:56:25 salo Exp $
 
 SHA1 (kdelibs-3.3.2.tar.bz2) = 69325b603375d31d4d537955383f4893e4a7945f
 RMD160 (kdelibs-3.3.2.tar.bz2) = 66d8bf05cff7aaf875a640a08b1a259085385036
@@ -34,7 +34,7 @@
 SHA1 (patch-de) = 264b50a9519d1839d39c18ae313e20078ef5b76c
 SHA1 (patch-df) = 1459e51ed359dffe74f62fe68f548dd154239a8a
 SHA1 (patch-di) = 6bbf926ec725cd3b931a9afc5e209cd3bed054cb
-SHA1 (patch-dk) = 7ad537406bd0bb828a551d1b670ce162c44d455c
+SHA1 (patch-dk) = 9744a11ce2597ee5b3f7f3213ee6071d17d49086
 SHA1 (patch-dl) = c264ed98a0aacab38cd4219c25e8d434337a9d8f
 SHA1 (patch-dm) = f6c25b8a9d2cbbdcd9ceff3dc395162366fc02e1
 SHA1 (patch-dn) = 5b458c20025319ddae173b8ca9ccd523f302d7b0
diff -r 22605b6de89c -r 45fa3a1032ad x11/kdelibs3/patches/patch-dk
--- a/x11/kdelibs3/patches/patch-dk     Wed May 11 14:19:02 2005 +0000
+++ b/x11/kdelibs3/patches/patch-dk     Thu May 12 13:56:25 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-dk,v 1.1.2.2 2005/05/01 22:06:21 salo Exp $
+$NetBSD: patch-dk,v 1.1.2.3 2005/05/12 13:56:25 salo Exp $
 
 --- kimgio/rgb.cpp.orig        2004-06-23 05:36:40.000000000 +1200
 +++ kimgio/rgb.cpp
@@ -44,15 +44,6 @@
                for (x = 0; x < m_xsize; x++, c++)
                        *c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]);
        }
-@@ -270,7 +272,7 @@ bool SGIImage::readImage(QImage& img)
-       // sanity ckeck
-       if (m_rle)
-               for (uint o = 0; o < m_numrows; o++)
--                      if (m_starttab[o] + m_lengthtab[o] > m_data.size()) {
-+                      if (m_starttab[o] + m_lengthtab[o] >= m_data.size()) {
-                               kdDebug(399) << "image corrupt (sanity check failed)" << endl;
-                               return false;
-                       }
 @@ -351,24 +353,32 @@ uchar SGIImage::intensity(uchar c)
  
  uint SGIImage::compact(uchar *d, uchar *s)