diff --git a/package/kde/arts/arts.desc b/package/kde/arts/arts.desc index bdfee0b22..0c24dca6b 100644 --- a/package/kde/arts/arts.desc +++ b/package/kde/arts/arts.desc @@ -43,5 +43,5 @@ [V] 1.5.0 [P] X -?---5---9 128.200 -[D] 1112524085 arts-1.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 1112524085 arts-1.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/k3b/k3b.desc b/package/kde/k3b/k3b.desc index 14836dd75..42b2c643f 100644 --- a/package/kde/k3b/k3b.desc +++ b/package/kde/k3b/k3b.desc @@ -38,8 +38,8 @@ [L] GPL [S] Beta -[V] 0.12.9 +[V] 0.12.11 [P] X -?---5---9 201.300 -[D] 2434032321 k3b-0.12.9.tar.bz2 http://dl.sourceforge.net/sourceforge/k3b/ +[D] 213079188 k3b-0.12.11.tar.bz2 http://dl.sourceforge.net/sourceforge/k3b/ diff --git a/package/kde/kde-i18n-de/kde-i18n-de.desc b/package/kde/kde-i18n-de/kde-i18n-de.desc index 9605468fe..a796bd51b 100644 --- a/package/kde/kde-i18n-de/kde-i18n-de.desc +++ b/package/kde/kde-i18n-de/kde-i18n-de.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 193.000 -[D] 587260738 kde-i18n-de-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/kde-i18n/ +[D] 3366986946 kde-i18n-de-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/kde-i18n/ diff --git a/package/kde/kde-i18n-es/kde-i18n-es.desc b/package/kde/kde-i18n-es/kde-i18n-es.desc index e360c04ca..becd7f480 100644 --- a/package/kde/kde-i18n-es/kde-i18n-es.desc +++ b/package/kde/kde-i18n-es/kde-i18n-es.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 178.000 -[D] 790614017 kde-i18n-es-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/kde-i18n/ +[D] 1417777429 kde-i18n-es-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/kde-i18n/ diff --git a/package/kde/kde-i18n-fr/kde-i18n-fr.desc b/package/kde/kde-i18n-fr/kde-i18n-fr.desc index 1a85b3eb2..21625fbf3 100644 --- a/package/kde/kde-i18n-fr/kde-i18n-fr.desc +++ b/package/kde/kde-i18n-fr/kde-i18n-fr.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 176.700 -[D] 2413941898 kde-i18n-fr-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/kde-i18n/ +[D] 2249948296 kde-i18n-fr-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/kde-i18n/ diff --git a/package/kde/kde-i18n-it/kde-i18n-it.desc b/package/kde/kde-i18n-it/kde-i18n-it.desc index e1c139d4d..4af00f98f 100644 --- a/package/kde/kde-i18n-it/kde-i18n-it.desc +++ b/package/kde/kde-i18n-it/kde-i18n-it.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 188.900 -[D] 3666897816 kde-i18n-it-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/kde-i18n/ +[D] 3964156227 kde-i18n-it-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/kde-i18n/ diff --git a/package/kde/kde-i18n-ru/kde-i18n-ru.desc b/package/kde/kde-i18n-ru/kde-i18n-ru.desc index 532269b4e..e5fdf302b 100644 --- a/package/kde/kde-i18n-ru/kde-i18n-ru.desc +++ b/package/kde/kde-i18n-ru/kde-i18n-ru.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 176.700 -[D] 512534870 kde-i18n-ru-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/kde-i18n/ +[D] 1190079343 kde-i18n-ru-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/kde-i18n/ diff --git a/package/kde/kdeaccessibility/kdeaccessibility.desc b/package/kde/kdeaccessibility/kdeaccessibility.desc index 9f868a1c3..672d55a06 100644 --- a/package/kde/kdeaccessibility/kdeaccessibility.desc +++ b/package/kde/kdeaccessibility/kdeaccessibility.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 171.500 -[D] 2692418387 kdeaccessibility-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 1805879626 kdeaccessibility-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdeaddons/kdeaddons.desc b/package/kde/kdeaddons/kdeaddons.desc index b003e8a89..400476874 100644 --- a/package/kde/kdeaddons/kdeaddons.desc +++ b/package/kde/kdeaddons/kdeaddons.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 196.500 -[D] 400134180 kdeaddons-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 2251466451 kdeaddons-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdeadmin/kdeadmin.desc b/package/kde/kdeadmin/kdeadmin.desc index b6b587484..d8583571d 100644 --- a/package/kde/kdeadmin/kdeadmin.desc +++ b/package/kde/kdeadmin/kdeadmin.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 169.600 -[D] 1277048464 kdeadmin-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 1513619638 kdeadmin-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdeartwork/kdeartwork.desc b/package/kde/kdeartwork/kdeartwork.desc index ecb9f31d2..f9b43044e 100644 --- a/package/kde/kdeartwork/kdeartwork.desc +++ b/package/kde/kdeartwork/kdeartwork.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 176.400 -[D] 3353899039 kdeartwork-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 1273448754 kdeartwork-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdebase/kdebase.desc b/package/kde/kdebase/kdebase.desc index b05522b58..dc0ff2b8f 100644 --- a/package/kde/kdebase/kdebase.desc +++ b/package/kde/kdebase/kdebase.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 166.700 -[D] 1670818887 kdebase-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 2311002070 kdebase-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdebindings/kdebindings.desc b/package/kde/kdebindings/kdebindings.desc index afd993fa5..7800c99c1 100644 --- a/package/kde/kdebindings/kdebindings.desc +++ b/package/kde/kdebindings/kdebindings.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 199.200 -[D] 2432022392 kdebindings-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 3450448681 kdebindings-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdeedu/kdeedu.desc b/package/kde/kdeedu/kdeedu.desc index 5fb250040..76c400d66 100644 --- a/package/kde/kdeedu/kdeedu.desc +++ b/package/kde/kdeedu/kdeedu.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 176.000 -[D] 3812328870 kdeedu-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 391465668 kdeedu-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdegames/kdegames.desc b/package/kde/kdegames/kdegames.desc index 7a9b8c7c8..f25bc1827 100644 --- a/package/kde/kdegames/kdegames.desc +++ b/package/kde/kdegames/kdegames.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 167.700 -[D] 3658855065 kdegames-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 1190915815 kdegames-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdegraphics/kdegraphics.desc b/package/kde/kdegraphics/kdegraphics.desc index f3591315d..638aef338 100644 --- a/package/kde/kdegraphics/kdegraphics.desc +++ b/package/kde/kdegraphics/kdegraphics.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 216.700 -[D] 1349681061 kdegraphics-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 1535779607 kdegraphics-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdegraphics/post-3.5.0-kdegraphics-CAN-2005-3193.patch b/package/kde/kdegraphics/post-3.5.0-kdegraphics-CAN-2005-3193.patch deleted file mode 100644 index 55bfc48f7..000000000 --- a/package/kde/kdegraphics/post-3.5.0-kdegraphics-CAN-2005-3193.patch +++ /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 -+#include - - #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 - #include - #include -+#include - #ifndef WIN32 - #include - #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 -+#include - - #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 - #include - #include -+#include - #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/package/kde/kdegraphics/post-3.5.1-kdegraphics-CVE-2006-0301.patch b/package/kde/kdegraphics/post-3.5.1-kdegraphics-CVE-2006-0301.patch new file mode 100644 index 000000000..3f35d1ba2 --- /dev/null +++ b/package/kde/kdegraphics/post-3.5.1-kdegraphics-CVE-2006-0301.patch @@ -0,0 +1,50 @@ +--- kpdf/xpdf/splash/SplashXPathScanner.cc (Revision 505052) ++++ ./kpdf/xpdf/splash/SplashXPathScanner.cc (Arbeitskopie) +@@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in + } + + void SplashXPathScanner::computeIntersections(int y) { +- SplashCoord ySegMin, ySegMax, xx0, xx1; ++ SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1; + SplashXPathSeg *seg; + int i, j; + +@@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec + } else if (seg->flags & splashXPathVert) { + xx0 = xx1 = seg->x0; + } else { +- if (ySegMin <= y) { +- // intersection with top edge +- xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; ++ if (seg->x0 < seg->x1) { ++ xSegMin = seg->x0; ++ xSegMax = seg->x1; + } else { +- // x coord of segment endpoint with min y coord +- xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0; ++ xSegMin = seg->x1; ++ xSegMax = seg->x0; + } +- if (ySegMax >= y + 1) { +- // intersection with bottom edge +- xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; +- } else { +- // x coord of segment endpoint with max y coord +- xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1; ++ // intersection with top edge ++ xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; ++ // intersection with bottom edge ++ xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; ++ // the segment may not actually extend to the top and/or bottom edges ++ if (xx0 < xSegMin) { ++ xx0 = xSegMin; ++ } else if (xx0 > xSegMax) { ++ xx0 = xSegMax; ++ } ++ if (xx1 < xSegMin) { ++ xx1 = xSegMin; ++ } else if (xx1 > xSegMax) { ++ xx1 = xSegMax; + } + } + if (xx0 < xx1) { diff --git a/package/kde/kdelibs/kdelibs.desc b/package/kde/kdelibs/kdelibs.desc index 34318fdad..70b1a847e 100644 --- a/package/kde/kdelibs/kdelibs.desc +++ b/package/kde/kdelibs/kdelibs.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 166.500 -[D] 203648739 kdelibs-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 360458505 kdelibs-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdemultimedia/kdemultimedia.desc b/package/kde/kdemultimedia/kdemultimedia.desc index d4f12d876..77dad6040 100644 --- a/package/kde/kdemultimedia/kdemultimedia.desc +++ b/package/kde/kdemultimedia/kdemultimedia.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 193.700 -[D] 2616478538 kdemultimedia-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 1842461000 kdemultimedia-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdenetwork/kdenetwork.desc b/package/kde/kdenetwork/kdenetwork.desc index 31da03090..92c9f13f2 100644 --- a/package/kde/kdenetwork/kdenetwork.desc +++ b/package/kde/kdenetwork/kdenetwork.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 185.400 -[D] 677833093 kdenetwork-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 3078536645 kdenetwork-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdepim/kdepim.desc b/package/kde/kdepim/kdepim.desc index becdae858..751dfa50f 100644 --- a/package/kde/kdepim/kdepim.desc +++ b/package/kde/kdepim/kdepim.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 167.000 -[D] 708673430 kdepim-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 419905365 kdepim-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ [D] 1403856925 ksyncml-20050314.tar.gz http://www.borowka.net/~maciek/ksyncml/data/ diff --git a/package/kde/kdesdk/kdesdk.desc b/package/kde/kdesdk/kdesdk.desc index 57e4c013f..c08dd64e8 100644 --- a/package/kde/kdesdk/kdesdk.desc +++ b/package/kde/kdesdk/kdesdk.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 195.900 -[D] 3269636719 kdesdk-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 506485238 kdesdk-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdetoys/kdetoys.desc b/package/kde/kdetoys/kdetoys.desc index 505fda320..222551c4d 100644 --- a/package/kde/kdetoys/kdetoys.desc +++ b/package/kde/kdetoys/kdetoys.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 193.900 -[D] 727288848 kdetoys-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 2589383175 kdetoys-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdeutils/kdeutils.desc b/package/kde/kdeutils/kdeutils.desc index 0007373cb..5e8e83c90 100644 --- a/package/kde/kdeutils/kdeutils.desc +++ b/package/kde/kdeutils/kdeutils.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 166.900 -[D] 3903129558 kdeutils-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 497601364 kdeutils-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdevelop/kdevelop.desc b/package/kde/kdevelop/kdevelop.desc index e12561e83..03a8aa497 100644 --- a/package/kde/kdevelop/kdevelop.desc +++ b/package/kde/kdevelop/kdevelop.desc @@ -38,5 +38,5 @@ [V] 3.3.0 [P] X -?---5---9 208.300 -[D] 4084705236 kdevelop-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 4084705236 kdevelop-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/ diff --git a/package/kde/kdewebdev/kdewebdev.desc b/package/kde/kdewebdev/kdewebdev.desc index bccd3e961..1565361bb 100644 --- a/package/kde/kdewebdev/kdewebdev.desc +++ b/package/kde/kdewebdev/kdewebdev.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.5.0 +[V] 3.5.1 [P] X -?---5---9 196.000 -[D] 151438383 kdewebdev-3.5.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5/src/ +[D] 2492930918 kdewebdev-3.5.1.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.1/src/