Add a patch to fix graphviz display of call graphs, thanks to Albert Astals Cid for the it.

(Portage version: 2.1.2-r7)

2 files changed, 68 insertions, 0 deletions

diff --git a/kde-base/kcachegrind/files/digest-kcachegrind-3.5.6-r1 b/kde-base/kcachegrind/files/digest-kcachegrind-3.5.6-r1
new file mode 100644
index 000000000000..e3795607e98a
--- /dev/null
+++ b/kde-base/kcachegrind/files/digest-kcachegrind-3.5.6-r1
@@ -0,0 +1,3 @@
+MD5 1462e1a884fdaa070ed493c10a336728 kdesdk-3.5.6.tar.bz2 5046602
+RMD160 96e96a0ca87aadf8940ceb1dfead385503096a4f kdesdk-3.5.6.tar.bz2 5046602
+SHA256 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4 kdesdk-3.5.6.tar.bz2 5046602
diff --git a/kde-base/kcachegrind/files/kcachegrind-3.5.6-graphviz-fix.patch b/kde-base/kcachegrind/files/kcachegrind-3.5.6-graphviz-fix.patch
new file mode 100644
index 000000000000..19d310a79ac9
--- /dev/null
+++ b/kde-base/kcachegrind/files/kcachegrind-3.5.6-graphviz-fix.patch
@@ -0,0 +1,65 @@
+Index: kdesdk/kcachegrind/kcachegrind/callgraphview.cpp
+===================================================================
+--- kdesdk/kcachegrind/kcachegrind/callgraphview.cpp	(revision 629874)
++++ kdesdk/kcachegrind/kcachegrind/callgraphview.cpp	(revision 629875)
+@@ -1922,7 +1922,10 @@
+     if (cmd == "stop") break;
+ 
+     if (cmd == "graph") {
+-      lineStream >> scale >> dotWidth >> dotHeight;
++      QString dotWidthString, dotHeightString;
++      lineStream >> scale >> dotWidthString >> dotHeightString;
++      dotWidth = dotWidthString.toDouble();
++      dotHeight = dotHeightString.toDouble();
+ 
+       if (_detailLevel == 0)      { scaleX = scale * 70; scaleY = scale * 40; }
+       else if (_detailLevel == 1) { scaleX = scale * 80; scaleY = scale * 70; }
+@@ -1970,11 +1973,14 @@
+ 
+     if (cmd == "node") {
+       // x, y are centered in node
+-      QString nodeName, label;
++      QString nodeName, label, nodeX, nodeY, nodeWidth, nodeHeight;
+       double x, y, width, height;
+-      lineStream >> nodeName >> x >> y >> width >> height;
++      lineStream >> nodeName >> nodeX >> nodeY >> nodeWidth >> nodeHeight;
++      x = nodeX.toDouble();
++      y = nodeY.toDouble();
++      width = nodeWidth.toDouble();
++      height = nodeHeight.toDouble();
+ 
+-
+       GraphNode* n = _exporter.node(_exporter.toFunc(nodeName));
+ 
+       int xx = (int)(scaleX * x + _xMargin);
+@@ -2026,7 +2032,7 @@
+ 
+     // edge
+ 
+-    QString node1Name, node2Name, label;
++    QString node1Name, node2Name, label, edgeX, edgeY;
+     double x, y;
+     QPointArray pa;
+     int points, i;
+@@ -2049,7 +2055,9 @@
+     pa.resize(points);
+     for (i=0;i<points;i++) {
+       if (lineStream.atEnd()) break;
+-      lineStream >> x >> y;
++      lineStream >> edgeX >> edgeY;
++      x = edgeX.toDouble();
++      y = edgeY.toDouble();
+ 
+       int xx = (int)(scaleX * x + _xMargin);
+       int yy = (int)(scaleY * (dotHeight - y) + _yMargin);
+@@ -2160,7 +2168,9 @@
+         lineStream >> c;
+       }
+     }
+-    lineStream >> x >> y;
++    lineStream >> edgeX >> edgeY;
++    x = edgeX.toDouble();
++    y = edgeY.toDouble();
+ 
+     int xx = (int)(scaleX * x + _xMargin);
+     int yy = (int)(scaleY * (dotHeight - y) + _yMargin);