rev 11732 - in kde-extras/okular/trunk/debian: . patches

[Pino Toscano]

Author: pino-guest
Date: 2008-07-25 21:25:20 +0000 (Fri, 25 Jul 2008)
New Revision: 11732

Added:
   kde-extras/okular/trunk/debian/patches/10_r837843_qreal.diff
Modified:
   kde-extras/okular/trunk/debian/changelog
   kde-extras/okular/trunk/debian/patches/series
Log:
+ new release 0.7
+ add upstream patch for build in qreal double/float mismatch


Modified: kde-extras/okular/trunk/debian/changelog
===================================================================
--- kde-extras/okular/trunk/debian/changelog	2008-07-25 21:21:01 UTC (rev 11731)
+++ kde-extras/okular/trunk/debian/changelog	2008-07-25 21:25:20 UTC (rev 11732)
@@ -1,3 +1,12 @@
+okular (0.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * New patch 10_r837843_qreal.diff:
+    + taken from upstream r837843 to (hopefully) fix the build where qreal is
+      not double but float
+
+ -- Pino Toscano <pino at kde.org>  Fri, 25 Jul 2008 23:23:11 +0200
+
 okular (0.6.90-2) unstable; urgency=low
 
   * Add a okular-dbg package with debug symbols.

Added: kde-extras/okular/trunk/debian/patches/10_r837843_qreal.diff
===================================================================
--- kde-extras/okular/trunk/debian/patches/10_r837843_qreal.diff	                        (rev 0)
+++ kde-extras/okular/trunk/debian/patches/10_r837843_qreal.diff	2008-07-25 21:25:20 UTC (rev 11732)
@@ -0,0 +1,17 @@
+Index: kdegraphics/okular/core/area.cpp
+===================================================================
+--- kdegraphics/okular/core/area.cpp	(revision 837842)
++++ kdegraphics/okular/core/area.cpp	(revision 837843)
+@@ -42,7 +42,11 @@
+ 
+ void NormalizedPoint::transform( const QMatrix &matrix )
+ {
+-    matrix.map( x, y, &x, &y );
++    qreal tmp_x = (qreal)x;
++    qreal tmp_y = (qreal)y;
++    matrix.map( tmp_x, tmp_y, &tmp_x, &tmp_y );
++    x = tmp_x;
++    y = tmp_y;
+ }
+ 
+ QDebug operator<<( QDebug str, const Okular::NormalizedPoint& p )

Modified: kde-extras/okular/trunk/debian/patches/series
===================================================================
--- kde-extras/okular/trunk/debian/patches/series	2008-07-25 21:21:01 UTC (rev 11731)
+++ kde-extras/okular/trunk/debian/patches/series	2008-07-25 21:25:20 UTC (rev 11732)
@@ -0,0 +1 @@
+10_r837843_qreal.diff