tags 639771 + pending thanks Dear maintainer,
I've prepared an NMU for fritzing (versioned as 0.6.3b+dfsg-3.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. Konstantinos
diff -Nru fritzing-0.6.3b+dfsg/debian/changelog fritzing-0.6.3b+dfsg/debian/changelog --- fritzing-0.6.3b+dfsg/debian/changelog 2011-08-30 22:56:51.000000000 +0000 +++ fritzing-0.6.3b+dfsg/debian/changelog 2012-02-02 23:50:37.000000000 +0000 @@ -1,3 +1,10 @@ +fritzing (0.6.3b+dfsg-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Apply the correct patch this time by Nobuhiro. (Closes: #639771) + + -- Konstantinos Margaritis <[email protected]> Thu, 02 Feb 2012 23:49:21 +0200 + fritzing (0.6.3b+dfsg-3) unstable; urgency=low * Removed redundant build-dependencies. diff -Nru fritzing-0.6.3b+dfsg/debian/patches/ftbfs_fix_for_armel_sh4.patch fritzing-0.6.3b+dfsg/debian/patches/ftbfs_fix_for_armel_sh4.patch --- fritzing-0.6.3b+dfsg/debian/patches/ftbfs_fix_for_armel_sh4.patch 2011-08-30 22:48:56.000000000 +0000 +++ fritzing-0.6.3b+dfsg/debian/patches/ftbfs_fix_for_armel_sh4.patch 2012-02-02 23:48:44.000000000 +0000 @@ -1,14 +1,40 @@ -fritzing FTBFS on armel and sh4 due a non matching fuction in -graphicsflowlayout. +diff --git a/src/autoroute/cmrouter/cmrouter.cpp b/src/autoroute/cmrouter/cmrouter.cpp +index 21b4a3f..76c4681 100644 +--- a/src/autoroute/cmrouter/cmrouter.cpp ++++ b/src/autoroute/cmrouter/cmrouter.cpp +@@ -1747,14 +1747,14 @@ void CMRouter::hookUpWires(QList<PathUnit *> & fullPath, QList<Wire *> & wires) + viewLayerIDs.insert(w->viewLayerID()); + QPointF p1 = w->pos(); + QPointF p2 = w->line().p2() + p1; +- l = qMin(p1.x(), l); +- r = qMax(p1.x(), r); +- l = qMin(p2.x(), l); +- r = qMax(p2.x(), r); +- t = qMin(p1.y(), t); +- b = qMax(p1.y(), b); +- t = qMin(p2.y(), t); +- b = qMax(p2.y(), b); ++ l = qMin(p1.x(), qreal(l)); ++ r = qMax(p1.x(), qreal(r)); ++ l = qMin(p2.x(), qreal(l)); ++ r = qMax(p2.x(), qreal(r)); ++ t = qMin(p1.y(), qreal(t)); ++ b = qMax(p1.y(), qreal(b)); ++ t = qMin(p2.y(), qreal(t)); ++ b = qMax(p2.y(), qreal(b)); + } + + TileRect searchRect; +diff --git a/src/partsbinpalette/graphicsflowlayout.cpp b/src/partsbinpalette/graphicsflowlayout.cpp +index b93fa41..c22a92b 100644 --- a/src/partsbinpalette/graphicsflowlayout.cpp +++ b/src/partsbinpalette/graphicsflowlayout.cpp -@@ -80,7 +80,8 @@ +@@ -80,7 +80,7 @@ int GraphicsFlowLayout::doLayout(const QRectF &rect) { item->setGeometry(QRectF(QPoint(x, y), item->preferredSize())); x = nextX; - lineHeight = qMax(lineHeight, item->preferredSize().height()); -+ // item->preferredSize().height() returns qreal, armel compiler complains -+ lineHeight = qMax(lineHeight, (double) item->preferredSize().height()); ++ lineHeight = qMax(qreal(lineHeight), item->preferredSize().height()); } m_lastWidth = rect.width();
