1 |
commit: 6888cd5aaed97419b5881d67f540dd19f819ce0b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 10 18:39:13 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 10 18:39:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6888cd5a |
7 |
|
8 |
dev-libs/kdiagram: Drop 2.6.1-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-libs/kdiagram/Manifest | 1 - |
14 |
.../files/kdiagram-2.6.1-fix-horizontal-bars.patch | 75 ---------------------- |
15 |
dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild | 38 ----------- |
16 |
3 files changed, 114 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest |
19 |
index e0ae9fbccd0..00956ee7237 100644 |
20 |
--- a/dev-libs/kdiagram/Manifest |
21 |
+++ b/dev-libs/kdiagram/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128 |
24 |
DIST kdiagram-2.6.3.tar.xz 673788 BLAKE2B 467c376a2979e5a8b0c33b014f0490819f9fafca7a87fa95e44c073d166424f84d82771c787995eba05b97c6c8949270cc7101342eb3a2a91ed92d89d2ddc0a9 SHA512 307b0b17c314d5c4672100e2e949c3e8faf38eee7f9d504a15a01da77434e2b6274cb1857d36ea868025499e806643e32c27bb87aa7dfbce36e8dec6e53b11ef |
25 |
DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d |
26 |
|
27 |
diff --git a/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch b/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch |
28 |
deleted file mode 100644 |
29 |
index fae29982773..00000000000 |
30 |
--- a/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch |
31 |
+++ /dev/null |
32 |
@@ -1,75 +0,0 @@ |
33 |
-From d3783f643367b264800e853c7c55c515f17c2a3d Mon Sep 17 00:00:00 2001 |
34 |
-From: Dag Andersen <danders@×××××××.dk> |
35 |
-Date: Thu, 23 Aug 2018 10:47:05 +0200 |
36 |
-Subject: Fix painting bar diagrams with horizontal bars |
37 |
- |
38 |
---- |
39 |
- .../Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp | 5 +++-- |
40 |
- .../Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp | 4 ++-- |
41 |
- .../Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp | 4 ++-- |
42 |
- 3 files changed, 7 insertions(+), 6 deletions(-) |
43 |
- |
44 |
-diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp |
45 |
-index 0a262ee..d2343ee 100644 |
46 |
---- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp |
47 |
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp |
48 |
-@@ -158,13 +158,13 @@ void NormalLyingBarDiagram::paint( PaintContext* ctx ) |
49 |
- } |
50 |
- } |
51 |
- |
52 |
-- for ( int column = 0; column < colCount; column++ ) { |
53 |
-+ for ( int column = colCount-1; column >= 0; --column ) { |
54 |
- // paint one group |
55 |
- const CartesianDiagramDataCompressor::CachePosition position( row, column ); |
56 |
- const CartesianDiagramDataCompressor::DataPoint point = compressor().data( position ); |
57 |
- const QModelIndex sourceIndex = attributesModel()->mapToSource( point.index ); |
58 |
- |
59 |
-- QPointF dataPoint( 0, rowCount - ( point.key + 0.5 ) ); |
60 |
-+ QPointF dataPoint( 0, ( point.key + 0.5 ) ); |
61 |
- const QPointF topLeft = ctx->coordinatePlane()->translate( dataPoint ); |
62 |
- dataPoint.rx() += point.value; |
63 |
- const QPointF bottomRight = ctx->coordinatePlane()->translate( dataPoint ) + |
64 |
-@@ -173,6 +173,7 @@ void NormalLyingBarDiagram::paint( PaintContext* ctx ) |
65 |
- const QRectF rect = QRectF( topLeft, bottomRight ).translated( 1.0, offset ); |
66 |
- m_private->addLabel( &lpc, sourceIndex, 0, PositionPoints( rect ), Position::North, |
67 |
- Position::South, point.value ); |
68 |
-+ |
69 |
- paintBars( ctx, sourceIndex, rect, maxDepth ); |
70 |
- |
71 |
- offset += barWidth + spaceBetweenBars; |
72 |
-diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp |
73 |
-index fee53d3..10dca65 100644 |
74 |
---- a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp |
75 |
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp |
76 |
-@@ -192,11 +192,11 @@ void PercentLyingBarDiagram::paint( PaintContext* ctx ) |
77 |
- |
78 |
- QPointF point, previousPoint; |
79 |
- if ( sumValuesVector.at( curRow ) != 0 && value > 0 ) { |
80 |
-- QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), rowCount - key ); |
81 |
-+ QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), key + 1 ); |
82 |
- point = ctx->coordinatePlane()->translate( dataPoint ); |
83 |
- point.ry() += offset / 2 + threeDOffset; |
84 |
- |
85 |
-- previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), rowCount - key ) ); |
86 |
-+ previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), key + 1 ) ); |
87 |
- } |
88 |
- |
89 |
- const qreal barHeight = point.x() - previousPoint.x(); |
90 |
-diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp |
91 |
-index 70cbba0..1a5b003 100644 |
92 |
---- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp |
93 |
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp |
94 |
-@@ -184,9 +184,9 @@ void StackedLyingBarDiagram::paint( PaintContext* ctx ) |
95 |
- stackedValues += point.value; |
96 |
- key = point.key; |
97 |
- } |
98 |
-- QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, rowCount - key ) ); |
99 |
-+ QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, key + 1 ) ); |
100 |
- point.ry() += offset / 2 + threeDOffset; |
101 |
-- const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, rowCount - key ) ); |
102 |
-+ const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, key + 1 ) ); |
103 |
- const qreal barHeight = point.x() - previousPoint.x(); |
104 |
- point.rx() -= barHeight; |
105 |
- |
106 |
--- |
107 |
-cgit v1.1 |
108 |
|
109 |
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild |
110 |
deleted file mode 100644 |
111 |
index 9ee52c2d914..00000000000 |
112 |
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild |
113 |
+++ /dev/null |
114 |
@@ -1,38 +0,0 @@ |
115 |
-# Copyright 1999-2020 Gentoo Authors |
116 |
-# Distributed under the terms of the GNU General Public License v2 |
117 |
- |
118 |
-EAPI=7 |
119 |
- |
120 |
-ECM_EXAMPLES="true" |
121 |
-ECM_QTHELP="true" |
122 |
-ECM_TEST="true" |
123 |
-QTMIN=5.12.3 |
124 |
-VIRTUALX_REQUIRED="test" |
125 |
-inherit ecm kde.org |
126 |
- |
127 |
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams" |
128 |
-HOMEPAGE="https://api.kde.org/extragear-api/graphics-apidocs/kdiagram/html/index.html |
129 |
-https://www.kdab.com/development-resources/qt-tools/kd-chart/" |
130 |
- |
131 |
-if [[ ${KDE_BUILD_TYPE} = release ]]; then |
132 |
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
133 |
- KEYWORDS="amd64 arm64 x86" |
134 |
-fi |
135 |
- |
136 |
-LICENSE="GPL-2" # TODO CHECK |
137 |
-SLOT="5" |
138 |
- |
139 |
-REQUIRED_USE="test? ( examples )" |
140 |
- |
141 |
-BDEPEND=" |
142 |
- >=dev-qt/linguist-tools-${QTMIN}:5 |
143 |
-" |
144 |
-DEPEND=" |
145 |
- >=dev-qt/qtgui-${QTMIN}:5 |
146 |
- >=dev-qt/qtprintsupport-${QTMIN}:5 |
147 |
- >=dev-qt/qtsvg-${QTMIN}:5 |
148 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
149 |
-" |
150 |
-RDEPEND="${DEPEND}" |
151 |
- |
152 |
-PATCHES=( "${FILESDIR}/${P}-fix-horizontal-bars.patch" ) |