From 64f9399de47556212d0cebc2331e33b428d9b711 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 20 Jun 2010 16:46:24 +0000
Subject: Improve patch after discussion with upstream.

---
 misc/koffice/distinfo         | 4 ++--
 misc/koffice/patches/patch-aa | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'misc')

diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index e5cd5a30036..ad7d4ff1fbc 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2010/06/13 22:45:01 wiz Exp $
+$NetBSD: distinfo,v 1.47 2010/06/20 16:46:24 wiz Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -9,7 +9,7 @@ Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
 SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59
 RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95
 Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes
-SHA1 (patch-aa) = dd97dc016c7de83f163f34bba6b8e5d91a604f89
+SHA1 (patch-aa) = 78efadde329158d1e41f8a0c899055e265485234
 SHA1 (patch-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
index 426291ae539..d42caef4876 100644
--- a/misc/koffice/patches/patch-aa
+++ b/misc/koffice/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.13 2010/06/13 22:45:01 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2010/06/20 16:46:24 wiz Exp $
 
 --- filters/krita/png/kis_png_converter.cc.orig	2007-05-30 21:39:37.000000000 +0000
 +++ filters/krita/png/kis_png_converter.cc
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.13 2010/06/13 22:45:01 wiz Exp $
  void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass)
  {
 -    if(png_ptr == NULL || row_number > PNG_MAX_UINT || pass > 7) return;
-+    if(png_ptr == NULL || row_number > PNG_UINT_32_MAX || pass > 7) return;
++    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
  //     setProgress(row_number);
  }
  
-- 
cgit v1.2.3