← Back to branch summary

~ubuntu-branches/ubuntu/karmic/kdeplasma-addons/karmic-updates

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_01_fix_armel_build.diff

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter, Christian Mangold, Alessandro Ghersi, Harald Sitter
  • Date: 2009-08-30 20:11:55 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20090830201155-ftsg6ehgrdsrcn8f
Tags: 4:4.3.1-0ubuntu1
https://launchpad.net/bugs/408235
[ Christian Mangold ]
* New upstream release
* Bump version of KDE build-deps to 4.3.1

[Alessandro Ghersi]
* Add libxcomposite-dev, libxrender-dev and libxdamage-dev to build-deps
  to build compositing support for Lancelot. (LP: #408235)
  (Thanks to Khashayar Naderehvandi)

[ Harald Sitter ]
* Fix armel build using kubuntu_01_fix_armel_build.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_01_fix_armel_build.diff
 
1
Index: kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp
 
2
===================================================================
 
3
--- kdeplasma-addons-4.3.1.orig/applets/pastebin/pastebin.cpp   2009-08-30 20:08:28.000000000 +0200
 
4
+++ kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp        2009-08-30 20:09:18.000000000 +0200
 
5
@@ -253,7 +253,7 @@
 
6
 {
 
7
     if (constraints & (Plasma::FormFactorConstraint | Plasma::SizeConstraint)) {
 
8
         int minSize = KGlobalSettings::smallestReadableFont().pointSize();
 
9
-        int dynSize = qMax(1.0, qMin(contentsRect().width(), contentsRect().height()) / 4);
 
10
+        int dynSize = qMax((qreal)1.0, (qreal)(qMin(contentsRect().width(), contentsRect().height()) / 4));
 
11
         //kDebug() << "Min : Dyn" << minSize << dynSize << qMax(minSize, dynSize);
 
12
         m_font.setPointSize(qMax(minSize, dynSize));
 
13
     }