CVS commit: pkgsrc/devel/umbrello

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 03:36:51 UTC 2016

Modified Files:
        pkgsrc/devel/umbrello: distinfo
Added Files:
        pkgsrc/devel/umbrello/patches:
            patch-umbrello_widgets_associationline.cpp
            patch-umbrello_widgets_associationwidget.cpp

Log Message:
Fix build with gcc6


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/umbrello/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationline.cpp
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationwidget.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/umbrello/distinfo
diff -u pkgsrc/devel/umbrello/distinfo:1.9 pkgsrc/devel/umbrello/distinfo:1.10
--- pkgsrc/devel/umbrello/distinfo:1.9  Tue Nov  3 03:29:37 2015
+++ pkgsrc/devel/umbrello/distinfo      Sat Jul 16 03:36:51 2016
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 03:29:37 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/07/16 03:36:51 markd Exp $
 
 SHA1 (umbrello-4.14.3.tar.xz) = e963fbe9c024948784e37a83ae456965512ef3bc
 RMD160 (umbrello-4.14.3.tar.xz) = 20db4af85399cd3cacf3dc1f17b1088d203a3f66
 SHA512 (umbrello-4.14.3.tar.xz) = c7510d7411a8c615cb54c5df30688edcb8bccbec07762503a11dbac9eeffffc7e7ecad492d5830ab93f291eab1aa327671a692c7ffa4c72b03bc108b1c38c447
 Size (umbrello-4.14.3.tar.xz) = 1508536 bytes
+SHA1 (patch-umbrello_widgets_associationline.cpp) = a332ff632675ce223a9227f3d58c1aaf580f5206
+SHA1 (patch-umbrello_widgets_associationwidget.cpp) = 2682453288b5d863229053a4ae10876c860ff705

Added files:

Index: pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationline.cpp
diff -u /dev/null pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationline.cpp:1.1
--- /dev/null   Sat Jul 16 03:36:51 2016
+++ pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationline.cpp    Sat Jul 16 03:36:51 2016
@@ -0,0 +1,17 @@
+$NetBSD: patch-umbrello_widgets_associationline.cpp,v 1.1 2016/07/16 03:36:51 markd Exp $
+
+make gcc6 happy
+
+--- umbrello/widgets/associationline.cpp.orig  2014-11-04 06:47:37.000000000 +0000
++++ umbrello/widgets/associationline.cpp
+@@ -859,8 +859,8 @@ QPainterPath AssociationLine::createOrth
+     if (points.size() > 1) {
+         QPointF start  = points.first();
+         QPointF end    = points.last();
+-        qreal deltaX = abs(start.x() - end.x());
+-        qreal deltaY = abs(start.y() - end.y());
++        qreal deltaX = std::abs(start.x() - end.x());
++        qreal deltaY = std::abs(start.y() - end.y());
+         // DEBUG("AssociationLine") << "start=" << start << " / end=" << end
+         //               << " / deltaX=" << deltaX << " / deltaY=" << deltaY;
+         QVector<QPointF> vector;

Index: pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationwidget.cpp
diff -u /dev/null pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationwidget.cpp:1.3
--- /dev/null   Sat Jul 16 03:36:51 2016
+++ pkgsrc/devel/umbrello/patches/patch-umbrello_widgets_associationwidget.cpp  Sat Jul 16 03:36:51 2016
@@ -0,0 +1,29 @@
+$NetBSD: patch-umbrello_widgets_associationwidget.cpp,v 1.3 2016/07/16 03:36:51 markd Exp $
+
+make gcc6 happy
+
+--- umbrello/widgets/associationwidget.cpp.orig        2014-11-04 06:47:37.000000000 +0000
++++ umbrello/widgets/associationwidget.cpp
+@@ -2118,9 +2118,9 @@ void AssociationWidget::updatePointsExce
+     p1.setX(xmil + (xfin - xmil)*1/2); p1.setY(ymil + (yfin - ymil)*1/3);
+     p2.setX(xmil - (xmil - xdeb)*1/2); p2.setY(ymil - (ymil - ydeb)*1/3);
+ 
+-    if (abs(p1.x() - p2.x()) <= 10)
++    if (std::abs(p1.x() - p2.x()) <= 10)
+         ESPACEX = 15;
+-    if (abs(p1.y() - p2.y()) <= 10)
++    if (std::abs(p1.y() - p2.y()) <= 10)
+         ESPACEY = 15;
+ 
+     m_associationLine->setEndPoints(QPointF(xdeb, ydeb), QPointF(xfin, yfin));
+@@ -2688,8 +2688,8 @@ void AssociationWidget::constrainTextPos
+         r = textWidth;
+     // swap textCenter{X,Y} to convert from Qt coord.system.
+     const QPointF origTextCenter(textCenterY, textCenterX);
+-    const int relX = abs(origTextCenter.x() - midP.x());
+-    const int relY = abs(origTextCenter.y() - midP.y());
++    const int relX = std::abs(origTextCenter.x() - midP.x());
++    const int relY = std::abs(origTextCenter.y() - midP.y());
+     const double negativeWhenInsideCircle = relX * relX + relY * relY - r * r;
+     if (negativeWhenInsideCircle <= 0.0) {
+         return;