Avoid "error: call of overloaded <func> is ambiguous".

3 files changed, 40 insertions, 4 deletions

diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index ef966a2f891..257fd73a3ad 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2013/04/30 22:34:29 joerg Exp $
+$NetBSD: distinfo,v 1.40 2014/09/24 14:33:28 jperkin Exp $
 
 SHA1 (kdesdk-3.5.10.tar.bz2) = 1a6702e8e7741690496327b8a908fabdab5d3c79
 RMD160 (kdesdk-3.5.10.tar.bz2) = 28a296667d66021c3b13c1991e1028d5e8554dfd
@@ -7,8 +7,9 @@ SHA1 (patch-aa) = ab73e4306efb33344012f95c059ea0ed0adfafd1
 SHA1 (patch-ab) = 436454d5f54cdf783a5a1cb3d70a2e8398695f60
 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307
 SHA1 (patch-ad) = 5ae3bd5af9b76d7824d166109352bb8916c946f7
-SHA1 (patch-ae) = 1f9373975df35f3249779e18d90005b7a016e5cb
+SHA1 (patch-ae) = b2130d7f1a0dedd010d0dbbfcc43da7070ca9d61
 SHA1 (patch-kbabel_common_libgettext_pofiles.ll) = 996701f1bef3beb87c5a264a079488abcede91cd
 SHA1 (patch-kbabel_kbabel_kbcataloglistviewitem.cpp) = 8a4f0d7966ef815241e304247f456c6c2cb504fc
 SHA1 (patch-poxml_antlr_antlr_CharScanner.hpp) = bac4a7a4914f85bb4f6e2137d574970a76ad7682
 SHA1 (patch-poxml_antlr_src_BitSet.cpp) = e9334768ef2b4513013f5e3a4f74b140c58e74a6
+SHA1 (patch-umbrello_umbrello_associationwidget.cpp) = 2163bbf7e157042bd840c6634b8ba1250d39b2e8
diff --git a/devel/kdesdk3/patches/patch-ae b/devel/kdesdk3/patches/patch-ae
index 82323747c8d..2cdbe663196 100644
--- a/devel/kdesdk3/patches/patch-ae
+++ b/devel/kdesdk3/patches/patch-ae
@@ -1,6 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2010/06/02 12:26:13 adam Exp $
+$NetBSD: patch-ae,v 1.6 2014/09/24 14:33:28 jperkin Exp $
 
---- kbabel/kbabeldict/modules/dbsearchengine/database.cpp.orig	2010-06-01 14:22:58.000000000 +0000
+Avoid "error: call of overloaded <func> is ambiguous".
+
+--- kbabel/kbabeldict/modules/dbsearchengine/database.cpp.orig	2005-09-10 08:20:53.000000000 +0000
 +++ kbabel/kbabeldict/modules/dbsearchengine/database.cpp
 @@ -341,9 +341,7 @@ DataBaseManager::openDataBase ()
      db_create (&indexDb, 0, 0);
@@ -118,3 +120,12 @@ $NetBSD: patch-ae,v 1.5 2010/06/02 12:26:13 adam Exp $
      nrec = stat->bt_nkeys;
      free (stat);
  
+@@ -1169,7 +1142,7 @@ DataBaseManager::addLocation (QString wo
+ 		else
+ 		  {
+ 		      step =
+-			  (abs (d[loc] - location) * num) / totalrecord + 1;
++			  (abs ((int)d[loc] - (int)location) * num) / totalrecord + 1;
+ 
+ 		  }
+ 
diff --git a/devel/kdesdk3/patches/patch-umbrello_umbrello_associationwidget.cpp b/devel/kdesdk3/patches/patch-umbrello_umbrello_associationwidget.cpp
new file mode 100644
index 00000000000..f1d10a81404
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-umbrello_umbrello_associationwidget.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-umbrello_umbrello_associationwidget.cpp,v 1.1 2014/09/24 14:33:28 jperkin Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous".
+
+--- umbrello/umbrello/associationwidget.cpp.orig	2007-10-08 09:49:29.000000000 +0000
++++ umbrello/umbrello/associationwidget.cpp
+@@ -1713,7 +1713,7 @@ float AssociationWidget::perpendicularPr
+         sx = (b2 - b1) / (slope1 - slope2);
+         sy = slope1*sx + b1;
+     }
+-    distance = (int)( sqrt( ((x3 - sx)*(x3 - sx)) + ((y3 - sy)*(y3 - sy)) ) );
++    distance = (int)( sqrt((double) ((x3 - sx)*(x3 - sx)) + ((y3 - sy)*(y3 - sy)) ) );
+ 
+     ResultingPoint.setX( (int)sy );
+     ResultingPoint.setY( (int)sx );
+@@ -1893,7 +1893,7 @@ void AssociationWidget::constrainTextPos
+     const int y0 = p0.y();
+     const int x1 = p1.x();
+     const int y1 = p1.y();
+-    double r = sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2;
++    double r = sqrt((double)(x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2;
+     if (textWidth > r)
+         r = textWidth;
+     // swap textCenter{X,Y} to convert from Qt coord.system.