tags 621401 + patch tags 621401 + pending tags 639031 + patch tags 639031 + pending thanks
Dear maintainer, I've prepared an NMU for scribus (versioned as 1.4.0.dfsg~rc3+svn20110401-1.1) and uploaded it to the archive. Please find attached the patch with the changes. Regards, Ana
diff -Nru scribus-1.4.0.dfsg~rc3+svn20110401/debian/changelog scribus-1.4.0.dfsg~rc3+svn20110401/debian/changelog --- scribus-1.4.0.dfsg~rc3+svn20110401/debian/changelog 2011-04-01 19:41:53.000000000 +0200 +++ scribus-1.4.0.dfsg~rc3+svn20110401/debian/changelog 2011-09-11 22:10:04.000000000 +0200 @@ -1,3 +1,12 @@ +scribus (1.4.0.dfsg~rc3+svn20110401-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix headers to not FTBFS with newer CUPS 1.5. (Closes: #639031) + * Fix FTBFS in ARM. (Closes: #621401). Patch by Jani Monoses. Thanks to Riku + Voipio for the pointer. + + -- Ana Beatriz Guerrero Lopez <a...@debian.org> Sun, 11 Sep 2011 22:10:03 +0200 + scribus (1.4.0.dfsg~rc3+svn20110401-1) unstable; urgency=low * New upstream release candidate. This code buids cleanly on all diff -Nru scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/0001-qreal-double-fixes.patch scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/0001-qreal-double-fixes.patch --- scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/0001-qreal-double-fixes.patch 1970-01-01 01:00:00.000000000 +0100 +++ scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/0001-qreal-double-fixes.patch 2011-09-11 22:08:12.000000000 +0200 @@ -0,0 +1,502 @@ +From: Jani Monoses <j...@ubuntu.com> +Bug: http://bugs.scribus.net/view.php?id=9850 +Bug-Debian: http://bugs.debian.org/621401 +Subject: ARM fixes + +--- + fonts/scfontmetrics.cpp | 4 ++-- + pageitem.cpp | 12 ++++++------ + pageitem_textframe.cpp | 6 +++--- + pdflib_core.cpp | 8 ++++---- + plugins/svgexplugin/svgexplugin.cpp | 16 ++++++++-------- + plugins/tools/pathstroker/pathstroker.cpp | 2 +- + propertiespalette.cpp | 4 ++-- + pslib.cpp | 24 ++++++++++++------------ + scpageoutput.cpp | 8 ++++---- + scpainter.cpp | 8 ++++---- + scribusview.cpp | 16 ++++++++-------- + selection.cpp | 8 ++++---- + smlinestyle.cpp | 2 +- + ui/modetoolbar.cpp | 2 +- + 14 files changed, 60 insertions(+), 60 deletions(-) + +--- a/scribus/fonts/scfontmetrics.cpp ++++ b/scribus/fonts/scfontmetrics.cpp +@@ -281,7 +281,7 @@ QPixmap FontSample(const ScFace& fnt, in + { + gly.translate(static_cast<qreal>(pen_x) / 6400.0, a); + gp = getMaxClipF(&gly); +- ymax = qMax(ymax, gp.y()); ++ ymax = qMax(double(ymax), gp.y()); + p->setupPolygon(&gly); + p->fillPath(); + } +@@ -302,7 +302,7 @@ QPixmap FontSample(const ScFace& fnt, in + { + gly.translate(static_cast<qreal>(pen_x) / 6400.0, a); + gp = getMaxClipF(&gly); +- ymax = qMax(ymax, gp.y()); ++ ymax = qMax(double(ymax), gp.y()); + p->setupPolygon(&gly); + p->fillPath(); + } +--- a/scribus/pageitem.cpp ++++ b/scribus/pageitem.cpp +@@ -1991,12 +1991,12 @@ void PageItem::drawGlyphs(ScPainter *p, + if (style.underlineWidth() != -1) + lw = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + st = style.font().underlinePos(style.fontSize() / 10.0); +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0); +@@ -2109,12 +2109,12 @@ void PageItem::drawGlyphs(ScPainter *p, + if (style.strikethruWidth() != -1) + lw = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + st = style.font().strikeoutPos(style.fontSize() / 10.0); +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0); +@@ -4798,7 +4798,7 @@ void PageItem::getBoundingRect(double *x + FPoint maxAr = getMaxClipF(&arrow); + totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y()))); + } +- totalRect.getCoords(x1, y1, x2, y2); ++ totalRect.getCoords((qreal*)x1, (qreal*)y1, (qreal*)x2, (qreal*)y2); + } + + void PageItem::getVisualBoundingRect(double * x1, double * y1, double * x2, double * y2) const +@@ -4953,7 +4953,7 @@ void PageItem::getVisualBoundingRect(dou + FPoint maxAr = getMaxClipF(&arrow); + totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y()))); + } +- totalRect.getCoords(x1, y1, x2, y2); ++ totalRect.getCoords((qreal*)x1, (qreal*)y1, (qreal*)x2, (qreal*)y2); + } + + double PageItem::visualXPos() const +--- a/scribus/pageitem_textframe.cpp ++++ b/scribus/pageitem_textframe.cpp +@@ -522,7 +522,7 @@ struct LineControl { + double maxX = colRight - morespace; + if (legacy) maxX -= (lineCorr + insets.Right); + +- double StartX = floor(qMax(line.x, qMin(colRight,breakXPos) - 1)); ++ double StartX = floor(qMax((double)line.x, qMin(colRight,breakXPos) - 1)); + int xPos = static_cast<int>(ceil(maxX + insets.Right)); + int yDesc = static_cast<int>(yPos+line.descent); + int yAsc = static_cast<int>(ceil(yPos-line.ascent)); +@@ -687,8 +687,8 @@ struct LineControl { + desc = cStyle.font().realCharDescent(ch, cStyle.fontSize() / 10.0); + } + // qDebug() << QString("checking char 'x%2' with ascender %1 > %3").arg(asce).arg(ch.unicode()).arg(result); +- line.ascent = qMax(line.ascent, asce); +- line.descent = qMax(line.descent, desc); ++ line.ascent = qMax((double)line.ascent, asce); ++ line.descent = qMax((double)line.descent, desc); + } + } + +--- a/scribus/pdflib_core.cpp ++++ b/scribus/pdflib_core.cpp +@@ -4433,12 +4433,12 @@ bool PDFLibCore::setTextCh(PageItem *ite + if (style.underlineWidth() != -1) + Uwid = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); + } + else + { + Upos = style.font().underlinePos(style.fontSize() / 10.0); +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); + } + if (style.baselineOffset() != 0) + Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); +@@ -4713,12 +4713,12 @@ bool PDFLibCore::setTextCh(PageItem *ite + if (style.strikethruWidth() != -1) + Uwid = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); + } + else + { + Upos = style.font().strikeoutPos(style.fontSize() / 10.0); +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); + } + if (style.baselineOffset() != 0) + Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); +--- a/scribus/plugins/svgexplugin/svgexplugin.cpp ++++ b/scribus/plugins/svgexplugin/svgexplugin.cpp +@@ -723,12 +723,12 @@ QDomElement SVGExPlug::processTextItem(P + if (charStyle.underlineWidth() != -1) + lw = (charStyle.underlineWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = charStyle.font().underlinePos(charStyle.fontSize() / 10.0); +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + if (charStyle.baselineOffset() != 0) + Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0); +@@ -780,12 +780,12 @@ QDomElement SVGExPlug::processTextItem(P + if (charStyle.strikethruWidth() != -1) + lw = (charStyle.strikethruWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = charStyle.font().strikeoutPos(charStyle.fontSize() / 10.0); +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + if (charStyle.baselineOffset() != 0) + Upos += (charStyle.fontSize() / 10.0) * hl->glyph.scaleV * (charStyle.baselineOffset() / 1000.0); +@@ -970,12 +970,12 @@ QDomElement SVGExPlug::processPathTextIt + if (charStyle.underlineWidth() != -1) + Uwid = (charStyle.underlineWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = charStyle.font().underlinePos(charStyle.fontSize() / 10.0); +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + if (charStyle.baselineOffset() != 0) + Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0); +@@ -1046,12 +1046,12 @@ QDomElement SVGExPlug::processPathTextIt + if (charStyle.strikethruWidth() != -1) + Uwid = (charStyle.strikethruWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = charStyle.font().strikeoutPos(charStyle.fontSize() / 10.0); +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), qreal(1.0)); + } + if (charStyle.baselineOffset() != 0) + Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0); +--- a/scribus/plugins/tools/pathstroker/pathstroker.cpp ++++ b/scribus/plugins/tools/pathstroker/pathstroker.cpp +@@ -115,7 +115,7 @@ bool PathStrokerPlugin::run(ScribusDoc* + currDoc = ScCore->primaryMainWindow()->doc; + if (currDoc->m_Selection->count() > 0) + { +- QVector<double> m_array; ++ QVector<qreal> m_array; + PageItem *currItem = currDoc->m_Selection->itemAt(0); + FPointArray path = currItem->PoLine; + QPainterPath pp; +--- a/scribus/propertiespalette.cpp ++++ b/scribus/propertiespalette.cpp +@@ -107,7 +107,7 @@ void LineFormatItemDelegate::redraw(cons + const ScColor& col = item.m_doc->PageColors[item.m_Line[its].Color]; + tmpf = ScColorEngine::getDisplayColor(col, item.m_doc, item.m_Line[its].Shade); + QPen pen; +- QVector<double> m_array; ++ QVector<qreal> m_array; + if (item.m_Line[its].Dash == 1) + pen.setStyle(Qt::SolidLine); + else +@@ -4639,7 +4639,7 @@ void PropertiesPalette::MakeIrre(int f, + doc->setRedrawBounding(CurItem); + break; + default: +- CurItem->SetFrameShape(c, vals); ++ CurItem->SetFrameShape(c, (double*)vals); + doc->setRedrawBounding(CurItem); + CurItem->FrameType = f+2; + break; +--- a/scribus/pslib.cpp ++++ b/scribus/pslib.cpp +@@ -2839,12 +2839,12 @@ bool PSLib::ProcessItem(ScribusDoc* Doc, + if (style.underlineWidth() != -1) + Uwid = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = style.font().underlinePos(style.fontSize() / 10.0); +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); +@@ -2910,12 +2910,12 @@ bool PSLib::ProcessItem(ScribusDoc* Doc, + if (style.strikethruWidth() != -1) + Uwid = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = style.font().strikeoutPos(style.fontSize() / 10.0); +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); +@@ -2987,12 +2987,12 @@ bool PSLib::ProcessItem(ScribusDoc* Doc, + if (style.underlineWidth() != -1) + Uwid = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = style.font().underlinePos(style.fontSize() / 10.0); +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); +@@ -3064,12 +3064,12 @@ bool PSLib::ProcessItem(ScribusDoc* Doc, + if (style.strikethruWidth() != -1) + Uwid = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = style.font().strikeoutPos(style.fontSize() / 10.0); +- Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); +@@ -3791,12 +3791,12 @@ void PSLib::setTextCh(ScribusDoc* Doc, P + if (cstyle.underlineWidth() != -1) + lw = (cstyle.underlineWidth() / 1000.0) * (cstyle.fontSize() / 10.0); + else +- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0); ++ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = cstyle.font().underlinePos(cstyle.fontSize() / 10.0); +- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0); ++ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0)); + } + if (cstyle.baselineOffset() != 0) + Upos += (cstyle.fontSize() / 10.0) * glyphs.scaleV * (cstyle.baselineOffset() / 1000.0); +@@ -3924,12 +3924,12 @@ void PSLib::setTextCh(ScribusDoc* Doc, P + if (cstyle.strikethruWidth() != -1) + lw = (cstyle.strikethruWidth() / 1000.0) * (cstyle.fontSize() / 10.0); + else +- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0); ++ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0)); + } + else + { + Upos = cstyle.font().strikeoutPos(cstyle.fontSize() / 10.0); +- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0); ++ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0)); + } + if (cstyle.baselineOffset() != 0) + Upos += (cstyle.fontSize() / 10.0) * glyphs.scaleV * (cstyle.baselineOffset() / 1000.0); +--- a/scribus/scpageoutput.cpp ++++ b/scribus/scpageoutput.cpp +@@ -551,12 +551,12 @@ void ScPageOutput::drawGlyphs(PageItem* + if (style.underlineWidth() != -1) + lw = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + st = style.font().underlinePos(style.fontSize() / 10.0); +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0); +@@ -638,12 +638,12 @@ void ScPageOutput::drawGlyphs(PageItem* + if (style.strikethruWidth() != -1) + lw = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0); + else +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + else + { + st = style.font().strikeoutPos(style.fontSize() / 10.0); +- lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); ++ lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); + } + if (style.baselineOffset() != 0) + st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0); +--- a/scribus/scpainter.cpp ++++ b/scribus/scpainter.cpp +@@ -941,7 +941,7 @@ void ScPainter::drawVPath( int mode ) + cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_WINDING); + if (fillMode == 1) + { +- double r, g, b; ++ qreal r, g, b; + m_fill.getRgbF(&r, &g, &b); + cairo_set_source_rgba( m_cr, r, g, b, fill_trans ); + // if (fill_trans != 1.0) +@@ -979,7 +979,7 @@ void ScPainter::drawVPath( int mode ) + vneu = 255 - ((255 - v) * shad / 100); + qStopColor.setHsv(h, sneu, vneu); + double a = colorStops[offset]->opacity; +- double r, g, b; ++ qreal r, g, b; + qStopColor.getRgbF(&r, &g, &b); + cairo_pattern_add_color_stop_rgba (pat, rampPoint, r, g, b, a); + lastPoint = rampPoint; +@@ -1024,7 +1024,7 @@ void ScPainter::drawVPath( int mode ) + cairo_set_dash( m_cr, m_array.data(), m_array.count(), m_offset); + else + cairo_set_dash( m_cr, NULL, 0, 0 ); +- double r, g, b; ++ qreal r, g, b; + m_stroke.getRgbF(&r, &g, &b); + cairo_set_source_rgba( m_cr, r, g, b, stroke_trans ); + // if (stroke_trans != 1.0) +@@ -1348,7 +1348,7 @@ void ScPainter::drawText(QRectF area, QS + double y; + double ww = 0; + double hh = 0; +- double r, g, b; ++ qreal r, g, b; + cairo_select_font_face(m_cr, m_font.family().toLatin1(), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + cairo_set_font_size(m_cr, m_font.pointSizeF()); + cairo_font_extents (m_cr, &extentsF); +--- a/scribus/scribusview.cpp ++++ b/scribus/scribusview.cpp +@@ -4109,12 +4109,12 @@ void ScribusView::TextToPath() + if (charStyle.underlineWidth() != -1) + Uwid = (charStyle.underlineWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + else + { + Upos = charStyle.font().underlinePos(charStyle.fontSize() / 10.0); +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + if (charStyle.baselineOffset() != 0) + Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0); +@@ -4249,12 +4249,12 @@ void ScribusView::TextToPath() + if (charStyle.strikethruWidth() != -1) + Uwid = (charStyle.strikethruWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + else + { + Upos = charStyle.font().strikeoutPos(charStyle.fontSize() / 10.0); +- Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + if (charStyle.baselineOffset() != 0) + Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0); +@@ -4339,12 +4339,12 @@ void ScribusView::TextToPath() + if (charStyle.underlineWidth() != -1) + lw = (charStyle.underlineWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + else + { + st = charStyle.font().underlinePos(charStyle.fontSize() / 10.0); +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + if (charStyle.baselineOffset() != 0) + st += (charStyle.fontSize() / 10.0) * hl->glyph.scaleV * (charStyle.baselineOffset() / 1000.0); +@@ -4523,12 +4523,12 @@ void ScribusView::TextToPath() + if (charStyle.strikethruWidth() != -1) + lw = (charStyle.strikethruWidth() / 1000.0) * (charStyle.fontSize() / 10.0); + else +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + else + { + st = charStyle.font().strikeoutPos(charStyle.fontSize() / 10.0); +- lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); ++ lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); + } + if (charStyle.baselineOffset() != 0) + st += (charStyle.fontSize() / 10.0) * hl->glyph.scaleV * (charStyle.baselineOffset() / 1000.0); +--- a/scribus/selection.cpp ++++ b/scribus/selection.cpp +@@ -447,10 +447,10 @@ void Selection::setGroupRect() + QRectF itRect(currItem->getVisualBoundingRect()); + // for (uint pc = 0; pc < 4; ++pc) + { +- vminx = qMin(vminx, itRect.x()); +- vminy = qMin(vminy, itRect.y()); +- vmaxx = qMax(vmaxx, itRect.right()); +- vmaxy = qMax(vmaxy, itRect.bottom()); ++ vminx = qMin(vminx, (double)itRect.x()); ++ vminy = qMin(vminy, (double)itRect.y()); ++ vmaxx = qMax(vmaxx, (double)itRect.right()); ++ vmaxy = qMax(vmaxy, (double)itRect.bottom()); + } + } + else +--- a/scribus/smlinestyle.cpp ++++ b/scribus/smlinestyle.cpp +@@ -729,7 +729,7 @@ void SMLineStyle::updatePreview() + for (int it = (*tmpLine).size()-1; it > -1; it--) + { + QPen pen; +- QVector<double> m_array; ++ QVector<qreal> m_array; + if ((*tmpLine)[it].Dash == 1) + pen.setStyle(Qt::SolidLine); + else +--- a/scribus/ui/modetoolbar.cpp ++++ b/scribus/ui/modetoolbar.cpp +@@ -101,7 +101,7 @@ void ModeToolBar::SelShape(int s, int c, + // insertShapeButtonMenu->hide(); + SubMode = s; + ValCount = c; +- ShapeVals = vals; ++ ShapeVals = (double*)vals; + m_ScMW->scrActions["toolsInsertShape"]->setChecked(false); + m_ScMW->scrActions["toolsInsertShape"]->setChecked(true); + } diff -Nru scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/fixes_cups1.5.patch scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/fixes_cups1.5.patch --- scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/fixes_cups1.5.patch 1970-01-01 01:00:00.000000000 +0100 +++ scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/fixes_cups1.5.patch 2011-09-11 22:09:23.000000000 +0200 @@ -0,0 +1,24 @@ +From: Ana Guerrero <a...@debian.org> +Bug-Debian: http://bugs.debian.org/639031 +Subject: fixes with cups 1.5 + +--- a/scribus/cupsoptions.cpp ++++ b/scribus/cupsoptions.cpp +@@ -42,6 +42,7 @@ for which a new license (GPL+exception) + #include "scconfig.h" + #ifdef HAVE_CUPS + #include <cups/cups.h> ++#include <cups/ppd.h> + #endif + #include "util_icon.h" + +--- a/scribus/util_printer.cpp ++++ b/scribus/util_printer.cpp +@@ -9,6 +9,7 @@ for which a new license (GPL+exception) + + #if defined( HAVE_CUPS ) + #include <cups/cups.h> ++ #include <cups/ppd.h> + #elif defined(_WIN32) + #include <windows.h> + #include <winspool.h> diff -Nru scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/series scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/series --- scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/series 2011-04-01 20:39:51.000000000 +0200 +++ scribus-1.4.0.dfsg~rc3+svn20110401/debian/patches/series 2011-09-11 22:08:19.000000000 +0200 @@ -1,3 +1,5 @@ scribus_CMakeLists.patch profiles_CMakeLists.patch top_CMakeLists.txt +0001-qreal-double-fixes.patch +fixes_cups1.5.patch
