[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Previous patch introduced a regression, b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8fa5bd7d668d
branches:  trunk
changeset: 493376:8fa5bd7d668d
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed May 04 13:45:51 2005 +0000

description:
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 (50 lines):

diff -r 6d6c7451f933 -r 8fa5bd7d668d x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Wed May 04 12:37:02 2005 +0000
+++ b/x11/kdelibs3/Makefile     Wed May 04 13:45:51 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2005/05/01 04:35:39 markd Exp $
+# $NetBSD: Makefile,v 1.85 2005/05/04 13:45:51 markd Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
diff -r 6d6c7451f933 -r 8fa5bd7d668d x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Wed May 04 12:37:02 2005 +0000
+++ b/x11/kdelibs3/distinfo     Wed May 04 13:45:51 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2005/05/01 04:35:39 markd Exp $
+$NetBSD: distinfo,v 1.56 2005/05/04 13:45:51 markd Exp $
 
 SHA1 (kdelibs-3.4.0.tar.bz2) = ca3ded4105a500dae5170ccf85cd62af98b33961
 RMD160 (kdelibs-3.4.0.tar.bz2) = 75917f60d115d770b5a8aa3922591e118c6bfdf0
@@ -28,4 +28,4 @@
 SHA1 (patch-dh) = 9981f590f83e4543e2e3478b607aed36afe373c5
 SHA1 (patch-di) = 6bbf926ec725cd3b931a9afc5e209cd3bed054cb
 SHA1 (patch-dj) = a90296d5453d4b7f776338c29300e3c475473d6b
-SHA1 (patch-dk) = c365d357c4bbc65238e04795d9012d1f3ebb54fe
+SHA1 (patch-dk) = 4d7c2fc36d854f6d727cd6be0390901dc031fbe2
diff -r 6d6c7451f933 -r 8fa5bd7d668d x11/kdelibs3/patches/patch-dk
--- a/x11/kdelibs3/patches/patch-dk     Wed May 04 12:37:02 2005 +0000
+++ b/x11/kdelibs3/patches/patch-dk     Wed May 04 13:45:51 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-dk,v 1.1 2005/05/01 04:35:40 markd Exp $
+$NetBSD: patch-dk,v 1.2 2005/05/04 13:45:51 markd Exp $
 
 --- kimgio/rgb.cpp.orig        2005-02-04 12:33:17.000000000 +1300
 +++ kimgio/rgb.cpp
@@ -44,12 +44,3 @@
                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;
-                       }