diff options
| author | wiz <wiz> | 2010-06-13 22:43:46 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-06-13 22:43:46 +0000 |
| commit | c3512e82cfd1ef757581484eb740c7cd398411b9 (patch) | |
| tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /misc/koffice | |
| parent | e9a8c2a53822e7578f98d3ebcd4e60f3d153b02a (diff) | |
| download | pkgsrc-c3512e82cfd1ef757581484eb740c7cd398411b9.tar.gz | |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'misc/koffice')
| -rw-r--r-- | misc/koffice/Makefile | 4 | ||||
| -rw-r--r-- | misc/koffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-aa | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index b47693897e8..675eaa0c794 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.118 2010/05/29 08:04:17 joerg Exp $ +# $NetBSD: Makefile,v 1.119 2010/06/13 22:45:01 wiz Exp $ DISTNAME= koffice-1.6.3 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.3/src/} EXTRACT_SUFX= .tar.bz2 diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 328dd95ca84..e5cd5a30036 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2009/11/03 19:02:26 markd Exp $ +$NetBSD: distinfo,v 1.46 2010/06/13 22:45:01 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,6 +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-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083 diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa new file mode 100644 index 00000000000..426291ae539 --- /dev/null +++ b/misc/koffice/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.13 2010/06/13 22:45:01 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 +@@ -785,7 +785,7 @@ void KisPNGConverter::cancel() + + 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; + // setProgress(row_number); + } + |