From: Diego Elio Pettenò Date: Sat, 3 Feb 2007 23:57:06 +0000 (+0000) Subject: Add a patch to fix graphviz display of call graphs, thanks to Albert Astals Cid for... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8bf495ebdbb32af6a6a115215171847059e065c3;p=gentoo.git Add a patch to fix graphviz display of call graphs, thanks to Albert Astals Cid for the it. Package-Manager: portage-2.1.2-r7 --- diff --git a/kde-base/kcachegrind/ChangeLog b/kde-base/kcachegrind/ChangeLog index df5a8a3e4b6a..cabd1e53f4ec 100644 --- a/kde-base/kcachegrind/ChangeLog +++ b/kde-base/kcachegrind/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kcachegrind # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.55 2007/01/16 19:39:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.56 2007/02/03 23:57:06 flameeyes Exp $ + +*kcachegrind-3.5.6-r1 (03 Feb 2007) + + 03 Feb 2007; Diego Pettenò + +files/kcachegrind-3.5.6-graphviz-fix.patch, +kcachegrind-3.5.6-r1.ebuild: + Add a patch to fix graphviz display of call graphs, thanks to Albert Astals + Cid for the it. *kcachegrind-3.5.6 (16 Jan 2007) diff --git a/kde-base/kcachegrind/Manifest b/kde-base/kcachegrind/Manifest index 841448864034..8ffd787c4a66 100644 --- a/kde-base/kcachegrind/Manifest +++ b/kde-base/kcachegrind/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX kcachegrind-3.5.6-graphviz-fix.patch 2209 RMD160 ac4ea3cec7133cdfc8c9db706ee474ef9313e2e6 SHA1 db45883e8feefafd7d4cfc774966d1df8e3bd65e SHA256 ec3edcba8ed8d31e320bd3f6d47ed7d4006b2b76336e64f27edf679332298452 +MD5 6dc29325a24833d7b6bc372f983dc629 files/kcachegrind-3.5.6-graphviz-fix.patch 2209 +RMD160 ac4ea3cec7133cdfc8c9db706ee474ef9313e2e6 files/kcachegrind-3.5.6-graphviz-fix.patch 2209 +SHA256 ec3edcba8ed8d31e320bd3f6d47ed7d4006b2b76336e64f27edf679332298452 files/kcachegrind-3.5.6-graphviz-fix.patch 2209 DIST kdesdk-3.5.2.tar.bz2 4877103 RMD160 ac15ff6e6b10b19ce2197b9fd7848453acdfc1a5 SHA1 463975860e7881f2d67c20ec2f5f2e34858e5966 SHA256 a6d4d8177fceb225de328a0f71852baa9a591754fb403678b6c3f1c1283a50fd DIST kdesdk-3.5.5.tar.bz2 5043560 RMD160 6151d938607bdd31f69ab1ca78ec7aec7bb14187 SHA1 0994e8eef41ab4e0237a78f1c761d7133998a712 SHA256 fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd DIST kdesdk-3.5.6.tar.bz2 5046602 RMD160 96e96a0ca87aadf8940ceb1dfead385503096a4f SHA1 5c1f3478b72fde8b117d9458072d471eb8be5cbe SHA256 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4 @@ -12,14 +16,18 @@ EBUILD kcachegrind-3.5.5.ebuild 518 RMD160 a32a93440d3680705bd5441e1ab43c5fd6462 MD5 47ace96a8b8ed6c0adc1386540622e57 kcachegrind-3.5.5.ebuild 518 RMD160 a32a93440d3680705bd5441e1ab43c5fd6462a53 kcachegrind-3.5.5.ebuild 518 SHA256 93d33e80c3696703370d07ae7da048a72d4758e9ecf3939b488bac0481756320 kcachegrind-3.5.5.ebuild 518 +EBUILD kcachegrind-3.5.6-r1.ebuild 615 RMD160 4c3d8c384a40d0d05f7deddbe0fbcc3fb3d6f23e SHA1 137eb7acc058c09cf16f98e49a01f27275d75f71 SHA256 11e249a1d5ff156090a46007cb8eaae51dfe5c97a3dcc5e9ec1ac20a9b0b21ef +MD5 6bdb52a235f572e544bb712415a35718 kcachegrind-3.5.6-r1.ebuild 615 +RMD160 4c3d8c384a40d0d05f7deddbe0fbcc3fb3d6f23e kcachegrind-3.5.6-r1.ebuild 615 +SHA256 11e249a1d5ff156090a46007cb8eaae51dfe5c97a3dcc5e9ec1ac20a9b0b21ef kcachegrind-3.5.6-r1.ebuild 615 EBUILD kcachegrind-3.5.6.ebuild 527 RMD160 ba6348fb34f6a7bc4dbd0c8d4a847e9e825887f7 SHA1 32f1b4d083ee7903d56fa3d501e067bcf80bb948 SHA256 681eb4b55bace00d60046d400a2db42a8c96f1b9ea92e7e1f7bd675eaf43639d MD5 0afde6f88f3fcdb86fc5c0ebba0c6b7d kcachegrind-3.5.6.ebuild 527 RMD160 ba6348fb34f6a7bc4dbd0c8d4a847e9e825887f7 kcachegrind-3.5.6.ebuild 527 SHA256 681eb4b55bace00d60046d400a2db42a8c96f1b9ea92e7e1f7bd675eaf43639d kcachegrind-3.5.6.ebuild 527 -MISC ChangeLog 7430 RMD160 99794421da035b994139bff72077ebfeb71ff80d SHA1 06868179101d299df77e18e04facc1c21ccf3639 SHA256 1bf2ca74b57509622ef83f5d0a9e1ddcd807170fc4d67739c3deb98521901779 -MD5 974db1496bfaf13859292792a6f7f7c6 ChangeLog 7430 -RMD160 99794421da035b994139bff72077ebfeb71ff80d ChangeLog 7430 -SHA256 1bf2ca74b57509622ef83f5d0a9e1ddcd807170fc4d67739c3deb98521901779 ChangeLog 7430 +MISC ChangeLog 7694 RMD160 dd544d37541a9d9de20e1314d812895d159aac3a SHA1 8be852eaf0ed0818e428ff45b68afcbe9a52932a SHA256 a313da8d6fbac1ca47349cd7c7efc4c3becf84ad44e69eaf83f90978b472341b +MD5 c03b358ac57a966a2b3c53561db18369 ChangeLog 7694 +RMD160 dd544d37541a9d9de20e1314d812895d159aac3a ChangeLog 7694 +SHA256 a313da8d6fbac1ca47349cd7c7efc4c3becf84ad44e69eaf83f90978b472341b ChangeLog 7694 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -33,10 +41,13 @@ SHA256 c3589de6f3695aa67f01c94883d3e032fa317a84e263e44ac72754fce964cffb files/di MD5 03dee6283bcdfcb198808ac3bca4e6ac files/digest-kcachegrind-3.5.6 244 RMD160 205bed8e8f34fea07c7af6ae4026b2c252109d56 files/digest-kcachegrind-3.5.6 244 SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/digest-kcachegrind-3.5.6 244 +MD5 03dee6283bcdfcb198808ac3bca4e6ac files/digest-kcachegrind-3.5.6-r1 244 +RMD160 205bed8e8f34fea07c7af6ae4026b2c252109d56 files/digest-kcachegrind-3.5.6-r1 244 +SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/digest-kcachegrind-3.5.6-r1 244 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFrSnrAiZjviIA2XgRAsumAKCIk0soCloyOXMYh45UxlxJWMctnACfQs/h -XKTNEJ8w5kRVjJptOk9Mw6k= -=k1kI +iD8DBQFFxSFaAiZjviIA2XgRAq9HAJ0eCn4Q4bz1AzK99ggNX0YnHBnIyQCghJSR +OCUNAEbwYe9MRGMw/AKzyZ8= +=jGhP -----END PGP SIGNATURE----- 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> 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); diff --git a/kde-base/kcachegrind/kcachegrind-3.5.6-r1.ebuild b/kde-base/kcachegrind/kcachegrind-3.5.6-r1.ebuild new file mode 100644 index 000000000000..3fa309f92841 --- /dev/null +++ b/kde-base/kcachegrind/kcachegrind-3.5.6-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.5.6-r1.ebuild,v 1.1 2007/02/03 23:57:06 flameeyes Exp $ + +KMNAME=kdesdk +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="KDE Frontend for Cachegrind" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="kdehiddenvisibility" + +DEPEND="x86? ( >=dev-util/valgrind-3.2.0 ) + amd64? ( >=dev-util/valgrind-3.2.0 )" + +RDEPEND="${DEPEND} + media-gfx/graphviz" + +PATCHES="${FILESDIR}/${P}-graphviz-fix.patch"