Hi,
I added old patch. I add new patch to this mail.
Best regards,
Nobuhiro
2011/8/30 Nobuhiro Iwamatsu iwama...@nigauri.org:
Source: fritzing
Version: 0.6.3b-2
Severity: wishlist
Tags: patch
User: debian-...@superh.org
Usertags: sh4
Justification: FTBFS
User: debian-...@lists.debian.org
Usertags: eabi
X-Debbugs-CC: debian-sup...@lists.debian.org
Hi,
fritzing FTBFS on armel and sh4. Probably this will FTBFS in armhf.
armel:
https://buildd.debian.org/status/fetch.php?pkg=fritzingarch=armelver=0.6.3b-2stamp=1314423039
sh4:
http://buildd.debian-ports.org/status/fetch.php?pkg=fritzingarch=sh4ver=0.6.3b-2stamp=1314462968
-
/usr/include/qt4/QtCore/qstring.h: At global scope:
/usr/include/qt4/QtCore/qstring.h:187:17: note: the mangling of
'va_list' has changed in GCC 4.4
g++ -c -pipe -g -O2 -g -O2 -Wall -Wall -W -D_REENTRANT -DQT_WEBKIT
-DLINUX_32 -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_SQL_LIB -DQT_XML_LIB
-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore
-I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui
-I/usr/include/qt4/QtXml -I/usr/include/qt4/QtSql
-I/usr/include/qt4/QtSvg -I/usr/include/qt4 -Isrc/lib/boost_1_43_0
-Irelease -o release/graphicsflowlayout.o
src/partsbinpalette/graphicsflowlayout.cpp
src/partsbinpalette/graphicsflowlayout.cpp: In member function 'int
GraphicsFlowLayout::doLayout(const QRectF)':
src/partsbinpalette/graphicsflowlayout.cpp:83:63: error: no matching
function for call to 'qMax(double, qreal)'
src/partsbinpalette/graphicsflowlayout.cpp:83:63: note: candidate is:
/usr/include/qt4/QtCore/qglobal.h:1116:17: note: templateclass T
const T qMax(const T, const T)
make[2]: *** [release/graphicsflowlayout.o] Error 1
make[2]: Leaving directory
`/build/buildd-fritzing_0.6.3b-2-armel-ctm7HT/fritzing-0.6.3b'
make[1]: *** [release] Error 2
-
I made a patch which revised this problem.
Could you apply this patch?
Best regards,
Nobuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
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(QListPathUnit * fullPath, QListWire * 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,7 @@ int GraphicsFlowLayout::doLayout(const QRectF rect) {
item-setGeometry(QRectF(QPoint(x, y), item-preferredSize()));
x = nextX;
- lineHeight = qMax(lineHeight, item-preferredSize().height());
+ lineHeight = qMax(qreal(lineHeight), item-preferredSize().height());
}
m_lastWidth = rect.width();
