diff options
| author | markd <markd@pkgsrc.org> | 2005-05-04 13:45:51 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2005-05-04 13:45:51 +0000 |
| commit | e15aafb4b0295494544657c56d2dc4ebc0583356 (patch) | |
| tree | 31e88c97d844287c5458762177997514e5899440 /x11 | |
| parent | 04ee24bcea916e6e3fc3711448be02a4376a5b6d (diff) | |
| download | pkgsrc-e15aafb4b0295494544657c56d2dc4ebc0583356.tar.gz | |
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 (limited to 'x11')
| -rw-r--r-- | x11/kdelibs3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs3/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdelibs3/patches/patch-dk | 11 |
3 files changed, 5 insertions, 14 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 4845c4709fc..b11efd22979 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -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 --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 96ead01b339..e852938abff 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -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-dg) = a10324f6c8e82672a62af45113887e14ea80f344 SHA1 (patch-dh) = 9981f590f83e4543e2e3478b607aed36afe373c5 SHA1 (patch-di) = 6bbf926ec725cd3b931a9afc5e209cd3bed054cb SHA1 (patch-dj) = a90296d5453d4b7f776338c29300e3c475473d6b -SHA1 (patch-dk) = c365d357c4bbc65238e04795d9012d1f3ebb54fe +SHA1 (patch-dk) = 4d7c2fc36d854f6d727cd6be0390901dc031fbe2 diff --git a/x11/kdelibs3/patches/patch-dk b/x11/kdelibs3/patches/patch-dk index dc8d0a34ba6..7ca38df2f22 100644 --- a/x11/kdelibs3/patches/patch-dk +++ b/x11/kdelibs3/patches/patch-dk @@ -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 @@ $NetBSD: patch-dk,v 1.1 2005/05/01 04:35:40 markd Exp $ 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; - } |