← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty-updates

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_qt_ftbfs.diff

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-12-11 18:26:08 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20081211182608-tsu6p8ncbw1gnqxt
Tags: 4:4.1.85-0ubuntu1
* New upstream release
* Patches:
  + Removed 15_kfreebsd_support.diff from patches/series (doesn't apply and
    has no use for Ubuntu)
  + Redid 20_use_dejavu_as_default_font.diff
  + Completely removed kubuntu_09_fix_application_menu.diff (applied upstream)
  + Refreshed kubuntu_54_use_xdg_menu_prefix.diff
  + Dropped plasma/widgets/toolbutton.cpp from kubuntu_qt_ftbfs.diff (applied
    upstream)
  + Global quilt refresh

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_qt_ftbfs.diff
1
 
Index: kde4libs-4.1.73/plasma/private/tooltip.cpp
 
1
Index: kdelibs-4.1.85/plasma/private/tooltip.cpp
2
2
===================================================================
3
 
--- kde4libs-4.1.73.orig/plasma/private/tooltip.cpp     2008-11-12 16:38:26.000000000 +0000
4
 
+++ kde4libs-4.1.73/plasma/private/tooltip.cpp  2008-11-20 20:34:40.000000000 +0000
5
 
@@ -209,7 +209,7 @@
 
3
--- kdelibs-4.1.85.orig/plasma/private/tooltip.cpp      2008-12-10 17:12:24.000000000 +0100
 
4
+++ kdelibs-4.1.85/plasma/private/tooltip.cpp   2008-12-11 18:26:02.000000000 +0100
 
5
@@ -252,7 +252,7 @@
6
6
         d->from = pos();
7
7
     }
8
8
 
11
11
         move(d->to);
12
12
         return;
13
13
     }
14
 
Index: kde4libs-4.1.73/plasma/widgets/meter.cpp
 
14
Index: kdelibs-4.1.85/plasma/widgets/meter.cpp
15
15
===================================================================
16
 
--- kde4libs-4.1.73.orig/plasma/widgets/meter.cpp       2008-11-12 16:38:26.000000000 +0000
17
 
+++ kde4libs-4.1.73/plasma/widgets/meter.cpp    2008-11-20 20:34:40.000000000 +0000
18
 
@@ -51,7 +51,7 @@
 
16
--- kdelibs-4.1.85.orig/plasma/widgets/meter.cpp        2008-12-10 17:12:24.000000000 +0100
 
17
+++ kdelibs-4.1.85/plasma/widgets/meter.cpp     2008-12-11 18:26:02.000000000 +0100
 
18
@@ -52,7 +52,7 @@
19
19
 
20
20
     void progressChanged(qreal progress)
21
21
     {
24
24
 
25
25
         if (value == targetValue) {
26
26
             if (!over && movementId) {
27
 
Index: kde4libs-4.1.73/plasma/widgets/toolbutton.cpp
28
 
===================================================================
29
 
--- kde4libs-4.1.73.orig/plasma/widgets/toolbutton.cpp  2008-11-21 01:34:29.000000000 +0000
30
 
+++ kde4libs-4.1.73/plasma/widgets/toolbutton.cpp       2008-11-21 01:43:00.000000000 +0000
31
 
@@ -285,7 +285,7 @@
32
 
             QPainter bufferPainter(&buffer);
33
 
             bufferPainter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
34
 
             QColor alphaColor(Qt::black);
35
 
-            alphaColor.setAlphaF(qMin(0.95, d->opacity));
36
 
+            alphaColor.setAlphaF(qMin(qreal(0.95), d->opacity));
37
 
             bufferPainter.fillRect(buffer.rect(), alphaColor);
38
 
             bufferPainter.end();
39