diff options
Diffstat (limited to 'graphics')
21 files changed, 1101 insertions, 528 deletions
diff --git a/graphics/kamera-kde4/distinfo b/graphics/kamera-kde4/distinfo index 57d2116fe256..377567f141d2 100644 --- a/graphics/kamera-kde4/distinfo +++ b/graphics/kamera-kde4/distinfo @@ -1,2 +1,3 @@ -MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9 -SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272 +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 diff --git a/graphics/kamera-kde4/pkg-plist b/graphics/kamera-kde4/pkg-plist index 2afde9933071..176c64f78060 100644 --- a/graphics/kamera-kde4/pkg-plist +++ b/graphics/kamera-kde4/pkg-plist @@ -13,5 +13,5 @@ share/icons/crystalsvg/22x22/devices/camera.png share/icons/crystalsvg/22x22/filesystems/camera.png share/icons/crystalsvg/32x32/devices/camera.png share/icons/crystalsvg/32x32/filesystems/camera.png -share/services/kamera.protocol +share/services/camera.protocol @dirrm share/doc/HTML/en/kamera diff --git a/graphics/kamera/distinfo b/graphics/kamera/distinfo index 57d2116fe256..377567f141d2 100644 --- a/graphics/kamera/distinfo +++ b/graphics/kamera/distinfo @@ -1,2 +1,3 @@ -MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9 -SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272 +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 diff --git a/graphics/kamera/pkg-plist b/graphics/kamera/pkg-plist index 2afde9933071..176c64f78060 100644 --- a/graphics/kamera/pkg-plist +++ b/graphics/kamera/pkg-plist @@ -13,5 +13,5 @@ share/icons/crystalsvg/22x22/devices/camera.png share/icons/crystalsvg/22x22/filesystems/camera.png share/icons/crystalsvg/32x32/devices/camera.png share/icons/crystalsvg/32x32/filesystems/camera.png -share/services/kamera.protocol +share/services/camera.protocol @dirrm share/doc/HTML/en/kamera diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 40fd6748e580..4b49bf3ae684 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/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/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index 57d2116fe256..377567f141d2 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,2 +1,3 @@ -MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9 -SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272 +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 diff --git a/graphics/kdegraphics3/files/patch-post-3.4.3-kdegraphics-CAN-2005-3193 b/graphics/kdegraphics3/files/patch-post-3.4.3-kdegraphics-CAN-2005-3193 deleted file mode 100644 index 4de41aeb0470..000000000000 --- a/graphics/kdegraphics3/files/patch-post-3.4.3-kdegraphics-CAN-2005-3193 +++ /dev/null @@ -1,174 +0,0 @@ -Index: kpdf/xpdf/xpdf/Stream.cc -=================================================================== ---- kpdf/xpdf/xpdf/Stream.cc (revision 486295) -+++ kpdf/xpdf/xpdf/Stream.cc (working copy) -@@ -408,18 +408,33 @@ void ImageStream::skipLine() { - - StreamPredictor::StreamPredictor(Stream *strA, int predictorA, - int widthA, int nCompsA, int nBitsA) { -+ int totalBits; -+ - str = strA; - predictor = predictorA; - width = widthA; - nComps = nCompsA; - nBits = nBitsA; -+ predLine = NULL; -+ ok = gFalse; - - nVals = width * nComps; -+ totalBits = nVals * nBits; -+ if (totalBits == 0 || -+ (totalBits / nBits) / nComps != width || -+ totalBits + 7 < 0) { -+ return; -+ } - pixBytes = (nComps * nBits + 7) >> 3; -- rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -+ rowBytes = ((totalBits + 7) >> 3) + pixBytes; -+ if (rowBytes < 0) { -+ return; -+ } - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; -+ -+ ok = gTrue; - } - - StreamPredictor::~StreamPredictor() { -@@ -1013,6 +1028,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; - } -@@ -2899,6 +2918,10 @@ GBool DCTStream::readBaselineSOF() { - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -@@ -3258,6 +3281,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 486295) -+++ kpdf/xpdf/xpdf/Stream.h (working copy) -@@ -233,6 +233,8 @@ public: - - ~StreamPredictor(); - -+ GBool isOk() { return ok; } -+ - int lookChar(); - int getChar(); - -@@ -250,6 +252,7 @@ private: - int rowBytes; // bytes per line - Guchar *predLine; // line buffer - int predIdx; // current index in predLine -+ GBool ok; - }; - - //------------------------------------------------------------------------ -Index: kpdf/xpdf/xpdf/JPXStream.cc -=================================================================== ---- kpdf/xpdf/xpdf/JPXStream.cc (revision 486295) -+++ kpdf/xpdf/xpdf/JPXStream.cc (working copy) -@@ -666,7 +666,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; -@@ -701,8 +701,12 @@ GBool JPXStream::readCodestream(Guint /* - / img.xTileSize; - img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) - / img.yTileSize; -- img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles * -- sizeof(JPXTile)); -+ nTiles = img.nXTiles * img.nYTiles; -+ if (img.nXTiles == 0 || nTiles / img.nXTiles != 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 *)gmalloc(img.nComps * - sizeof(JPXTileComp)); -Index: kpdf/xpdf/goo/gmem.c -=================================================================== ---- kpdf/xpdf/goo/gmem.c (revision 486129) -+++ kpdf/xpdf/goo/gmem.c (working copy) -@@ -175,6 +175,28 @@ void gfree(void *p) { - #endif - } - -+void *gmallocn(int nObjs, int objSize) { -+ int n; -+ -+ n = nObjs * objSize; -+ if (objSize == 0 || n / objSize != nObjs) { -+ fprintf(stderr, "Bogus memory allocation size\n"); -+ exit(1); -+ } -+ return gmalloc(n); -+} -+ -+void *greallocn(void *p, int nObjs, int objSize) { -+ int n; -+ -+ n = nObjs * objSize; -+ if (objSize == 0 || n / objSize != nObjs) { -+ fprintf(stderr, "Bogus memory allocation size\n"); -+ exit(1); -+ } -+ return grealloc(p, n); -+} -+ - #ifdef DEBUG_MEM - void gMemReport(FILE *f) { - GMemHdr *p; -Index: kpdf/xpdf/goo/gmem.h -=================================================================== ---- kpdf/xpdf/goo/gmem.h (revision 486129) -+++ kpdf/xpdf/goo/gmem.h (working copy) -@@ -28,6 +28,15 @@ extern void *gmalloc(size_t size); - extern void *grealloc(void *p, size_t size); - - /* -+ * These are similar to gmalloc and grealloc, but take an object count -+ * and size. The result is similar to allocating nObjs * objSize -+ * bytes, but there is an additional error check that the total size -+ * doesn't overflow an int. -+ */ -+extern void *gmallocn(int nObjs, int objSize); -+extern void *greallocn(void *p, int nObjs, int objSize); -+ -+/* - * Same as free, but checks for and ignores NULL pointers. - */ - extern void gfree(void *p); diff --git a/graphics/kdegraphics3/files/patch-post-3.5.0-kdegraphics-CAN-2005-3193 b/graphics/kdegraphics3/files/patch-post-3.5.0-kdegraphics-CAN-2005-3193 new file mode 100644 index 000000000000..0b6f22303de8 --- /dev/null +++ b/graphics/kdegraphics3/files/patch-post-3.5.0-kdegraphics-CAN-2005-3193 @@ -0,0 +1,287 @@ +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/kdegraphics3/files/patch-post-3.5.0-kpovmodeler b/graphics/kdegraphics3/files/patch-post-3.5.0-kpovmodeler new file mode 100644 index 000000000000..c29d93ac8ee9 --- /dev/null +++ b/graphics/kdegraphics3/files/patch-post-3.5.0-kpovmodeler @@ -0,0 +1,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( ) ) + { diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist index 3a7980637e57..c23b7484246a 100644 --- a/graphics/kdegraphics3/pkg-plist +++ b/graphics/kdegraphics3/pkg-plist @@ -2,6 +2,7 @@ bin/kcolorchooser bin/kcoloredit bin/kdvi bin/kfax +bin/kfaxview bin/kghostview bin/kiconedit bin/kolourpaint @@ -165,6 +166,7 @@ include/dom/SVGViewSpec.h include/dom/SVGWindow.h include/dom/SVGZoomAndPan.h include/dom/SVGZoomEvent.h +include/kfaximage.h include/kmultipageInterface.h include/ksvg/CanvasFactory.h include/ksvg/CanvasItem.h @@ -172,9 +174,31 @@ include/ksvg/CanvasItems.h include/ksvg/DocumentFactory.h include/ksvg/KSVGCanvas.h include/ksvg/ksvg_plugin.h +include/kviewshell/anchor.h +include/kviewshell/bookmark.h +include/kviewshell/documentPageCache.h +include/kviewshell/documentRenderer.h +include/kviewshell/documentWidget.h +include/kviewshell/history.h +include/kviewshell/hyperlink.h +include/kviewshell/kmultipage.h +include/kviewshell/length.h +include/kviewshell/pageNumber.h +include/kviewshell/pageSize.h +include/kviewshell/pageView.h +include/kviewshell/renderedDocumentPage.h +include/kviewshell/renderedDocumentPagePixmap.h +include/kviewshell/renderedDocumentPagePrinter.h +include/kviewshell/selection.h +include/kviewshell/simplePageSize.h +include/kviewshell/textBox.h +include/kviewshell/zoom.h +include/kviewshell/zoomlimits.h include/libtext2path-0.1/BezierPath.h include/libtext2path-0.1/Glyph.h include/libtext2path-0.1/GlyphTracer.h +lib/kde3/djvuviewpart.la +lib/kde3/djvuviewpart.so lib/kde3/emptymultipagepart.la lib/kde3/emptymultipagepart.so lib/kde3/gsthumbnail.la @@ -195,8 +219,8 @@ lib/kde3/kded_daemonwatcher.la lib/kde3/kded_daemonwatcher.so lib/kde3/kdvipart.la lib/kde3/kdvipart.so -lib/kde3/kfaxpart.la -lib/kde3/kfaxpart.so +lib/kde3/kfaxviewpart.la +lib/kde3/kfaxviewpart.so lib/kde3/kfile_bmp.la lib/kde3/kfile_bmp.so lib/kde3/kfile_dds.la @@ -205,20 +229,22 @@ lib/kde3/kfile_dvi.la lib/kde3/kfile_dvi.so lib/kde3/kfile_exr.la lib/kde3/kfile_exr.so +lib/kde3/kfile_gif.la +lib/kde3/kfile_gif.so lib/kde3/kfile_ico.la lib/kde3/kfile_ico.so lib/kde3/kfile_jpeg.la lib/kde3/kfile_jpeg.so lib/kde3/kfile_pcx.la lib/kde3/kfile_pcx.so -lib/kde3/kfile_pdf.la -lib/kde3/kfile_pdf.so lib/kde3/kfile_png.la lib/kde3/kfile_png.so lib/kde3/kfile_pnm.la lib/kde3/kfile_pnm.so lib/kde3/kfile_ps.la lib/kde3/kfile_ps.so +lib/kde3/kfile_raw.la +lib/kde3/kfile_raw.so lib/kde3/kfile_rgb.la lib/kde3/kfile_rgb.so lib/kde3/kfile_tga.la @@ -243,6 +269,8 @@ lib/kde3/kview_scannerplugin.la lib/kde3/kview_scannerplugin.so lib/kde3/kviewerpart.la lib/kde3/kviewerpart.so +lib/kde3/libdjvu.la +lib/kde3/libdjvu.so lib/kde3/libkghostviewpart.la lib/kde3/libkghostviewpart.so lib/kde3/libkmrmlpart.la @@ -269,6 +297,8 @@ lib/libkdeinit_kview.la lib/libkdeinit_kview.so lib/libkdeinit_mrmlsearch.la lib/libkdeinit_mrmlsearch.so +lib/libkfaximage.la +lib/libkfaximage.so lib/libkghostviewlib.la lib/libkghostviewlib.so lib/libkghostviewlib.so.0 @@ -292,6 +322,7 @@ share/applications/kde/kcolorchooser.desktop share/applications/kde/kcoloredit.desktop share/applications/kde/kdvi.desktop share/applications/kde/kfax.desktop +share/applications/kde/kfaxview.desktop share/applications/kde/kgamma.desktop share/applications/kde/kghostview.desktop share/applications/kde/kiconedit.desktop @@ -302,16 +333,17 @@ share/applications/kde/kruler.desktop share/applications/kde/ksnapshot.desktop share/applications/kde/kview.desktop share/applnk/Graphics/kruler.desktop +share/apps/djvumultipage.rc share/apps/kcoloredit/kcoloreditui.rc share/apps/kconf_update/kghostview.upd share/apps/kconf_update/update-to-xt-names.pl share/apps/kdvi/kdvi_part.rc share/apps/kdvi/kviewshell.rc share/apps/kdvi/tips -share/apps/kfax/kfax_part.rc share/apps/kfax/kfaxui.rc share/apps/kfax/pics/kfax.tif share/apps/kfax/pics/kfaxlogo.xpm +share/apps/kfaxview/kviewshell.rc share/apps/kgamma/pics/background.png share/apps/kgamma/pics/cmyscale.png share/apps/kgamma/pics/darkgrey.png @@ -350,27 +382,101 @@ share/apps/kiconedit/pics/source.png share/apps/kiconedit/pics/standard.png share/apps/kiconedit/pics/transform.png share/apps/kiconedit/pics/window_new.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_brush.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_picker.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_washer.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_curve.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_ellipse.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_elliptical_selection.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_eraser.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_flood_fill.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_free_form_selection.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_line.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_pen.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polygon.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polyline.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rect_selection.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rectangle.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rounded_rectangle.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_spraycan.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_brush.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_picker.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_washer.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_curve.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_ellipse.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_elliptical_selection.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_eraser.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_flood_fill.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_free_form_selection.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_line.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_pen.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polygon.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polyline.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rect_selection.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rectangle.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_spraycan.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_text.svgz share/apps/kolourpaint/icons/hicolor/16x16/apps/kolourpaint.png +share/apps/kolourpaint/icons/hicolor/22x22/apps/kolourpaint.png share/apps/kolourpaint/icons/hicolor/32x32/apps/kolourpaint.png share/apps/kolourpaint/icons/hicolor/48x48/apps/kolourpaint.png +share/apps/kolourpaint/icons/hicolor/scalable/apps/kolourpaint.svgz share/apps/kolourpaint/kolourpaintui.rc share/apps/kolourpaint/pics/color_transparent_26x26.png share/apps/kolourpaint/pics/colorbutton_swap_16x16.png @@ -762,6 +868,13 @@ share/apps/kview/kpartplugins/kviewscanner.desktop share/apps/kview/kpartplugins/kviewscanner.rc share/apps/kview/kview.setdlg share/apps/kview/kviewui.rc +share/apps/kview/photobookui.rc +share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png +share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png +share/apps/kviewerpart/icons/hicolor/22x22/actions/movetool.png +share/apps/kviewerpart/icons/hicolor/22x22/actions/selectiontool.png +share/apps/kviewerpart/icons/hicolor/32x32/actions/movetool.png +share/apps/kviewerpart/icons/hicolor/48x48/actions/movetool.png share/apps/kviewerpart/kviewerpart.rc share/apps/kviewshell/kviewshell.rc share/apps/kviewviewer/kpartplugins/kviewbrowser.desktop @@ -769,11 +882,12 @@ share/apps/kviewviewer/kpartplugins/kviewbrowser.rc share/apps/kviewviewer/kviewpopup.rc share/apps/kviewviewer/kviewviewer.rc share/apps/kviewviewer/kviewviewer_ro.rc -share/apps/photobookui.rc +share/config.kcfg/djvumultipage.kcfg share/config.kcfg/kdvi.kcfg share/config.kcfg/kghostview.kcfg share/config.kcfg/kpdf.kcfg share/config.kcfg/kviewshell.kcfg +share/config/magic/x-image-raw.magic share/doc/HTML/en/kcoloredit/common share/doc/HTML/en/kcoloredit/index.cache.bz2 share/doc/HTML/en/kcoloredit/index.docbook @@ -913,72 +1027,78 @@ 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/snapshot1.png -share/doc/HTML/en/kview/snapshot2.png -share/doc/HTML/en/kview/snapshot3.png -share/doc/HTML/en/kview/snapshot4.png -share/doc/HTML/en/kview/snapshot5.png -share/doc/HTML/en/kview/snapshot6.png -share/doc/HTML/en/kview/snapshot7.png -share/doc/HTML/en/kview/snapshot8.png -share/doc/HTML/en/kview/snapshot9.png -share/icons/crystalsvg/128x128/apps/kghostview.png -share/icons/crystalsvg/128x128/apps/kpdf.png -share/icons/crystalsvg/16x16/apps/kcolorchooser.png -share/icons/crystalsvg/16x16/apps/kcoloredit.png -share/icons/crystalsvg/16x16/apps/kdvi.png -share/icons/crystalsvg/16x16/apps/kfax.png -share/icons/crystalsvg/16x16/apps/kghostview.png -share/icons/crystalsvg/16x16/apps/kiconedit.png -share/icons/crystalsvg/16x16/apps/kpdf.png -share/icons/crystalsvg/16x16/apps/kpovmodeler.png -share/icons/crystalsvg/16x16/apps/kruler.png -share/icons/crystalsvg/16x16/apps/ksnapshot.png -share/icons/crystalsvg/16x16/apps/kview.png share/icons/crystalsvg/16x16/apps/kviewshell.png share/icons/crystalsvg/16x16/apps/photobook.png share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png -share/icons/crystalsvg/22x22/apps/kcolorchooser.png -share/icons/crystalsvg/22x22/apps/kpdf.png share/icons/crystalsvg/22x22/apps/photobook.png -share/icons/crystalsvg/32x32/apps/kcoloredit.png -share/icons/crystalsvg/32x32/apps/kdvi.png -share/icons/crystalsvg/32x32/apps/kfax.png -share/icons/crystalsvg/32x32/apps/kghostview.png -share/icons/crystalsvg/32x32/apps/kiconedit.png -share/icons/crystalsvg/32x32/apps/kpdf.png -share/icons/crystalsvg/32x32/apps/kpovmodeler.png -share/icons/crystalsvg/32x32/apps/kruler.png -share/icons/crystalsvg/32x32/apps/ksnapshot.png -share/icons/crystalsvg/32x32/apps/kview.png share/icons/crystalsvg/32x32/apps/kviewshell.png share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png -share/icons/crystalsvg/48x48/apps/kdvi.png -share/icons/crystalsvg/48x48/apps/kfax.png -share/icons/crystalsvg/48x48/apps/kghostview.png -share/icons/crystalsvg/48x48/apps/kiconedit.png -share/icons/crystalsvg/48x48/apps/kpdf.png -share/icons/crystalsvg/48x48/apps/kpovmodeler.png -share/icons/crystalsvg/48x48/apps/kruler.png -share/icons/crystalsvg/48x48/apps/ksnapshot.png -share/icons/crystalsvg/48x48/apps/kview.png share/icons/crystalsvg/48x48/apps/kviewshell.png share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png -share/icons/crystalsvg/64x64/apps/kghostview.png -share/icons/crystalsvg/64x64/apps/kpdf.png -share/icons/crystalsvg/scalable/apps/kdvi.svgz -share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/hicolor/128x128/apps/kghostview.png +share/icons/hicolor/128x128/apps/kpdf.png +share/icons/hicolor/16x16/apps/kcolorchooser.png +share/icons/hicolor/16x16/apps/kcoloredit.png +share/icons/hicolor/16x16/apps/kdvi.png +share/icons/hicolor/16x16/apps/kfax.png +share/icons/hicolor/16x16/apps/kfaxview.png share/icons/hicolor/16x16/apps/kgamma.png +share/icons/hicolor/16x16/apps/kghostview.png +share/icons/hicolor/16x16/apps/kiconedit.png share/icons/hicolor/16x16/apps/kolourpaint.png +share/icons/hicolor/16x16/apps/kpdf.png +share/icons/hicolor/16x16/apps/kpovmodeler.png +share/icons/hicolor/16x16/apps/kruler.png +share/icons/hicolor/16x16/apps/ksnapshot.png +share/icons/hicolor/16x16/apps/kview.png +share/icons/hicolor/22x22/apps/kcolorchooser.png +share/icons/hicolor/22x22/apps/kdvi.png +share/icons/hicolor/22x22/apps/kfax.png +share/icons/hicolor/22x22/apps/kfaxview.png +share/icons/hicolor/22x22/apps/kghostview.png +share/icons/hicolor/22x22/apps/kiconedit.png +share/icons/hicolor/22x22/apps/kolourpaint.png +share/icons/hicolor/22x22/apps/kpdf.png +share/icons/hicolor/22x22/apps/kpovmodeler.png +share/icons/hicolor/22x22/apps/kruler.png +share/icons/hicolor/22x22/apps/ksnapshot.png +share/icons/hicolor/22x22/apps/kview.png +share/icons/hicolor/32x32/apps/kcoloredit.png +share/icons/hicolor/32x32/apps/kdvi.png +share/icons/hicolor/32x32/apps/kfax.png +share/icons/hicolor/32x32/apps/kfaxview.png share/icons/hicolor/32x32/apps/kgamma.png +share/icons/hicolor/32x32/apps/kghostview.png +share/icons/hicolor/32x32/apps/kiconedit.png share/icons/hicolor/32x32/apps/kolourpaint.png +share/icons/hicolor/32x32/apps/kpdf.png +share/icons/hicolor/32x32/apps/kpovmodeler.png +share/icons/hicolor/32x32/apps/kruler.png +share/icons/hicolor/32x32/apps/ksnapshot.png +share/icons/hicolor/32x32/apps/kview.png +share/icons/hicolor/48x48/apps/kdvi.png +share/icons/hicolor/48x48/apps/kfax.png +share/icons/hicolor/48x48/apps/kfaxview.png share/icons/hicolor/48x48/apps/kgamma.png +share/icons/hicolor/48x48/apps/kghostview.png +share/icons/hicolor/48x48/apps/kiconedit.png share/icons/hicolor/48x48/apps/kolourpaint.png -share/icons/locolor/16x16/apps/kcoloredit.png -share/icons/locolor/16x16/apps/kpovmodeler.png -share/icons/locolor/32x32/apps/kcoloredit.png -share/icons/locolor/32x32/apps/kpovmodeler.png +share/icons/hicolor/48x48/apps/kpdf.png +share/icons/hicolor/48x48/apps/kpovmodeler.png +share/icons/hicolor/48x48/apps/kruler.png +share/icons/hicolor/48x48/apps/ksnapshot.png +share/icons/hicolor/48x48/apps/kview.png +share/icons/hicolor/64x64/apps/kghostview.png +share/icons/hicolor/64x64/apps/kpdf.png +share/icons/hicolor/scalable/apps/kdvi.svgz +share/icons/hicolor/scalable/apps/kfax.svgz +share/icons/hicolor/scalable/apps/kfaxview.svgz +share/icons/hicolor/scalable/apps/kolourpaint.svgz +share/icons/hicolor/scalable/apps/kpdf.svgz +share/icons/hicolor/scalable/apps/ksnapshot.svgz +share/mimelnk/image/x-image-raw.desktop share/mimelnk/text/mrml.desktop +share/services/djvumultipage.desktop share/services/emptymultipage.desktop share/services/gsthumbnail.desktop share/services/kconfiguredialog/kviewcanvasconfig.desktop @@ -987,17 +1107,20 @@ share/services/kconfiguredialog/kviewpluginsconfig.desktop share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop share/services/kded/daemonwatcher.desktop share/services/kdvimultipage.desktop +share/services/kfaxmultipage.desktop +share/services/kfaxmultipage_tiff.desktop share/services/kfile_bmp.desktop share/services/kfile_dds.desktop share/services/kfile_dvi.desktop share/services/kfile_exr.desktop +share/services/kfile_gif.desktop share/services/kfile_ico.desktop share/services/kfile_jpeg.desktop share/services/kfile_pcx.desktop -share/services/kfile_pdf.desktop share/services/kfile_png.desktop share/services/kfile_pnm.desktop share/services/kfile_ps.desktop +share/services/kfile_raw.desktop share/services/kfile_rgb.desktop share/services/kfile_tga.desktop share/services/kfile_tiff.desktop @@ -1016,7 +1139,18 @@ share/servicetypes/kimageviewer.desktop share/servicetypes/kimageviewercanvas.desktop share/servicetypes/kmultipage.desktop share/servicetypes/ksvgrenderer.desktop +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html @dirrm share/services/kconfiguredialog +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs @dirrm share/doc/HTML/en/kview @dirrm share/doc/HTML/en/ksnapshot @dirrm share/doc/HTML/en/kruler @@ -1028,9 +1162,20 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/doc/HTML/en/kgamma @dirrm share/doc/HTML/en/kdvi @dirrm share/doc/HTML/en/kcoloredit +@dirrm share/config/magic @dirrm share/apps/kviewviewer/kpartplugins @dirrm share/apps/kviewviewer @dirrm share/apps/kviewshell +@dirrm share/apps/kviewerpart/icons/hicolor/48x48/actions +@dirrm share/apps/kviewerpart/icons/hicolor/48x48 +@dirrm share/apps/kviewerpart/icons/hicolor/32x32/actions +@dirrm share/apps/kviewerpart/icons/hicolor/32x32 +@dirrm share/apps/kviewerpart/icons/hicolor/22x22/actions +@dirrm share/apps/kviewerpart/icons/hicolor/22x22 +@dirrm share/apps/kviewerpart/icons/hicolor/16x16/actions +@dirrm share/apps/kviewerpart/icons/hicolor/16x16 +@dirrm share/apps/kviewerpart/icons/hicolor +@dirrm share/apps/kviewerpart/icons @dirrm share/apps/kviewerpart @dirrm share/apps/kview/kpartplugins @dirrm share/apps/kview @@ -1061,14 +1206,28 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/apps/kpdfpart @dirrm share/apps/kpdf @dirrm share/apps/kolourpaint/pics +@dirrm share/apps/kolourpaint/icons/hicolor/scalable/apps +@dirrm share/apps/kolourpaint/icons/hicolor/scalable @dirrm share/apps/kolourpaint/icons/hicolor/48x48/apps @dirrm share/apps/kolourpaint/icons/hicolor/48x48 @dirrm share/apps/kolourpaint/icons/hicolor/32x32/apps @dirrm share/apps/kolourpaint/icons/hicolor/32x32 +@dirrm share/apps/kolourpaint/icons/hicolor/22x22/apps +@dirrm share/apps/kolourpaint/icons/hicolor/22x22 @dirrm share/apps/kolourpaint/icons/hicolor/16x16/apps -@dirrm share/apps/kolourpaint/icons/hicolor/16x16/actions @dirrm share/apps/kolourpaint/icons/hicolor/16x16 @dirrm share/apps/kolourpaint/icons/hicolor +@dirrm share/apps/kolourpaint/icons/crystalsvg/scalable/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/scalable +@dirrm share/apps/kolourpaint/icons/crystalsvg/48x48/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/48x48 +@dirrm share/apps/kolourpaint/icons/crystalsvg/32x32/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/32x32 +@dirrm share/apps/kolourpaint/icons/crystalsvg/22x22/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/22x22 +@dirrm share/apps/kolourpaint/icons/crystalsvg/16x16/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/16x16 +@dirrm share/apps/kolourpaint/icons/crystalsvg @dirrm share/apps/kolourpaint/icons @dirrm share/apps/kolourpaint @dirrm share/apps/kiconedit/pics @@ -1076,9 +1235,11 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/apps/kghostview @dirrm share/apps/kgamma/pics @dirrm share/apps/kgamma +@dirrm share/apps/kfaxview @dirrm share/apps/kfax/pics @dirrm share/apps/kfax @dirrm share/apps/kdvi @dirrm share/apps/kcoloredit @dirrm include/libtext2path-0.1 +@dirrm include/kviewshell @dirrm include/ksvg 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 57d2116fe256..377567f141d2 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1,2 +1,3 @@ -MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9 -SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272 +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 diff --git a/graphics/kdegraphics4/files/patch-post-3.4.3-kdegraphics-CAN-2005-3193 b/graphics/kdegraphics4/files/patch-post-3.4.3-kdegraphics-CAN-2005-3193 deleted file mode 100644 index 4de41aeb0470..000000000000 --- a/graphics/kdegraphics4/files/patch-post-3.4.3-kdegraphics-CAN-2005-3193 +++ /dev/null @@ -1,174 +0,0 @@ -Index: kpdf/xpdf/xpdf/Stream.cc -=================================================================== ---- kpdf/xpdf/xpdf/Stream.cc (revision 486295) -+++ kpdf/xpdf/xpdf/Stream.cc (working copy) -@@ -408,18 +408,33 @@ void ImageStream::skipLine() { - - StreamPredictor::StreamPredictor(Stream *strA, int predictorA, - int widthA, int nCompsA, int nBitsA) { -+ int totalBits; -+ - str = strA; - predictor = predictorA; - width = widthA; - nComps = nCompsA; - nBits = nBitsA; -+ predLine = NULL; -+ ok = gFalse; - - nVals = width * nComps; -+ totalBits = nVals * nBits; -+ if (totalBits == 0 || -+ (totalBits / nBits) / nComps != width || -+ totalBits + 7 < 0) { -+ return; -+ } - pixBytes = (nComps * nBits + 7) >> 3; -- rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -+ rowBytes = ((totalBits + 7) >> 3) + pixBytes; -+ if (rowBytes < 0) { -+ return; -+ } - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; -+ -+ ok = gTrue; - } - - StreamPredictor::~StreamPredictor() { -@@ -1013,6 +1028,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; - } -@@ -2899,6 +2918,10 @@ GBool DCTStream::readBaselineSOF() { - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -@@ -3258,6 +3281,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 486295) -+++ kpdf/xpdf/xpdf/Stream.h (working copy) -@@ -233,6 +233,8 @@ public: - - ~StreamPredictor(); - -+ GBool isOk() { return ok; } -+ - int lookChar(); - int getChar(); - -@@ -250,6 +252,7 @@ private: - int rowBytes; // bytes per line - Guchar *predLine; // line buffer - int predIdx; // current index in predLine -+ GBool ok; - }; - - //------------------------------------------------------------------------ -Index: kpdf/xpdf/xpdf/JPXStream.cc -=================================================================== ---- kpdf/xpdf/xpdf/JPXStream.cc (revision 486295) -+++ kpdf/xpdf/xpdf/JPXStream.cc (working copy) -@@ -666,7 +666,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; -@@ -701,8 +701,12 @@ GBool JPXStream::readCodestream(Guint /* - / img.xTileSize; - img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) - / img.yTileSize; -- img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles * -- sizeof(JPXTile)); -+ nTiles = img.nXTiles * img.nYTiles; -+ if (img.nXTiles == 0 || nTiles / img.nXTiles != 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 *)gmalloc(img.nComps * - sizeof(JPXTileComp)); -Index: kpdf/xpdf/goo/gmem.c -=================================================================== ---- kpdf/xpdf/goo/gmem.c (revision 486129) -+++ kpdf/xpdf/goo/gmem.c (working copy) -@@ -175,6 +175,28 @@ void gfree(void *p) { - #endif - } - -+void *gmallocn(int nObjs, int objSize) { -+ int n; -+ -+ n = nObjs * objSize; -+ if (objSize == 0 || n / objSize != nObjs) { -+ fprintf(stderr, "Bogus memory allocation size\n"); -+ exit(1); -+ } -+ return gmalloc(n); -+} -+ -+void *greallocn(void *p, int nObjs, int objSize) { -+ int n; -+ -+ n = nObjs * objSize; -+ if (objSize == 0 || n / objSize != nObjs) { -+ fprintf(stderr, "Bogus memory allocation size\n"); -+ exit(1); -+ } -+ return grealloc(p, n); -+} -+ - #ifdef DEBUG_MEM - void gMemReport(FILE *f) { - GMemHdr *p; -Index: kpdf/xpdf/goo/gmem.h -=================================================================== ---- kpdf/xpdf/goo/gmem.h (revision 486129) -+++ kpdf/xpdf/goo/gmem.h (working copy) -@@ -28,6 +28,15 @@ extern void *gmalloc(size_t size); - extern void *grealloc(void *p, size_t size); - - /* -+ * These are similar to gmalloc and grealloc, but take an object count -+ * and size. The result is similar to allocating nObjs * objSize -+ * bytes, but there is an additional error check that the total size -+ * doesn't overflow an int. -+ */ -+extern void *gmallocn(int nObjs, int objSize); -+extern void *greallocn(void *p, int nObjs, int objSize); -+ -+/* - * Same as free, but checks for and ignores NULL pointers. - */ - extern void gfree(void *p); 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 new file mode 100644 index 000000000000..0b6f22303de8 --- /dev/null +++ b/graphics/kdegraphics4/files/patch-post-3.5.0-kdegraphics-CAN-2005-3193 @@ -0,0 +1,287 @@ +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 new file mode 100644 index 000000000000..c29d93ac8ee9 --- /dev/null +++ b/graphics/kdegraphics4/files/patch-post-3.5.0-kpovmodeler @@ -0,0 +1,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( ) ) + { diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist index 3a7980637e57..c23b7484246a 100644 --- a/graphics/kdegraphics4/pkg-plist +++ b/graphics/kdegraphics4/pkg-plist @@ -2,6 +2,7 @@ bin/kcolorchooser bin/kcoloredit bin/kdvi bin/kfax +bin/kfaxview bin/kghostview bin/kiconedit bin/kolourpaint @@ -165,6 +166,7 @@ include/dom/SVGViewSpec.h include/dom/SVGWindow.h include/dom/SVGZoomAndPan.h include/dom/SVGZoomEvent.h +include/kfaximage.h include/kmultipageInterface.h include/ksvg/CanvasFactory.h include/ksvg/CanvasItem.h @@ -172,9 +174,31 @@ include/ksvg/CanvasItems.h include/ksvg/DocumentFactory.h include/ksvg/KSVGCanvas.h include/ksvg/ksvg_plugin.h +include/kviewshell/anchor.h +include/kviewshell/bookmark.h +include/kviewshell/documentPageCache.h +include/kviewshell/documentRenderer.h +include/kviewshell/documentWidget.h +include/kviewshell/history.h +include/kviewshell/hyperlink.h +include/kviewshell/kmultipage.h +include/kviewshell/length.h +include/kviewshell/pageNumber.h +include/kviewshell/pageSize.h +include/kviewshell/pageView.h +include/kviewshell/renderedDocumentPage.h +include/kviewshell/renderedDocumentPagePixmap.h +include/kviewshell/renderedDocumentPagePrinter.h +include/kviewshell/selection.h +include/kviewshell/simplePageSize.h +include/kviewshell/textBox.h +include/kviewshell/zoom.h +include/kviewshell/zoomlimits.h include/libtext2path-0.1/BezierPath.h include/libtext2path-0.1/Glyph.h include/libtext2path-0.1/GlyphTracer.h +lib/kde3/djvuviewpart.la +lib/kde3/djvuviewpart.so lib/kde3/emptymultipagepart.la lib/kde3/emptymultipagepart.so lib/kde3/gsthumbnail.la @@ -195,8 +219,8 @@ lib/kde3/kded_daemonwatcher.la lib/kde3/kded_daemonwatcher.so lib/kde3/kdvipart.la lib/kde3/kdvipart.so -lib/kde3/kfaxpart.la -lib/kde3/kfaxpart.so +lib/kde3/kfaxviewpart.la +lib/kde3/kfaxviewpart.so lib/kde3/kfile_bmp.la lib/kde3/kfile_bmp.so lib/kde3/kfile_dds.la @@ -205,20 +229,22 @@ lib/kde3/kfile_dvi.la lib/kde3/kfile_dvi.so lib/kde3/kfile_exr.la lib/kde3/kfile_exr.so +lib/kde3/kfile_gif.la +lib/kde3/kfile_gif.so lib/kde3/kfile_ico.la lib/kde3/kfile_ico.so lib/kde3/kfile_jpeg.la lib/kde3/kfile_jpeg.so lib/kde3/kfile_pcx.la lib/kde3/kfile_pcx.so -lib/kde3/kfile_pdf.la -lib/kde3/kfile_pdf.so lib/kde3/kfile_png.la lib/kde3/kfile_png.so lib/kde3/kfile_pnm.la lib/kde3/kfile_pnm.so lib/kde3/kfile_ps.la lib/kde3/kfile_ps.so +lib/kde3/kfile_raw.la +lib/kde3/kfile_raw.so lib/kde3/kfile_rgb.la lib/kde3/kfile_rgb.so lib/kde3/kfile_tga.la @@ -243,6 +269,8 @@ lib/kde3/kview_scannerplugin.la lib/kde3/kview_scannerplugin.so lib/kde3/kviewerpart.la lib/kde3/kviewerpart.so +lib/kde3/libdjvu.la +lib/kde3/libdjvu.so lib/kde3/libkghostviewpart.la lib/kde3/libkghostviewpart.so lib/kde3/libkmrmlpart.la @@ -269,6 +297,8 @@ lib/libkdeinit_kview.la lib/libkdeinit_kview.so lib/libkdeinit_mrmlsearch.la lib/libkdeinit_mrmlsearch.so +lib/libkfaximage.la +lib/libkfaximage.so lib/libkghostviewlib.la lib/libkghostviewlib.so lib/libkghostviewlib.so.0 @@ -292,6 +322,7 @@ share/applications/kde/kcolorchooser.desktop share/applications/kde/kcoloredit.desktop share/applications/kde/kdvi.desktop share/applications/kde/kfax.desktop +share/applications/kde/kfaxview.desktop share/applications/kde/kgamma.desktop share/applications/kde/kghostview.desktop share/applications/kde/kiconedit.desktop @@ -302,16 +333,17 @@ share/applications/kde/kruler.desktop share/applications/kde/ksnapshot.desktop share/applications/kde/kview.desktop share/applnk/Graphics/kruler.desktop +share/apps/djvumultipage.rc share/apps/kcoloredit/kcoloreditui.rc share/apps/kconf_update/kghostview.upd share/apps/kconf_update/update-to-xt-names.pl share/apps/kdvi/kdvi_part.rc share/apps/kdvi/kviewshell.rc share/apps/kdvi/tips -share/apps/kfax/kfax_part.rc share/apps/kfax/kfaxui.rc share/apps/kfax/pics/kfax.tif share/apps/kfax/pics/kfaxlogo.xpm +share/apps/kfaxview/kviewshell.rc share/apps/kgamma/pics/background.png share/apps/kgamma/pics/cmyscale.png share/apps/kgamma/pics/darkgrey.png @@ -350,27 +382,101 @@ share/apps/kiconedit/pics/source.png share/apps/kiconedit/pics/standard.png share/apps/kiconedit/pics/transform.png share/apps/kiconedit/pics/window_new.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_brush.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_picker.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_washer.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_curve.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_ellipse.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_elliptical_selection.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_eraser.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_flood_fill.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_free_form_selection.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_line.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_pen.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polygon.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polyline.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rect_selection.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rectangle.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rounded_rectangle.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_spraycan.png -share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_brush.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_picker.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_washer.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_curve.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_ellipse.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_elliptical_selection.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_eraser.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_flood_fill.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_free_form_selection.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_line.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_pen.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polygon.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polyline.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rect_selection.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rounded_rectangle.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_spraycan.png +share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_text.png +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_brush.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_picker.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_washer.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_curve.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_ellipse.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_elliptical_selection.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_eraser.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_flood_fill.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_free_form_selection.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_line.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_pen.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polygon.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polyline.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rect_selection.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rectangle.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_spraycan.svgz +share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_text.svgz share/apps/kolourpaint/icons/hicolor/16x16/apps/kolourpaint.png +share/apps/kolourpaint/icons/hicolor/22x22/apps/kolourpaint.png share/apps/kolourpaint/icons/hicolor/32x32/apps/kolourpaint.png share/apps/kolourpaint/icons/hicolor/48x48/apps/kolourpaint.png +share/apps/kolourpaint/icons/hicolor/scalable/apps/kolourpaint.svgz share/apps/kolourpaint/kolourpaintui.rc share/apps/kolourpaint/pics/color_transparent_26x26.png share/apps/kolourpaint/pics/colorbutton_swap_16x16.png @@ -762,6 +868,13 @@ share/apps/kview/kpartplugins/kviewscanner.desktop share/apps/kview/kpartplugins/kviewscanner.rc share/apps/kview/kview.setdlg share/apps/kview/kviewui.rc +share/apps/kview/photobookui.rc +share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png +share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png +share/apps/kviewerpart/icons/hicolor/22x22/actions/movetool.png +share/apps/kviewerpart/icons/hicolor/22x22/actions/selectiontool.png +share/apps/kviewerpart/icons/hicolor/32x32/actions/movetool.png +share/apps/kviewerpart/icons/hicolor/48x48/actions/movetool.png share/apps/kviewerpart/kviewerpart.rc share/apps/kviewshell/kviewshell.rc share/apps/kviewviewer/kpartplugins/kviewbrowser.desktop @@ -769,11 +882,12 @@ share/apps/kviewviewer/kpartplugins/kviewbrowser.rc share/apps/kviewviewer/kviewpopup.rc share/apps/kviewviewer/kviewviewer.rc share/apps/kviewviewer/kviewviewer_ro.rc -share/apps/photobookui.rc +share/config.kcfg/djvumultipage.kcfg share/config.kcfg/kdvi.kcfg share/config.kcfg/kghostview.kcfg share/config.kcfg/kpdf.kcfg share/config.kcfg/kviewshell.kcfg +share/config/magic/x-image-raw.magic share/doc/HTML/en/kcoloredit/common share/doc/HTML/en/kcoloredit/index.cache.bz2 share/doc/HTML/en/kcoloredit/index.docbook @@ -913,72 +1027,78 @@ 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/snapshot1.png -share/doc/HTML/en/kview/snapshot2.png -share/doc/HTML/en/kview/snapshot3.png -share/doc/HTML/en/kview/snapshot4.png -share/doc/HTML/en/kview/snapshot5.png -share/doc/HTML/en/kview/snapshot6.png -share/doc/HTML/en/kview/snapshot7.png -share/doc/HTML/en/kview/snapshot8.png -share/doc/HTML/en/kview/snapshot9.png -share/icons/crystalsvg/128x128/apps/kghostview.png -share/icons/crystalsvg/128x128/apps/kpdf.png -share/icons/crystalsvg/16x16/apps/kcolorchooser.png -share/icons/crystalsvg/16x16/apps/kcoloredit.png -share/icons/crystalsvg/16x16/apps/kdvi.png -share/icons/crystalsvg/16x16/apps/kfax.png -share/icons/crystalsvg/16x16/apps/kghostview.png -share/icons/crystalsvg/16x16/apps/kiconedit.png -share/icons/crystalsvg/16x16/apps/kpdf.png -share/icons/crystalsvg/16x16/apps/kpovmodeler.png -share/icons/crystalsvg/16x16/apps/kruler.png -share/icons/crystalsvg/16x16/apps/ksnapshot.png -share/icons/crystalsvg/16x16/apps/kview.png share/icons/crystalsvg/16x16/apps/kviewshell.png share/icons/crystalsvg/16x16/apps/photobook.png share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png -share/icons/crystalsvg/22x22/apps/kcolorchooser.png -share/icons/crystalsvg/22x22/apps/kpdf.png share/icons/crystalsvg/22x22/apps/photobook.png -share/icons/crystalsvg/32x32/apps/kcoloredit.png -share/icons/crystalsvg/32x32/apps/kdvi.png -share/icons/crystalsvg/32x32/apps/kfax.png -share/icons/crystalsvg/32x32/apps/kghostview.png -share/icons/crystalsvg/32x32/apps/kiconedit.png -share/icons/crystalsvg/32x32/apps/kpdf.png -share/icons/crystalsvg/32x32/apps/kpovmodeler.png -share/icons/crystalsvg/32x32/apps/kruler.png -share/icons/crystalsvg/32x32/apps/ksnapshot.png -share/icons/crystalsvg/32x32/apps/kview.png share/icons/crystalsvg/32x32/apps/kviewshell.png share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png -share/icons/crystalsvg/48x48/apps/kdvi.png -share/icons/crystalsvg/48x48/apps/kfax.png -share/icons/crystalsvg/48x48/apps/kghostview.png -share/icons/crystalsvg/48x48/apps/kiconedit.png -share/icons/crystalsvg/48x48/apps/kpdf.png -share/icons/crystalsvg/48x48/apps/kpovmodeler.png -share/icons/crystalsvg/48x48/apps/kruler.png -share/icons/crystalsvg/48x48/apps/ksnapshot.png -share/icons/crystalsvg/48x48/apps/kview.png share/icons/crystalsvg/48x48/apps/kviewshell.png share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png -share/icons/crystalsvg/64x64/apps/kghostview.png -share/icons/crystalsvg/64x64/apps/kpdf.png -share/icons/crystalsvg/scalable/apps/kdvi.svgz -share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/hicolor/128x128/apps/kghostview.png +share/icons/hicolor/128x128/apps/kpdf.png +share/icons/hicolor/16x16/apps/kcolorchooser.png +share/icons/hicolor/16x16/apps/kcoloredit.png +share/icons/hicolor/16x16/apps/kdvi.png +share/icons/hicolor/16x16/apps/kfax.png +share/icons/hicolor/16x16/apps/kfaxview.png share/icons/hicolor/16x16/apps/kgamma.png +share/icons/hicolor/16x16/apps/kghostview.png +share/icons/hicolor/16x16/apps/kiconedit.png share/icons/hicolor/16x16/apps/kolourpaint.png +share/icons/hicolor/16x16/apps/kpdf.png +share/icons/hicolor/16x16/apps/kpovmodeler.png +share/icons/hicolor/16x16/apps/kruler.png +share/icons/hicolor/16x16/apps/ksnapshot.png +share/icons/hicolor/16x16/apps/kview.png +share/icons/hicolor/22x22/apps/kcolorchooser.png +share/icons/hicolor/22x22/apps/kdvi.png +share/icons/hicolor/22x22/apps/kfax.png +share/icons/hicolor/22x22/apps/kfaxview.png +share/icons/hicolor/22x22/apps/kghostview.png +share/icons/hicolor/22x22/apps/kiconedit.png +share/icons/hicolor/22x22/apps/kolourpaint.png +share/icons/hicolor/22x22/apps/kpdf.png +share/icons/hicolor/22x22/apps/kpovmodeler.png +share/icons/hicolor/22x22/apps/kruler.png +share/icons/hicolor/22x22/apps/ksnapshot.png +share/icons/hicolor/22x22/apps/kview.png +share/icons/hicolor/32x32/apps/kcoloredit.png +share/icons/hicolor/32x32/apps/kdvi.png +share/icons/hicolor/32x32/apps/kfax.png +share/icons/hicolor/32x32/apps/kfaxview.png share/icons/hicolor/32x32/apps/kgamma.png +share/icons/hicolor/32x32/apps/kghostview.png +share/icons/hicolor/32x32/apps/kiconedit.png share/icons/hicolor/32x32/apps/kolourpaint.png +share/icons/hicolor/32x32/apps/kpdf.png +share/icons/hicolor/32x32/apps/kpovmodeler.png +share/icons/hicolor/32x32/apps/kruler.png +share/icons/hicolor/32x32/apps/ksnapshot.png +share/icons/hicolor/32x32/apps/kview.png +share/icons/hicolor/48x48/apps/kdvi.png +share/icons/hicolor/48x48/apps/kfax.png +share/icons/hicolor/48x48/apps/kfaxview.png share/icons/hicolor/48x48/apps/kgamma.png +share/icons/hicolor/48x48/apps/kghostview.png +share/icons/hicolor/48x48/apps/kiconedit.png share/icons/hicolor/48x48/apps/kolourpaint.png -share/icons/locolor/16x16/apps/kcoloredit.png -share/icons/locolor/16x16/apps/kpovmodeler.png -share/icons/locolor/32x32/apps/kcoloredit.png -share/icons/locolor/32x32/apps/kpovmodeler.png +share/icons/hicolor/48x48/apps/kpdf.png +share/icons/hicolor/48x48/apps/kpovmodeler.png +share/icons/hicolor/48x48/apps/kruler.png +share/icons/hicolor/48x48/apps/ksnapshot.png +share/icons/hicolor/48x48/apps/kview.png +share/icons/hicolor/64x64/apps/kghostview.png +share/icons/hicolor/64x64/apps/kpdf.png +share/icons/hicolor/scalable/apps/kdvi.svgz +share/icons/hicolor/scalable/apps/kfax.svgz +share/icons/hicolor/scalable/apps/kfaxview.svgz +share/icons/hicolor/scalable/apps/kolourpaint.svgz +share/icons/hicolor/scalable/apps/kpdf.svgz +share/icons/hicolor/scalable/apps/ksnapshot.svgz +share/mimelnk/image/x-image-raw.desktop share/mimelnk/text/mrml.desktop +share/services/djvumultipage.desktop share/services/emptymultipage.desktop share/services/gsthumbnail.desktop share/services/kconfiguredialog/kviewcanvasconfig.desktop @@ -987,17 +1107,20 @@ share/services/kconfiguredialog/kviewpluginsconfig.desktop share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop share/services/kded/daemonwatcher.desktop share/services/kdvimultipage.desktop +share/services/kfaxmultipage.desktop +share/services/kfaxmultipage_tiff.desktop share/services/kfile_bmp.desktop share/services/kfile_dds.desktop share/services/kfile_dvi.desktop share/services/kfile_exr.desktop +share/services/kfile_gif.desktop share/services/kfile_ico.desktop share/services/kfile_jpeg.desktop share/services/kfile_pcx.desktop -share/services/kfile_pdf.desktop share/services/kfile_png.desktop share/services/kfile_pnm.desktop share/services/kfile_ps.desktop +share/services/kfile_raw.desktop share/services/kfile_rgb.desktop share/services/kfile_tga.desktop share/services/kfile_tiff.desktop @@ -1016,7 +1139,18 @@ share/servicetypes/kimageviewer.desktop share/servicetypes/kimageviewercanvas.desktop share/servicetypes/kmultipage.desktop share/servicetypes/ksvgrenderer.desktop +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html @dirrm share/services/kconfiguredialog +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview +@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs @dirrm share/doc/HTML/en/kview @dirrm share/doc/HTML/en/ksnapshot @dirrm share/doc/HTML/en/kruler @@ -1028,9 +1162,20 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/doc/HTML/en/kgamma @dirrm share/doc/HTML/en/kdvi @dirrm share/doc/HTML/en/kcoloredit +@dirrm share/config/magic @dirrm share/apps/kviewviewer/kpartplugins @dirrm share/apps/kviewviewer @dirrm share/apps/kviewshell +@dirrm share/apps/kviewerpart/icons/hicolor/48x48/actions +@dirrm share/apps/kviewerpart/icons/hicolor/48x48 +@dirrm share/apps/kviewerpart/icons/hicolor/32x32/actions +@dirrm share/apps/kviewerpart/icons/hicolor/32x32 +@dirrm share/apps/kviewerpart/icons/hicolor/22x22/actions +@dirrm share/apps/kviewerpart/icons/hicolor/22x22 +@dirrm share/apps/kviewerpart/icons/hicolor/16x16/actions +@dirrm share/apps/kviewerpart/icons/hicolor/16x16 +@dirrm share/apps/kviewerpart/icons/hicolor +@dirrm share/apps/kviewerpart/icons @dirrm share/apps/kviewerpart @dirrm share/apps/kview/kpartplugins @dirrm share/apps/kview @@ -1061,14 +1206,28 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/apps/kpdfpart @dirrm share/apps/kpdf @dirrm share/apps/kolourpaint/pics +@dirrm share/apps/kolourpaint/icons/hicolor/scalable/apps +@dirrm share/apps/kolourpaint/icons/hicolor/scalable @dirrm share/apps/kolourpaint/icons/hicolor/48x48/apps @dirrm share/apps/kolourpaint/icons/hicolor/48x48 @dirrm share/apps/kolourpaint/icons/hicolor/32x32/apps @dirrm share/apps/kolourpaint/icons/hicolor/32x32 +@dirrm share/apps/kolourpaint/icons/hicolor/22x22/apps +@dirrm share/apps/kolourpaint/icons/hicolor/22x22 @dirrm share/apps/kolourpaint/icons/hicolor/16x16/apps -@dirrm share/apps/kolourpaint/icons/hicolor/16x16/actions @dirrm share/apps/kolourpaint/icons/hicolor/16x16 @dirrm share/apps/kolourpaint/icons/hicolor +@dirrm share/apps/kolourpaint/icons/crystalsvg/scalable/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/scalable +@dirrm share/apps/kolourpaint/icons/crystalsvg/48x48/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/48x48 +@dirrm share/apps/kolourpaint/icons/crystalsvg/32x32/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/32x32 +@dirrm share/apps/kolourpaint/icons/crystalsvg/22x22/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/22x22 +@dirrm share/apps/kolourpaint/icons/crystalsvg/16x16/actions +@dirrm share/apps/kolourpaint/icons/crystalsvg/16x16 +@dirrm share/apps/kolourpaint/icons/crystalsvg @dirrm share/apps/kolourpaint/icons @dirrm share/apps/kolourpaint @dirrm share/apps/kiconedit/pics @@ -1076,9 +1235,11 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/apps/kghostview @dirrm share/apps/kgamma/pics @dirrm share/apps/kgamma +@dirrm share/apps/kfaxview @dirrm share/apps/kfax/pics @dirrm share/apps/kfax @dirrm share/apps/kdvi @dirrm share/apps/kcoloredit @dirrm include/libtext2path-0.1 +@dirrm include/kviewshell @dirrm include/ksvg diff --git a/graphics/kooka/distinfo b/graphics/kooka/distinfo index 57d2116fe256..377567f141d2 100644 --- a/graphics/kooka/distinfo +++ b/graphics/kooka/distinfo @@ -1,2 +1,3 @@ -MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9 -SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272 +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 diff --git a/graphics/kuickshow-kde4/distinfo b/graphics/kuickshow-kde4/distinfo index 57d2116fe256..377567f141d2 100644 --- a/graphics/kuickshow-kde4/distinfo +++ b/graphics/kuickshow-kde4/distinfo @@ -1,2 +1,3 @@ -MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9 -SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272 +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 diff --git a/graphics/kuickshow-kde4/pkg-plist b/graphics/kuickshow-kde4/pkg-plist index 9430bcd61c37..6f71a36174a7 100644 --- a/graphics/kuickshow-kde4/pkg-plist +++ b/graphics/kuickshow-kde4/pkg-plist @@ -18,10 +18,9 @@ share/doc/HTML/en/kuickshow/common share/doc/HTML/en/kuickshow/index.cache.bz2 share/doc/HTML/en/kuickshow/index.docbook share/doc/HTML/en/kuickshow/screenshot.png -share/icons/crystalsvg/16x16/apps/kuickshow.png -share/icons/crystalsvg/32x32/apps/kuickshow.png -share/icons/locolor/16x16/apps/kuickshow.png -share/icons/locolor/32x32/apps/kuickshow.png +share/icons/hicolor/16x16/apps/kuickshow.png +share/icons/hicolor/22x22/apps/kuickshow.png +share/icons/hicolor/32x32/apps/kuickshow.png @dirrm share/doc/HTML/en/kuickshow @dirrm share/apps/kuickshow/pics @dirrm share/apps/kuickshow diff --git a/graphics/kuickshow/distinfo b/graphics/kuickshow/distinfo index 57d2116fe256..377567f141d2 100644 --- a/graphics/kuickshow/distinfo +++ b/graphics/kuickshow/distinfo @@ -1,2 +1,3 @@ -MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9 -SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272 +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 diff --git a/graphics/kuickshow/pkg-plist b/graphics/kuickshow/pkg-plist index 9430bcd61c37..6f71a36174a7 100644 --- a/graphics/kuickshow/pkg-plist +++ b/graphics/kuickshow/pkg-plist @@ -18,10 +18,9 @@ share/doc/HTML/en/kuickshow/common share/doc/HTML/en/kuickshow/index.cache.bz2 share/doc/HTML/en/kuickshow/index.docbook share/doc/HTML/en/kuickshow/screenshot.png -share/icons/crystalsvg/16x16/apps/kuickshow.png -share/icons/crystalsvg/32x32/apps/kuickshow.png -share/icons/locolor/16x16/apps/kuickshow.png -share/icons/locolor/32x32/apps/kuickshow.png +share/icons/hicolor/16x16/apps/kuickshow.png +share/icons/hicolor/22x22/apps/kuickshow.png +share/icons/hicolor/32x32/apps/kuickshow.png @dirrm share/doc/HTML/en/kuickshow @dirrm share/apps/kuickshow/pics @dirrm share/apps/kuickshow |