head 1.15; access; symbols pkgsrc-2017Q3:1.14.0.72 pkgsrc-2017Q3-base:1.14 pkgsrc-2017Q2:1.14.0.68 pkgsrc-2017Q2-base:1.14 pkgsrc-2017Q1:1.14.0.66 pkgsrc-2017Q1-base:1.14 pkgsrc-2016Q4:1.14.0.64 pkgsrc-2016Q4-base:1.14 pkgsrc-2016Q3:1.14.0.62 pkgsrc-2016Q3-base:1.14 pkgsrc-2016Q2:1.14.0.60 pkgsrc-2016Q2-base:1.14 pkgsrc-2016Q1:1.14.0.58 pkgsrc-2016Q1-base:1.14 pkgsrc-2015Q4:1.14.0.56 pkgsrc-2015Q4-base:1.14 pkgsrc-2015Q3:1.14.0.54 pkgsrc-2015Q3-base:1.14 pkgsrc-2015Q2:1.14.0.52 pkgsrc-2015Q2-base:1.14 pkgsrc-2015Q1:1.14.0.50 pkgsrc-2015Q1-base:1.14 pkgsrc-2014Q4:1.14.0.48 pkgsrc-2014Q4-base:1.14 pkgsrc-2014Q3:1.14.0.46 pkgsrc-2014Q3-base:1.14 pkgsrc-2014Q2:1.14.0.44 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.42 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.14.0.40 pkgsrc-2013Q4-base:1.14 pkgsrc-2013Q3:1.14.0.38 pkgsrc-2013Q3-base:1.14 pkgsrc-2013Q2:1.14.0.36 pkgsrc-2013Q2-base:1.14 pkgsrc-2013Q1:1.14.0.34 pkgsrc-2013Q1-base:1.14 pkgsrc-2012Q4:1.14.0.32 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.14.0.30 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.28 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.14.0.26 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.14.0.24 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q3:1.14.0.22 pkgsrc-2011Q3-base:1.14 pkgsrc-2011Q2:1.14.0.20 pkgsrc-2011Q2-base:1.14 pkgsrc-2011Q1:1.14.0.18 pkgsrc-2011Q1-base:1.14 pkgsrc-2010Q4:1.14.0.16 pkgsrc-2010Q4-base:1.14 pkgsrc-2010Q3:1.14.0.14 pkgsrc-2010Q3-base:1.14 pkgsrc-2010Q2:1.14.0.12 pkgsrc-2010Q2-base:1.14 pkgsrc-2010Q1:1.14.0.10 pkgsrc-2010Q1-base:1.14 pkgsrc-2009Q4:1.14.0.8 pkgsrc-2009Q4-base:1.14 pkgsrc-2009Q3:1.14.0.6 pkgsrc-2009Q3-base:1.14 pkgsrc-2009Q2:1.14.0.4 pkgsrc-2009Q2-base:1.14 pkgsrc-2009Q1:1.14.0.2 pkgsrc-2008Q4:1.13.0.24 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.13.0.22 pkgsrc-2008Q3-base:1.13 cube-native-xorg:1.13.0.20 cube-native-xorg-base:1.13 pkgsrc-2008Q2:1.13.0.18 pkgsrc-2008Q2-base:1.13 pkgsrc-2008Q1:1.13.0.16 pkgsrc-2008Q1-base:1.13 pkgsrc-2007Q4:1.13.0.14 pkgsrc-2007Q4-base:1.13 pkgsrc-2007Q3:1.13.0.12 pkgsrc-2007Q3-base:1.13 pkgsrc-2007Q2:1.13.0.10 pkgsrc-2007Q2-base:1.13 pkgsrc-2007Q1:1.13.0.8 pkgsrc-2007Q1-base:1.13 pkgsrc-2006Q4:1.13.0.6 pkgsrc-2006Q4-base:1.13 pkgsrc-2006Q3:1.13.0.4 pkgsrc-2006Q3-base:1.13 pkgsrc-2006Q2:1.13.0.2 pkgsrc-2006Q2-base:1.13 pkgsrc-2006Q1:1.10.0.2 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.9.0.2 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.8.0.4 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.2 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.1.1.0.4 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.8 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.15 date 2017.09.26.10.27.03; author wiz; state dead; branches; next 1.14; commitid 9ARpkXTuh9Wg2H8A; 1.14 date 2009.06.03.12.29.42; author markd; state Exp; branches 1.14.2.1; next 1.13; 1.13 date 2006.06.01.14.19.08; author markd; state dead; branches; next 1.12; 1.12 date 2006.05.31.13.52.54; author tron; state Exp; branches; next 1.11; 1.11 date 2006.03.30.03.02.01; author markd; state dead; branches; next 1.10; 1.10 date 2006.01.31.22.47.11; author markd; state Exp; branches; next 1.9; 1.9 date 2005.12.11.13.00.12; author markd; state Exp; branches; next 1.8; 1.8 date 2005.05.31.15.01.31; author markd; state dead; branches; next 1.7; 1.7 date 2005.03.29.11.03.18; author markd; state Exp; branches; next 1.6; 1.6 date 2005.03.23.22.26.26; author markd; state dead; branches; next 1.5; 1.5 date 2004.12.23.13.02.17; author markd; state Exp; branches; next 1.4; 1.4 date 2004.04.20.13.52.06; author markd; state dead; branches 1.4.6.1; next 1.3; 1.3 date 2004.03.14.00.44.27; author markd; state Exp; branches; next 1.2; 1.2 date 2003.03.11.13.24.58; author markd; state dead; branches; next 1.1; 1.1 date 2002.06.05.08.58.02; author skrll; state Exp; branches 1.1.1.1; next ; 1.14.2.1 date 2009.06.03.12.29.42; author tron; state dead; branches; next 1.14.2.2; 1.14.2.2 date 2009.06.04.16.49.30; author tron; state Exp; branches; next ; 1.4.6.1 date 2004.12.23.18.53.39; author snj; state Exp; branches; next ; 1.1.1.1 date 2002.06.05.08.58.02; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.06.05.08.58.02; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.46.28; author jlam; state Exp; branches; next ; desc @@ 1.15 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-aa,v 1.14 2009/06/03 12:29:42 markd Exp $ poppler git patch f86514c3fbc867fc6457feacba23451e89993524 poppler git patch ac16174da1d6f19445f78e7cd7c4a18cb9524dde --- kpdf/xpdf/xpdf/PSOutputDev.cc.orig 2007-10-08 22:48:37.000000000 +1300 +++ kpdf/xpdf/xpdf/PSOutputDev.cc @@@@ -2547,6 +2547,7 @@@@ void PSOutputDev::setupImage(Ref id, Str GString *s; int c; int size, line, col, i; + int outerSize, outer; // check if image is already setup for (i = 0; i < imgIDLen; ++i) { @@@@ -2633,56 +2634,72 @@@@ void PSOutputDev::setupImage(Ref id, Str if (useRLE) { ++size; } + outerSize = size/65535 + 1; + writePSFmt("{0:d} array dup /ImData_{1:d}_{2:d} exch def\n", - size, id.num, id.gen); + outerSize, id.num, id.gen); str->close(); // write the data into the array str->reset(); - line = col = 0; - writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~")); - do { - do { - c = str->getChar(); - } while (c == '\n' || c == '\r'); - if (c == (useASCIIHex ? '>' : '~') || c == EOF) { - break; - } - if (c == 'z') { - writePSChar(c); - ++col; - } else { - writePSChar(c); - ++col; - for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) { - do { - c = str->getChar(); - } while (c == '\n' || c == '\r'); - if (c == (useASCIIHex ? '>' : '~') || c == EOF) { - break; - } + for (outer = 0;outer < outerSize;outer++) { + int innerSize = size > 65535 ? 65535 : size; + + // put the inner array into the outer array + writePSFmt("{0:d} array 1 index {1:d} 2 index put\n", + innerSize, outer); + line = col = 0; + writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~")); + for (;;) { + do { + c = str->getChar(); + } while (c == '\n' || c == '\r'); + if (c == (useASCIIHex ? '>' : '~') || c == EOF) { + break; + } + if (c == 'z') { writePSChar(c); ++col; + } else { + writePSChar(c); + ++col; + for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) { + do { + c = str->getChar(); + } while (c == '\n' || c == '\r'); + if (c == (useASCIIHex ? '>' : '~') || c == EOF) { + break; + } + writePSChar(c); + ++col; + } + } + // each line is: "dup nnnnn <~...data...~> put" + // so max data length = 255 - 20 = 235 + // chunks are 1 or 4 bytes each, so we have to stop at 232 + // but make it 225 just to be safe + if (col > 225) { + writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n")); + ++line; + if (line >= innerSize) break; + writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line); + col = 0; } } - // each line is: "dup nnnnn <~...data...~> put" - // so max data length = 255 - 20 = 235 - // chunks are 1 or 4 bytes each, so we have to stop at 232 - // but make it 225 just to be safe - if (col > 225) { + if (c == (useASCIIHex ? '>' : '~') || c == EOF) { writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n")); - ++line; - writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line); - col = 0; + if (useRLE) { + ++line; + writePSFmt("{0:d} <> put\n", line); + } else { + writePS("pop\n"); + } + break; } - } while (c != (useASCIIHex ? '>' : '~') && c != EOF); - writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n")); - if (useRLE) { - ++line; - writePSFmt("{0:d} <> put\n", line); - } else { writePS("pop\n"); + size -= innerSize; } + writePS("pop\n"); str->close(); delete str; @@@@ -4299,8 +4316,10 @@@@ void PSOutputDev::doImageL1(Object *ref, str->close(); delete str; } else { + // make sure the image is setup, it sometimes is not like on bug #17645 + setupImage(ref->getRef(), str); // set up to use the array already created by setupImages() - writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen()); + writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen()); } } @@@@ -4760,8 +4779,10 @@@@ void PSOutputDev::doImageL2(Object *ref, str2->close(); delete str2; } else { + // make sure the image is setup, it sometimes is not like on bug #17645 + setupImage(ref->getRef(), str); // set up to use the array already created by setupImages() - writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen()); + writePSFmt("ImData_{0:d}_{1:d} 0 0\n",ref->getRefNum(), ref->getRefGen()); } } @@@@ -4815,7 +4836,12 @@@@ void PSOutputDev::doImageL2(Object *ref, // data source if (mode == psModeForm || inType3Char || preload) { - writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + if (inlineImg) { + writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + } else { + writePS(" /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2" + " index get 1 index get exch 1 add exch }\n"); + } } else { writePS(" /DataSource currentfile\n"); } @@@@ -4854,6 +4880,7 @@@@ void PSOutputDev::doImageL2(Object *ref, writePSFmt(">>\n{0:s}\n", colorMap ? "image" : "imagemask"); // get rid of the array and index + if (!inlineImg) writePS("pop "); writePS("pop pop\n"); } else { @@@@ -5028,8 +5055,10 @@@@ void PSOutputDev::doImageL3(Object *ref, str2->close(); delete str2; } else { + // make sure the image is setup, it sometimes is not like on bug #17645 + setupImage(ref->getRef(), str); // set up to use the array already created by setupImages() - writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen()); + writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen()); } } @@@@ -5100,7 +5129,12 @@@@ void PSOutputDev::doImageL3(Object *ref, // data source if (mode == psModeForm || inType3Char || preload) { - writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + if (inlineImg) { + writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + } else { + writePS(" /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2" + " index get 1 index get exch 1 add exch }\n"); + } } else { writePS(" /DataSource currentfile\n"); } @@@@ -5236,6 +5270,7 @@@@ void PSOutputDev::doImageL3(Object *ref, // get rid of the array and index if (mode == psModeForm || inType3Char || preload) { + if (!inlineImg) writePS("pop "); writePS("pop pop\n"); // image data @ 1.14 log @Update kpdf to have the xpdf3.02pl patches for the vulnerabilities reported in CVE-2009-0146, CVE-2009-0147, CVE-2009-0166, CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180, CVE-2009-1181, CVE-2009-1182 and CVE-2009-1183. also some patches from poppler for postscript output generation problems seen here. @ text @d1 1 a1 1 $NetBSD$ @ 1.14.2.1 log @file patch-aa was added on branch pkgsrc-2009Q1 on 2009-06-04 16:49:30 +0000 @ text @d1 205 @ 1.14.2.2 log @Pullup ticket #2784 - requested by markd kdegraphics3: security patch Revisions pulled up: - graphics/kdegraphics3/Makefile 1.81 via patch - graphics/kdegraphics3/distinfo 1.51 - graphics/kdegraphics3/patches/patch-aa 1.14 - graphics/kdegraphics3/patches/patch-ab 1.11 - graphics/kdegraphics3/patches/patch-ac 1.8 --- Module Name: pkgsrc Committed By: markd Date: Wed Jun 3 12:29:43 UTC 2009 Modified Files: pkgsrc/graphics/kdegraphics3: Makefile distinfo Added Files: pkgsrc/graphics/kdegraphics3/patches: patch-aa patch-ab patch-ac Log Message: Update kpdf to have the xpdf3.02pl patches for the vulnerabilities reported in CVE-2009-0146, CVE-2009-0147, CVE-2009-0166, CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180, CVE-2009-1181, CVE-2009-1182 and CVE-2009-1183. also some patches from poppler for postscript output generation problems seen here. @ text @a0 205 $NetBSD$ poppler git patch f86514c3fbc867fc6457feacba23451e89993524 poppler git patch ac16174da1d6f19445f78e7cd7c4a18cb9524dde --- kpdf/xpdf/xpdf/PSOutputDev.cc.orig 2007-10-08 22:48:37.000000000 +1300 +++ kpdf/xpdf/xpdf/PSOutputDev.cc @@@@ -2547,6 +2547,7 @@@@ void PSOutputDev::setupImage(Ref id, Str GString *s; int c; int size, line, col, i; + int outerSize, outer; // check if image is already setup for (i = 0; i < imgIDLen; ++i) { @@@@ -2633,56 +2634,72 @@@@ void PSOutputDev::setupImage(Ref id, Str if (useRLE) { ++size; } + outerSize = size/65535 + 1; + writePSFmt("{0:d} array dup /ImData_{1:d}_{2:d} exch def\n", - size, id.num, id.gen); + outerSize, id.num, id.gen); str->close(); // write the data into the array str->reset(); - line = col = 0; - writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~")); - do { - do { - c = str->getChar(); - } while (c == '\n' || c == '\r'); - if (c == (useASCIIHex ? '>' : '~') || c == EOF) { - break; - } - if (c == 'z') { - writePSChar(c); - ++col; - } else { - writePSChar(c); - ++col; - for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) { - do { - c = str->getChar(); - } while (c == '\n' || c == '\r'); - if (c == (useASCIIHex ? '>' : '~') || c == EOF) { - break; - } + for (outer = 0;outer < outerSize;outer++) { + int innerSize = size > 65535 ? 65535 : size; + + // put the inner array into the outer array + writePSFmt("{0:d} array 1 index {1:d} 2 index put\n", + innerSize, outer); + line = col = 0; + writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~")); + for (;;) { + do { + c = str->getChar(); + } while (c == '\n' || c == '\r'); + if (c == (useASCIIHex ? '>' : '~') || c == EOF) { + break; + } + if (c == 'z') { writePSChar(c); ++col; + } else { + writePSChar(c); + ++col; + for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) { + do { + c = str->getChar(); + } while (c == '\n' || c == '\r'); + if (c == (useASCIIHex ? '>' : '~') || c == EOF) { + break; + } + writePSChar(c); + ++col; + } + } + // each line is: "dup nnnnn <~...data...~> put" + // so max data length = 255 - 20 = 235 + // chunks are 1 or 4 bytes each, so we have to stop at 232 + // but make it 225 just to be safe + if (col > 225) { + writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n")); + ++line; + if (line >= innerSize) break; + writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line); + col = 0; } } - // each line is: "dup nnnnn <~...data...~> put" - // so max data length = 255 - 20 = 235 - // chunks are 1 or 4 bytes each, so we have to stop at 232 - // but make it 225 just to be safe - if (col > 225) { + if (c == (useASCIIHex ? '>' : '~') || c == EOF) { writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n")); - ++line; - writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line); - col = 0; + if (useRLE) { + ++line; + writePSFmt("{0:d} <> put\n", line); + } else { + writePS("pop\n"); + } + break; } - } while (c != (useASCIIHex ? '>' : '~') && c != EOF); - writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n")); - if (useRLE) { - ++line; - writePSFmt("{0:d} <> put\n", line); - } else { writePS("pop\n"); + size -= innerSize; } + writePS("pop\n"); str->close(); delete str; @@@@ -4299,8 +4316,10 @@@@ void PSOutputDev::doImageL1(Object *ref, str->close(); delete str; } else { + // make sure the image is setup, it sometimes is not like on bug #17645 + setupImage(ref->getRef(), str); // set up to use the array already created by setupImages() - writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen()); + writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen()); } } @@@@ -4760,8 +4779,10 @@@@ void PSOutputDev::doImageL2(Object *ref, str2->close(); delete str2; } else { + // make sure the image is setup, it sometimes is not like on bug #17645 + setupImage(ref->getRef(), str); // set up to use the array already created by setupImages() - writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen()); + writePSFmt("ImData_{0:d}_{1:d} 0 0\n",ref->getRefNum(), ref->getRefGen()); } } @@@@ -4815,7 +4836,12 @@@@ void PSOutputDev::doImageL2(Object *ref, // data source if (mode == psModeForm || inType3Char || preload) { - writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + if (inlineImg) { + writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + } else { + writePS(" /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2" + " index get 1 index get exch 1 add exch }\n"); + } } else { writePS(" /DataSource currentfile\n"); } @@@@ -4854,6 +4880,7 @@@@ void PSOutputDev::doImageL2(Object *ref, writePSFmt(">>\n{0:s}\n", colorMap ? "image" : "imagemask"); // get rid of the array and index + if (!inlineImg) writePS("pop "); writePS("pop pop\n"); } else { @@@@ -5028,8 +5055,10 @@@@ void PSOutputDev::doImageL3(Object *ref, str2->close(); delete str2; } else { + // make sure the image is setup, it sometimes is not like on bug #17645 + setupImage(ref->getRef(), str); // set up to use the array already created by setupImages() - writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen()); + writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen()); } } @@@@ -5100,7 +5129,12 @@@@ void PSOutputDev::doImageL3(Object *ref, // data source if (mode == psModeForm || inType3Char || preload) { - writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + if (inlineImg) { + writePS(" /DataSource { 2 copy get exch 1 add exch }\n"); + } else { + writePS(" /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2" + " index get 1 index get exch 1 add exch }\n"); + } } else { writePS(" /DataSource currentfile\n"); } @@@@ -5236,6 +5270,7 @@@@ void PSOutputDev::doImageL3(Object *ref, // get rid of the array and index if (mode == psModeForm || inType3Char || preload) { + if (!inlineImg) writePS("pop "); writePS("pop pop\n"); // image data @ 1.13 log @Update to KDE 3.5.3 Changes: * KPDF o Fix bug parsing some TOCs o Fix display of some JBIG2 files o Enable print action when opening files using drag and drop * KGhostView o Fix KGhostView .desktop files * Kuickshow o Fix remote browsing of http-urls o Don't display non-existing files @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.12 2006/05/31 13:52:54 tron Exp $ d3 203 a205 29 --- ksvg/impl/libs/libtext2path/src/GlyphTracer.cpp.orig 2005-10-11 03:56:48.000000000 +1300 +++ ksvg/impl/libs/libtext2path/src/GlyphTracer.cpp @@@@ -36,22 +36,22 @@@@ GlyphTracer::~GlyphTracer() delete m_outlineMethods; } -void GlyphTracer::setMoveto(int (funcPtr)(FT_Vector *, void *)) +void GlyphTracer::setMoveto(FT_Outline_MoveToFunc funcPtr) { m_moveTo = funcPtr; } -void GlyphTracer::setLineto(int (funcPtr)(FT_Vector *, void *)) +void GlyphTracer::setLineto(FT_Outline_LineToFunc funcPtr) { m_lineTo = funcPtr; } -void GlyphTracer::setConicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, void *)) +void GlyphTracer::setConicBezier(FT_Outline_ConicToFunc funcPtr) { m_conicBezier = funcPtr; } -void GlyphTracer::setCubicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, FT_Vector *, void *)) +void GlyphTracer::setCubicBezier(FT_Outline_CubicToFunc funcPtr) { m_cubicBezier = funcPtr; } @ 1.12 log @Make this package build with version 2.2.1 or newer of the "freetype2" package. Patch provided by Mark Davies. Bump package revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Update KDE to 3.5.2 * KDVI o Fix problems with PS header inclusion * KPDF o Don't destroy the document when overwriting itself with save as... o Fix crash on some documents o Fix crash when embedded on Konqueror * KolourPaint o Printing improvements o Respect image DPI o Fit image to page if image is too big o Center image on page @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2006/01/31 22:47:11 markd Exp $ d3 29 a31 14 --- kpdf/part.cpp.orig 2006-01-20 05:38:22.000000000 +1300 +++ kpdf/part.cpp @@@@ -697,6 +697,11 @@@@ void Part::slotSaveFileAs() KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() ); if ( saveURL.isValid() && !saveURL.isEmpty() ) { + if (saveURL == url()) + { + KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) ); + return; + } if ( KIO::NetAccess::exists( saveURL, false, widget() ) ) { if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue) @ 1.10 log @Update to KDE 3.5.1 Changes: * KPDF o Fix constant disk I/O when resizing Navigation panel o Fix Wrong page size and layout in some documents o Fix DCT decoding for broken files o Fix crash in some strange documents o Fix slowlyness on documents with broken TOC definition o Make non existant ps file loading fail gracefully * KIconEdit o Needs configuration dialog help, proper markup for toolbars @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update to KDE 3.5 Many new features and refinements. Notable changes include: * Konqueror is the second web browser to pass the Acid2 CSS test, ahead of Firefox and Internet Explorer * Konqueror can also now free web pages from adverts with its ad-block feature * SuperKaramba is included in KDE, providing well-integrated and easy-to-install widgets for the user's desktop * Kopete has support for MSN and Yahoo! webcams * The edutainment module has three new applications (KGeography, Kanagram and blinKen), and has seen huge improvements in Kalzium @ text @d3 14 a16 11 --- kpovmodeler/pmshell.cpp 2005/07/26 18:54:59 438982 +++ kpovmodeler/pmshell.cpp 2005/11/26 15:25:33 483453 @@@@ -641,7 +641,7 @@@@ bool PMShell::overwriteURL( const KURL& u ) { - int query = KMessageBox::Yes; + int query = KMessageBox::Continue; if( u.isLocalFile( ) ) { @ 1.8 log @Update to KDE 3.4.1 Changes: * kpdf: Change atan2f to atan2 so it compiles on Solaris 2.8 * kpdf: Show context menu when in FullScreen even if no document is open * kpdf: Do not leak memory when reloading a document * kpdf: Fix mouse wheel rotation in presentation mode * kpdf: Do not assume only there's only a ObjectRect in a given point * kpdf: Fix properties dialog when there are very large texts * kpdf: Compile when Xft2 headers are in a non-standard path * kpdf: Make Page Up and Page Down work on presentation mode * kpdf: Ask when overwriting files * kpdf: Solaris compile fix * kpdf: Do not move to top of the page when reloading the document * kpdf: Add another path where to look for ghostscript fonts * kpdf: Workaround weakness in gnome handling of desktop files * kpdf: Don't assume Encoding array of Type1 fonts end in "foo def" * kpdf: Fix text copying on some documents * kpdf: Parse Light and Condensed in font name * kpdf: Fix the allocation size of libgoo on 64bit architectures * kpdf: Fix problems with non-standard styles * kpdf: Fix disabled icons * ksnapshot: Rescale screenshot preview when resizing window @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2005/03/29 11:03:18 markd Exp $ d3 11 a13 11 --- kpdf/ui/pageview.cpp.orig 2005-03-29 11:56:20.631795000 +1200 +++ kpdf/ui/pageview.cpp @@@@ -1497,7 +1497,7 @@@@ void PageView::slotRelayoutPages() // Here we find out column's width and row's height to compute a table // so we can place widgets 'centered in virtual cells'. int nCols = Settings::viewColumns(), - nRows = (int)ceilf( (float)pageCount / (float)nCols ), + nRows = (int)ceil( (float)pageCount / (float)nCols ), * colWidth = new int[ nCols ], * rowHeight = new int[ nRows ], cIdx = 0, @ 1.7 log @Fix build on Solaris. From KDE's KDE_3_4_BRANCH. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update to KDE 3.4 Highlights at a glance * Text-to-speech system with support built into Konqueror, Kate, KPDF and the standalone application KSayIt * Support for text to speech synthesis is integrated with the desktop * Completely redesigned, more flexible trash system * Kicker with improved look and feel * KPDF now enables you to select, copy & paste text and images from PDFs, along with many other improvements * Kontact supports now various groupware servers, including eGroupware, GroupWise, Kolab, OpenGroupware.org and SLOX * Kopete supports Novell Groupwise and Lotus Sametime and gets integrated into Kontact * DBUS/HAL support allows to keep dynamic device icons in media:/ and on the desktop in sync with the state of all devices * KHTML has improved standard support and now close to full support for CSS 2.1 and the CSS 3 Selectors module * Better synchronization between 2 PCs * A new high contrast style and a complete monochrome icon set * An icon effect to paint all icons in two chosen colors, converting third party application icons into high contrast monochrome icons * Akregator allows you to read news from your favourite RSS-enabled websites in one application * Juk has now an album cover management via Google Image Search * KMail now stores passwords securely with KWallet * SVG files can now be used as wallpapers * KHTML plug-ins are now configurable, so the user can selectively disable ones that are not used. This does not include Netscape-style plug-ins. Netscape plug-in in CPU usage can be manually lowered, and plug-ins are more stable. * more than 6,500 bugs have been fixed * more than 1,700 wishes have been fullfilled * more than 80,000 contributions with several million lines of code and documentation added or changed @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2004/12/23 13:02:17 markd Exp $ d3 11 a13 13 --- kpdf/xpdf/Gfx.cc.orig 2004-11-29 02:30:57.000000000 +1300 +++ kpdf/xpdf/Gfx.cc @@@@ -2654,7 +2654,9 @@@@ void Gfx::doImage(Object *ref, Stream *s haveMask = gFalse; dict->lookup("Mask", &maskObj); if (maskObj.isArray()) { - for (i = 0; i < maskObj.arrayGetLength(); ++i) { + for (i = 0; + i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; + ++i) { maskObj.arrayGet(i, &obj1); maskColors[i] = obj1.getInt(); obj1.free(); @ 1.5 log @Fix for security problem: http://www.kde.org/info/security/advisory-20041223-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @bl3ify and update to kde3.2.2. Changes: * kiconedit: Fix [PATCH] Adds large current color viewer to palette toolbar * kiconedit: Fix Visual difference between a gray and transparent pixel * kpdf: Fix KPDF can't open files whose names have non-ASCII letters * ksvg: Fix Transformed symbols sometimes disappear * configure: Fix Extraneous message in admin/Makefile.common using --prefix * kghostview: Fix the executable linking against the part, by adding a common library. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2004/03/14 00:44:27 markd Exp $ d3 13 a15 40 --- kghostview/Makefile.am 2004-02-29 21:43:17.000000000 +1300 +++ kghostview/Makefile.am 2003-09-03 02:02:44.000000000 +1200 @@@@ -5,18 +5,15 @@@@ ####### Files bin_PROGRAMS = kghostview -lib_LTLIBRARIES = libkghostviewlib.la kde_module_LTLIBRARIES = libkghostviewpart.la noinst_LTLIBRARIES = libdscparse.la -libkghostviewlib_la_LDFLAGS = $(all_libraries) -libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la - libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -libkghostviewpart_la_LIBADD = libkghostviewlib.la +libkghostviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint \ + libdscparse.la # Check "make final" after making changes to the following line!! -libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ +libkghostviewpart_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ marklist.cpp logwindow.cpp infodialog.cpp \ kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp kgvpagedecorator.cpp \ kgvconfigdialog.cpp kgvmainwidget.cpp \ @@@@ -24,14 +21,9 @@@@ fullscreenfilter.cpp kgvfactory.cpp \ generalsettingswidget.ui gssettingswidget.ui thumbnailservice.cpp -libkghostviewpart_la_SOURCES = part_dummy.cpp - -part_dummy.cpp: - touch part_dummy.cpp - kghostview_SOURCES = main.cpp kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kghostview_LDADD = libkghostviewlib.la +kghostview_LDADD = libkghostviewpart.la libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined libdscparse_la_LIBADD = $(LIB_QT) @ 1.4.6.1 log @Pullup ticket 184 - requested by Mark Davies security fix for kdegraphics3 Module Name: pkgsrc Committed By: markd Date: Thu Dec 23 13:02:17 UTC 2004 Modified Files: pkgsrc/graphics/kdegraphics3: Makefile distinfo Added Files: pkgsrc/graphics/kdegraphics3/patches: patch-aa patch-ab Log Message: Fix for security problem: http://www.kde.org/info/security/advisory-20041223-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2004/12/23 13:02:17 markd Exp $ d3 40 a42 13 --- kpdf/xpdf/Gfx.cc.orig 2004-11-29 02:30:57.000000000 +1300 +++ kpdf/xpdf/Gfx.cc @@@@ -2654,7 +2654,9 @@@@ void Gfx::doImage(Object *ref, Stream *s haveMask = gFalse; dict->lookup("Mask", &maskObj); if (maskObj.isArray()) { - for (i = 0; i < maskObj.arrayGetLength(); ++i) { + for (i = 0; + i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; + ++i) { maskObj.arrayGet(i, &obj1); maskColors[i] = obj1.getInt(); obj1.free(); @ 1.3 log @Revert kghostview Makefile.{am,in} to the -3.2.0 version as the latest version produces a kghostview that fails to run on NetBSD and the reason for the change (Debian packaging issues) shouldn't effect us. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdegraphics KView: Added KImageViewer interface Added possibility for plugins Added Slideshow plugin Enhanced Mousewheel support Automatic resizing to fit images with varying size kviewshell: added statusbar kviewshell: usability improvements KuickShow: Digital camera jpeg images obey orientaion information KuickShow: General UI improvements, now features a menubar KuickShow: Ability to browse image collections on remote servers KuickShow: Digital camera jpeg images obey orientaion information KPovModeler: Implement support for the missing PovRAY 3.1 primitives, zehender at kde org. KFax: Rewrite all the UI code to be KDE standards compliant, cleanups. (Nadeem Hasan ) libkscan: support for halftoning scan mode where available kooka: thumbnail view of scanned images added kooka: ported to KDockWidgets to provide a customizable GUI kooka: inline image renaming and drag and drop NEW IN KDE:KPovModeler, a modeling and composition program for creating POV-Ray (tm) scenes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2002/06/05 08:58:02 skrll Exp $ d3 4 a6 5 --- kfile-plugins/ps/dscparse_adapter.h.orig Thu Feb 14 20:56:51 2002 +++ kfile-plugins/ps/dscparse_adapter.h @@@@ -29,6 +29,50 @@@@ #include "dscparse.h" #undef min d8 4 a11 44 +#if defined(__GNUC__) +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93) +/* + * We add a quick 'n' dirty inline implementation of auto_ptr for older + * releases of GCC, which don't include an auto_ptr implementation in + * . + */ + +template class auto_ptr { +private: + T* _ptr; + +public: + typedef T element_type; + explicit auto_ptr(T* p = 0) : _ptr(p) {} + auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + template auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + auto_ptr& operator=(auto_ptr& a) { + if (&a != this) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + template + auto_ptr& operator=(auto_ptr& a) { + if (a.get() != this->get()) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + ~auto_ptr() { delete _ptr; } + + T& operator*() const { return *_ptr; } + T* operator->() const { return _ptr; } + T* get() const { return _ptr; } + T* release() { T* tmp = _ptr; _ptr = 0; return tmp; } + void reset(T* p = 0) { delete _ptr; _ptr = p; } +}; + +#endif +#endif + d13 7 a19 5 class KDSCBBOX { @@@@ -259,8 +303,13 @@@@ CDSCMEDIA** media() const; const CDSCMEDIA* page_media() const; d21 9 a29 7 +#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)) + auto_ptr bbox() const; + auto_ptr page_bbox() const; +#else std::auto_ptr bbox() const; std::auto_ptr page_bbox() const; +#endif d31 9 a39 1 // CDSCDOSEPS *doseps; d41 2 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdegraphics3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-aa was added on branch buildlink2 on 2002-06-23 18:46:28 +0000 @ text @d1 69 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 69 $NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:46:28 jlam Exp $ --- kfile-plugins/ps/dscparse_adapter.h.orig Thu Feb 14 20:56:51 2002 +++ kfile-plugins/ps/dscparse_adapter.h @@@@ -29,6 +29,50 @@@@ #include "dscparse.h" #undef min +#if defined(__GNUC__) +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93) +/* + * We add a quick 'n' dirty inline implementation of auto_ptr for older + * releases of GCC, which don't include an auto_ptr implementation in + * . + */ + +template class auto_ptr { +private: + T* _ptr; + +public: + typedef T element_type; + explicit auto_ptr(T* p = 0) : _ptr(p) {} + auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + template auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + auto_ptr& operator=(auto_ptr& a) { + if (&a != this) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + template + auto_ptr& operator=(auto_ptr& a) { + if (a.get() != this->get()) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + ~auto_ptr() { delete _ptr; } + + T& operator*() const { return *_ptr; } + T* operator->() const { return _ptr; } + T* get() const { return _ptr; } + T* release() { T* tmp = _ptr; _ptr = 0; return tmp; } + void reset(T* p = 0) { delete _ptr; _ptr = p; } +}; + +#endif +#endif + class KDSCBBOX { @@@@ -259,8 +303,13 @@@@ CDSCMEDIA** media() const; const CDSCMEDIA* page_media() const; +#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)) + auto_ptr bbox() const; + auto_ptr page_bbox() const; +#else std::auto_ptr bbox() const; std::auto_ptr page_bbox() const; +#endif // CDSCDOSEPS *doseps; @