rev 18898 - in kde-extras/skrooge/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2011-06-10 12:57:52 +0000 (Fri, 10 Jun 2011)
New Revision: 18898

Modified:
   kde-extras/skrooge/trunk/debian/changelog
   kde-extras/skrooge/trunk/debian/patches/ftbfs_arm.patch
Log:
Refresh ftbfs_arm.patch

Modified: kde-extras/skrooge/trunk/debian/changelog
===================================================================
--- kde-extras/skrooge/trunk/debian/changelog	2011-06-10 08:14:35 UTC (rev 18897)
+++ kde-extras/skrooge/trunk/debian/changelog	2011-06-10 12:57:52 UTC (rev 18898)
@@ -1,11 +1,16 @@
-skrooge (0.8.0.5-1) UNRELEASED; urgency=low
+skrooge (0.9.0-1) unstable; urgency=low
 
   * New upstream release.
+
+  [ Fathi Boudra ]
   * Update debian/control: add libqca2-plugin-ossl dependency.
     (Closes: #598127)
 
- -- Fathi Boudra <fabo at debian.org>  Mon, 28 Feb 2011 17:45:19 +0200
+  [ Mark Purcell ]
+  * Refresh ftbfs_arm.patch
 
+ -- Mark Purcell <msp at debian.org>  Fri, 10 Jun 2011 22:56:44 +1000
+
 skrooge (0.8.0.4-2) unstable; urgency=low
 
   * Add patch to fix build on ARM. (Closes: #615012)

Modified: kde-extras/skrooge/trunk/debian/patches/ftbfs_arm.patch
===================================================================
--- kde-extras/skrooge/trunk/debian/patches/ftbfs_arm.patch	2011-06-10 08:14:35 UTC (rev 18897)
+++ kde-extras/skrooge/trunk/debian/patches/ftbfs_arm.patch	2011-06-10 12:57:52 UTC (rev 18898)
@@ -1,13 +1,24 @@
 Description: fix build on ARM architecture
 Author: Fathi Boudra <fabo at debian.org>
---- a/skgbasegui/skgwebview.cpp
-+++ b/skgbasegui/skgwebview.cpp
-@@ -124,7 +124,7 @@ bool SKGWebView::eventFilter(QObject *ob
+Index: skrooge-0.9.0/skgbasegui/skgwebview.cpp
+===================================================================
+--- skrooge-0.9.0.orig/skgbasegui/skgwebview.cpp	2011-06-06 22:03:28.000000000 +1000
++++ skrooge-0.9.0/skgbasegui/skgwebview.cpp	2011-06-10 22:55:56.000000000 +1000
+@@ -124,7 +124,7 @@
  void SKGWebView::onZoomIn()
  {
      _SKGTRACEIN(10, "SKGWebView::onZoomIn");
--    int z = qMin(round(30.0 * log10(zoomFactor())) + 1, qreal(10.0));
-+    int z = qMin(round(30.0 * log10(zoomFactor())) + 1, 10.0);
+-    int z = qMin(((int) round(30.0 * log10(zoomFactor()))) + 1, 10);
++    int z = qMin(((int) round(30.0 * log10(zoomFactor()))) + 1, qreal(10));
      setZoomFactor(pow(10, ((qreal) z) / 30.0));
  
      emit zoomChanged(z);
+@@ -133,7 +133,7 @@
+ void SKGWebView::onZoomOut()
+ {
+     _SKGTRACEIN(10, "SKGWebView::onZoomOut");
+-    int z = qMax(((int) round(30.0 * log10(zoomFactor()))) - 1, -10);
++    int z = qMax(((int) round(30.0 * log10(zoomFactor()))) - 1, qreal(-10));
+     setZoomFactor(pow(10, ((qreal) z) / 30.0));
+ 
+     emit zoomChanged(z);