1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
Description: Upstream changes introduced in version 0.0~wip20100227-1.1
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
plasma-widget-smooth-tasks (0.0~wip20100227-1.1) unstable; urgency=low
.
* Non-maintainer upload.
* Fix "FTBFS on armel: error: no matching function for call to
'qMin(double, qreal)'" make constant explicitly qreal
(Closes: DebianBug#598930) Thanks Felix Geyer
.
The person named in the Author field signed this changelog entry.
Author: Hector Oron <zumbi@debian.org>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- plasma-widget-smooth-tasks-0.0~wip20100227.orig/applet/SmoothTasks/LimitSqueezeTaskbarLayout.cpp
+++ plasma-widget-smooth-tasks-0.0~wip20100227/applet/SmoothTasks/LimitSqueezeTaskbarLayout.cpp
@@ -99,7 +99,7 @@ void LimitSqueezeTaskbarLayout::doLayout
m_cellHeight = rect.height();
}
- QSizeF newPreferredSize(qMin(10.0, rect.width()), qMin(10.0, rect.height()));
+ QSizeF newPreferredSize(qMin(qreal(10.0), rect.width()), qMin(qreal(10.0), rect.height()));
if (newPreferredSize != m_preferredSize) {
m_preferredSize = newPreferredSize;
@@ -145,7 +145,7 @@ void LimitSqueezeTaskbarLayout::doLayout
cellWidth = cellHeight * aspectRatio();
thisRowWidth = N * (cellWidth + spacing) +
(expandedItemCount - expandedHoverItemCount) * expandedWidth(); // suppress the expansion by hover
- compression = qMin((rows * availableWidth) / thisRowWidth, 1.0);
+ compression = qMin((rows * availableWidth) / thisRowWidth, qreal(1.0));
if (rows * availableWidth > (thisRowWidth - N * cellWidth) * m_squeezeRatio + N * cellWidth / (rows + 1)) {
break;
--- plasma-widget-smooth-tasks-0.0~wip20100227.orig/applet/SmoothTasks/ByShapeTaskbarLayout.cpp
+++ plasma-widget-smooth-tasks-0.0~wip20100227/applet/SmoothTasks/ByShapeTaskbarLayout.cpp
@@ -78,7 +78,7 @@ void ByShapeTaskbarLayout::doLayout() {
m_cellHeight = rect.height();
}
- QSizeF newPreferredSize(qMin(10.0, rect.width()), qMin(10.0, rect.height()));
+ QSizeF newPreferredSize(qMin(qreal(10.0), rect.width()), qMin(qreal(10.0), rect.height()));
if (newPreferredSize != m_preferredSize) {
m_preferredSize = newPreferredSize;
--- plasma-widget-smooth-tasks-0.0~wip20100227.orig/applet/SmoothTasks/MaxSqueezeTaskbarLayout.cpp
+++ plasma-widget-smooth-tasks-0.0~wip20100227/applet/SmoothTasks/MaxSqueezeTaskbarLayout.cpp
@@ -67,7 +67,7 @@ void MaxSqueezeTaskbarLayout::doLayout()
m_cellHeight = rect.height();
}
- QSizeF newPreferredSize(qMin(10.0, rect.width()), qMin(10.0, rect.height()));
+ QSizeF newPreferredSize(qMin(qreal(10.0), rect.width()), qMin(qreal(10.0), rect.height()));
if (newPreferredSize != m_preferredSize) {
m_preferredSize = newPreferredSize;
--- plasma-widget-smooth-tasks-0.0~wip20100227.orig/applet/SmoothTasks/FixedSizeTaskbarLayout.cpp
+++ plasma-widget-smooth-tasks-0.0~wip20100227/applet/SmoothTasks/FixedSizeTaskbarLayout.cpp
@@ -117,10 +117,10 @@ void FixedSizeTaskbarLayout::doLayout()
if (isVertical) {
newPreferredSize.setWidth(top + m_fixedCellHeight + bottom);
- newPreferredSize.setHeight(qMin(10.0, rect.height()));
+ newPreferredSize.setHeight(qMin(qreal(10.0), rect.height()));
}
else {
- newPreferredSize.setWidth(qMin(10.0, rect.width()));
+ newPreferredSize.setWidth(qMin(qreal(10.0), rect.width()));
newPreferredSize.setHeight(top + m_fixedCellHeight + bottom);
}
--- plasma-widget-smooth-tasks-0.0~wip20100227.orig/applet/SmoothTasks/FixedItemCountTaskbarLayout.cpp
+++ plasma-widget-smooth-tasks-0.0~wip20100227/applet/SmoothTasks/FixedItemCountTaskbarLayout.cpp
@@ -59,7 +59,7 @@ void FixedItemCountTaskbarLayout::doLayo
m_cellHeight = rect.height();
}
- QSizeF newPreferredSize(qMin(10.0, rect.width()), qMin(10.0, rect.height()));
+ QSizeF newPreferredSize(qMin(qreal(10.0), rect.width()), qMin(qreal(10.0), rect.height()));
if (newPreferredSize != m_preferredSize) {
m_preferredSize = newPreferredSize;
|
