From 9a838d8d422f7e99fa987232e63ecee5ef96be9c Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sep 04 2008 16:56:27 +0000 Subject: - update to 3.5.10 --- diff --git a/.cvsignore b/.cvsignore index aee537f..a44a2ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdegraphics-3.5.9.tar.bz2 +kdegraphics-3.5.10.tar.bz2 diff --git a/kdegraphics-3.5.9-kpdf-crashes.patch b/kdegraphics-3.5.9-kpdf-crashes.patch deleted file mode 100644 index ed74246..0000000 --- a/kdegraphics-3.5.9-kpdf-crashes.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -ur kdegraphics-orig/kpdf/xpdf/splash/Splash.cc kdegraphics-3.5.9/kpdf/xpdf/splash/Splash.cc ---- kdegraphics-orig/kpdf/xpdf/splash/Splash.cc 2008-02-13 10:37:05.000000000 +0100 -+++ kdegraphics-3.5.9/kpdf/xpdf/splash/Splash.cc 2008-03-18 15:50:41.000000000 +0100 -@@ -1674,15 +1674,37 @@ - Guchar *p; - int x1, y1, xx, xx1, yy; - -+ p = glyph->data; -+ int xStart = x0 - glyph->x; -+ int yStart = y0 - glyph->y; -+ int xxLimit = glyph->w; -+ int yyLimit = glyph->h; -+ -+ if (yStart < 0) -+ { -+ p += glyph->w * -yStart; // move p to the beginning of the first painted row -+ yyLimit += yStart; -+ yStart = 0; -+ } -+ -+ if (xStart < 0) -+ { -+ p += -xStart; // move p to the first painted pixel -+ xxLimit += xStart; -+ xStart = 0; -+ } -+ -+ if (xxLimit + xStart >= bitmap->width) xxLimit = bitmap->width - xStart; -+ if (yyLimit + yStart >= bitmap->height) yyLimit = bitmap->height - yStart; -+ - if (noClip) { - if (glyph->aa) { -- pipeInit(&pipe, x0 - glyph->x, y0 - glyph->y, -+ pipeInit(&pipe, xStart, yStart, - state->fillPattern, NULL, state->fillAlpha, gTrue, gFalse); -- p = glyph->data; -- for (yy = 0, y1 = y0 - glyph->y; yy < glyph->h; ++yy, ++y1) { -- pipeSetXY(&pipe, x0 - glyph->x, y1); -- for (xx = 0, x1 = x0 - glyph->x; xx < glyph->w; ++xx, ++x1) { -- alpha = *p++; -+ for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { -+ pipeSetXY(&pipe, xStart, y1); -+ for (xx = 0, x1 = xStart; xx < xxLimit; ++xx, ++x1) { -+ alpha = p[xx]; - if (alpha != 0) { - pipe.shape = (SplashCoord)(alpha / 255.0); - pipeRun(&pipe); -@@ -1692,16 +1714,18 @@ - pipeIncX(&pipe); - } - } -+ p += glyph->w; - } - } else { -- pipeInit(&pipe, x0 - glyph->x, y0 - glyph->y, -+ const int widthEight = (int)ceil(glyph->w / 8.0); -+ -+ pipeInit(&pipe, xStart, yStart, - state->fillPattern, NULL, state->fillAlpha, gFalse, gFalse); -- p = glyph->data; -- for (yy = 0, y1 = y0 - glyph->y; yy < glyph->h; ++yy, ++y1) { -- pipeSetXY(&pipe, x0 - glyph->x, y1); -- for (xx = 0, x1 = x0 - glyph->x; xx < glyph->w; xx += 8) { -- alpha0 = *p++; -- for (xx1 = 0; xx1 < 8 && xx + xx1 < glyph->w; ++xx1, ++x1) { -+ for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { -+ pipeSetXY(&pipe, xStart, y1); -+ for (xx = 0, x1 = xStart; xx < xxLimit; xx += 8) { -+ alpha0 = p[xx / 8]; -+ for (xx1 = 0; xx1 < 8 && xx + xx1 < xxLimit; ++xx1, ++x1) { - if (alpha0 & 0x80) { - pipeRun(&pipe); - updateModX(x1); -@@ -1712,18 +1736,18 @@ - alpha0 <<= 1; - } - } -+ p += widthEight; - } - } - } else { - if (glyph->aa) { -- pipeInit(&pipe, x0 - glyph->x, y0 - glyph->y, -+ pipeInit(&pipe, xStart, yStart, - state->fillPattern, NULL, state->fillAlpha, gTrue, gFalse); -- p = glyph->data; -- for (yy = 0, y1 = y0 - glyph->y; yy < glyph->h; ++yy, ++y1) { -- pipeSetXY(&pipe, x0 - glyph->x, y1); -- for (xx = 0, x1 = x0 - glyph->x; xx < glyph->w; ++xx, ++x1) { -+ for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { -+ pipeSetXY(&pipe, xStart, y1); -+ for (xx = 0, x1 = xStart; xx < xxLimit; ++xx, ++x1) { - if (state->clip->test(x1, y1)) { -- alpha = *p++; -+ alpha = p[xx]; - if (alpha != 0) { - pipe.shape = (SplashCoord)(alpha / 255.0); - pipeRun(&pipe); -@@ -1734,19 +1758,20 @@ - } - } else { - pipeIncX(&pipe); -- ++p; - } - } -+ p += glyph->w; - } - } else { -- pipeInit(&pipe, x0 - glyph->x, y0 - glyph->y, -+ const int widthEight = (int)ceil(glyph->w / 8.0); -+ -+ pipeInit(&pipe, xStart, yStart, - state->fillPattern, NULL, state->fillAlpha, gFalse, gFalse); -- p = glyph->data; -- for (yy = 0, y1 = y0 - glyph->y; yy < glyph->h; ++yy, ++y1) { -- pipeSetXY(&pipe, x0 - glyph->x, y1); -- for (xx = 0, x1 = x0 - glyph->x; xx < glyph->w; xx += 8) { -- alpha0 = *p++; -- for (xx1 = 0; xx1 < 8 && xx + xx1 < glyph->w; ++xx1, ++x1) { -+ for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { -+ pipeSetXY(&pipe, xStart, y1); -+ for (xx = 0, x1 = xStart; xx < xxLimit; xx += 8) { -+ alpha0 = p[xx / 8]; -+ for (xx1 = 0; xx1 < 8 && xx + xx1 < xxLimit; ++xx1, ++x1) { - if (state->clip->test(x1, y1)) { - if (alpha0 & 0x80) { - pipeRun(&pipe); -@@ -1761,6 +1786,7 @@ - alpha0 <<= 1; - } - } -+ p += widthEight; - } - } - } -diff -ur kdegraphics-orig/kpdf/xpdf/splash/SplashXPathScanner.cc kdegraphics-3.5.9/kpdf/xpdf/splash/SplashXPathScanner.cc ---- kdegraphics-orig/kpdf/xpdf/splash/SplashXPathScanner.cc 2007-05-14 09:39:31.000000000 +0200 -+++ kdegraphics-3.5.9/kpdf/xpdf/splash/SplashXPathScanner.cc 2008-03-18 15:50:49.000000000 +0100 -@@ -397,7 +397,7 @@ - for (; xx + 7 <= xx0; xx += 8) { - *p++ = 0x00; - } -- if (xx <= xx0) { -+ if (xx < xx0) { - *p &= 0xff >> (xx0 & 7); - } - } -@@ -406,6 +406,7 @@ - } - } - xx0 = (*x1 + 1) * splashAASize; -+ if (xx0 > aaBuf->getWidth()) xx0 = aaBuf->getWidth(); - // set [xx, xx0) to 0 - if (xx < xx0) { - p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx >> 3); -@@ -420,7 +421,7 @@ - for (; xx + 7 <= xx0; xx += 8) { - *p++ = 0x00; - } -- if (xx <= xx0) { -+ if (xx < xx0) { - *p &= 0xff >> (xx0 & 7); - } - } -diff -ur kdegraphics-orig/kpdf/xpdf/xpdf/Lexer.cc kdegraphics-3.5.9/kpdf/xpdf/xpdf/Lexer.cc ---- kdegraphics-orig/kpdf/xpdf/xpdf/Lexer.cc 2008-02-13 10:37:05.000000000 +0100 -+++ kdegraphics-3.5.9/kpdf/xpdf/xpdf/Lexer.cc 2008-03-18 15:50:04.000000000 +0100 -@@ -298,7 +298,7 @@ - n = 0; - - // we are growing see if the document is not malformed and we are growing too much -- if (objNum > 0) -+ if (objNum > 0 && xref != NULL) - { - int newObjNum = xref->getNumEntry(curStr.streamGetPos()); - if (newObjNum != objNum) diff --git a/kdegraphics.spec b/kdegraphics.spec index 138ef49..91c9d46 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -21,8 +21,8 @@ Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 3.5.9 -Release: 3%{?dist} +Version: 3.5.10 +Release: 1%{?dist} License: GPLv2 Group: Applications/Multimedia @@ -35,7 +35,6 @@ Patch2: kdegraphics-3.3.1-xorg.patch Patch3: kdegraphics-3.5.1-warning.patch # upstream patches -Patch50: kdegraphics-3.5.9-kpdf-crashes.patch Provides: kdegraphics3 = %{version}-%{release} @@ -152,7 +151,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %patch3 -p1 -b .gcc-warning #upstream patches -%patch50 -p1 -b .kpdf-crashes %if %{make_cvs} make -f admin/Makefile.common cvs @@ -378,6 +376,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Thu Sep 04 2008 Kevin Kofler - 7:3.5.10-1 +- update to 3.5.10 +- drop kpdf-crashes patch (fixed upstream) + * Tue Jun 17 2008 Rex Dieter 7:3.5.9-3 - omit multilib upgrade hacks (see also #441222) diff --git a/sources b/sources index 0cebcb4..4be633e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d75e27180573a4e077e0245055891a5 kdegraphics-3.5.9.tar.bz2 +a09094b5357d8cd5c49d45b5d291dcfe kdegraphics-3.5.10.tar.bz2