6 files changed, 23 insertions, 302 deletions

diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 40fd6748e580..4b49bf3ae684 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 377567f141d2..c7412ceee598 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdegraphics-3.5.0.tar.bz2) = 389a00d4387e621d4dd325a59c7657c4
-SHA256 (KDE/kdegraphics-3.5.0.tar.bz2) = c19986c332e96a52304f6977e83c15a5372578b70d33f9ccffcc7236bc2d7d62
-SIZE (KDE/kdegraphics-3.5.0.tar.bz2) = 7094349
+MD5 (KDE/kdegraphics-3.5.1.tar.bz2) = 2cd1c5348b7df46cf7f9d91e1dbfebd2
+SHA256 (KDE/kdegraphics-3.5.1.tar.bz2) = d0f1fed464c1d410b66c115a60245e1c639de828eebde181f26cc8185a0c9ad6
+SIZE (KDE/kdegraphics-3.5.1.tar.bz2) = 7315482
diff --git a/graphics/kdegraphics4/files/patch-kpdf-part.cpp b/graphics/kdegraphics4/files/patch-kpdf-part.cpp
new file mode 100644
index 000000000000..bf1e59e4f47b
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-kpdf-part.cpp
@@ -0,0 +1,14 @@
+--- kpdf/part.cpp	2006/01/18 21:57:05	499855
++++ kpdf/part.cpp	2006/01/23 23:11:54	501814
+@@ -697,6 +697,11 @@
+     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)
diff --git a/graphics/kdegraphics4/files/patch-post-3.5.0-kdegraphics-CAN-2005-3193 b/graphics/kdegraphics4/files/patch-post-3.5.0-kdegraphics-CAN-2005-3193
deleted file mode 100644
index 0b6f22303de8..000000000000
--- a/graphics/kdegraphics4/files/patch-post-3.5.0-kdegraphics-CAN-2005-3193
+++ /dev/null
@@ -1,287 +0,0 @@
-Index: kpdf/xpdf/xpdf/JBIG2Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 488715)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -681,6 +682,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line ) {
-+    data = NULL;
-+    return;
-+  }
-+  
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   data[h * line] = 0;
-@@ -692,6 +699,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    data = NULL;
-+    return;
-+  }
-+ 
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   memcpy(data, bitmap->data, h * line);
-@@ -720,7 +733,8 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+
-+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
-     return;
-   }
-   // need to allocate one extra guard byte for use in combine()
-@@ -2305,6 +2319,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (h < 0 || w == 0 || h >= INT_MAX / w) {
-+     error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-+
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -2936,6 +2959,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
-   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
-   int x, y, pix;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h)
-+    return NULL;
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
-Index: kpdf/xpdf/xpdf/Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/Stream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/Stream.cc	(revision 488715)
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <limits.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-@@ -408,13 +409,27 @@ StreamPredictor::StreamPredictor(Stream 
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
-+
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX / nBits ||
-+      width >= INT_MAX / nComps / nBits)
-+    return;
- 
-   nVals = width * nComps;
-+  if (nVals * nBits + 7 <= 0)
-+    return;
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0)
-+    return;
-+
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -1006,6 +1021,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1258,8 +1277,9 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
--  if (columns < 1) {
--    columns = 1;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+     error(getPos(), "Bad number of columns in CCITTFaxStream");
-+     exit(1);
-   }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-@@ -2903,7 +2923,12 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
--  if (prec != 8) {
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-+ if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-   }
-@@ -2929,6 +2954,11 @@ GBool DCTStream::readProgressiveSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2951,6 +2981,11 @@ GBool DCTStream::readScanInfo() {
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    scanInfo.numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -3035,12 +3070,12 @@ GBool DCTStream::readHuffmanTables() {
-   while (length > 0) {
-     index = str->getChar();
-     --length;
--    if ((index & 0x0f) >= 4) {
-+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
-       error(getPos(), "Bad DCT Huffman table");
-       return gFalse;
-     }
-     if (index & 0x10) {
--      index &= 0x0f;
-+      index &= 0x03;
-       if (index >= numACHuffTables)
- 	numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-@@ -3833,6 +3868,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-Index: kpdf/xpdf/xpdf/Stream.h
-===================================================================
---- kpdf/xpdf/xpdf/Stream.h	(revision 481099)
-+++ kpdf/xpdf/xpdf/Stream.h	(revision 488715)
-@@ -232,6 +232,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -249,6 +251,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
---- kpdf/xpdf/xpdf/JPXStream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/JPXStream.cc	(revision 488715)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -783,7 +784,7 @@ GBool JPXStream::readCodestream(Guint /*
-   int segType;
-   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
-   Guint precinctSize, style;
--  Guint segLen, capabilities, comp, i, j, r;
-+  Guint segLen, capabilities, nTiles, comp, i, j, r;
- 
-   //----- main header
-   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-@@ -818,8 +819,13 @@ GBool JPXStream::readCodestream(Guint /*
- 	            / img.xTileSize;
-       img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- 	            / img.yTileSize;
--      img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
--				     sizeof(JPXTile));
-+      nTiles = img.nXTiles * img.nYTiles;
-+      // check for overflow before allocating memory
-+      if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) {
-+	error(getPos(), "Bad tile count in JPX SIZ marker segment");
-+	return gFalse;
-+      }
-+      img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
-       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- 	img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
- 							sizeof(JPXTileComp));
-Index: kpdf/xpdf/goo/gmem.c
-===================================================================
---- kpdf/xpdf/goo/gmem.c	(revision 481099)
-+++ kpdf/xpdf/goo/gmem.c	(revision 488715)
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-+#include <limits.h>
- #include "gmem.h"
- 
- #ifdef DEBUG_MEM
-@@ -141,7 +142,7 @@ void *gmallocn(int nObjs, int objSize) {
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
-@@ -152,7 +153,7 @@ void *greallocn(void *p, int nObjs, int 
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
diff --git a/graphics/kdegraphics4/files/patch-post-3.5.0-kpovmodeler b/graphics/kdegraphics4/files/patch-post-3.5.0-kpovmodeler
deleted file mode 100644
index c29d93ac8ee9..000000000000
--- a/graphics/kdegraphics4/files/patch-post-3.5.0-kpovmodeler
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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( ) )
-    {
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index c23b7484246a..0bc3e5c049b7 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -911,6 +911,7 @@ share/doc/HTML/en/kghostview/index.docbook
 share/doc/HTML/en/kiconedit/common
 share/doc/HTML/en/kiconedit/index.cache.bz2
 share/doc/HTML/en/kiconedit/index.docbook
+share/doc/HTML/en/kiconedit/kiconedit-configuration.png
 share/doc/HTML/en/kolourpaint/brush_shapes.png
 share/doc/HTML/en/kolourpaint/color_box.png
 share/doc/HTML/en/kolourpaint/common
@@ -931,6 +932,7 @@ share/doc/HTML/en/kolourpaint/image_skew.png
 share/doc/HTML/en/kolourpaint/image_soften_sharpen.png
 share/doc/HTML/en/kolourpaint/index.cache.bz2
 share/doc/HTML/en/kolourpaint/index.docbook
+share/doc/HTML/en/kolourpaint/kolourpaint-main.png
 share/doc/HTML/en/kolourpaint/line_width.png
 share/doc/HTML/en/kolourpaint/lines_30_45_deg.png
 share/doc/HTML/en/kolourpaint/lines_30_deg.png
@@ -961,7 +963,9 @@ share/doc/HTML/en/kolourpaint/tool_rounded_rectangle.png
 share/doc/HTML/en/kolourpaint/tool_selections.png
 share/doc/HTML/en/kolourpaint/tool_spraycan.png
 share/doc/HTML/en/kolourpaint/tool_text.png
+share/doc/HTML/en/kolourpaint/view_thumbnails.png
 share/doc/HTML/en/kpdf/common
+share/doc/HTML/en/kpdf/configure.png
 share/doc/HTML/en/kpdf/index.cache.bz2
 share/doc/HTML/en/kpdf/index.docbook
 share/doc/HTML/en/kpovmodeler/cameraview.png
@@ -1027,6 +1031,8 @@ share/doc/HTML/en/ksnapshot/window.png
 share/doc/HTML/en/kview/common
 share/doc/HTML/en/kview/index.cache.bz2
 share/doc/HTML/en/kview/index.docbook
+share/doc/HTML/en/kview/kview-application-configuration.png
+share/doc/HTML/en/kview/kview-viewer-configuration.png
 share/icons/crystalsvg/16x16/apps/kviewshell.png
 share/icons/crystalsvg/16x16/apps/photobook.png
 share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png