rev 11843 - in branches/kde4/packages/kdegraphics/debian: . patches

[Pino Toscano]

Author: pino-guest
Date: 2008-08-03 09:32:40 +0000 (Sun, 03 Aug 2008)
New Revision: 11843

Added:
   branches/kde4/packages/kdegraphics/debian/patches/10_r837843_qreal.diff
   branches/kde4/packages/kdegraphics/debian/patches/12_r839973_qreal.diff
   branches/kde4/packages/kdegraphics/debian/patches/series
Modified:
   branches/kde4/packages/kdegraphics/debian/changelog
Log:
port (copy from the standalone okular) the two upstream patches of okular for making it compile when qreal is float and not double
(they won't be needed anymore with kdegraphics 4.1.1)


Modified: branches/kde4/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde4/packages/kdegraphics/debian/changelog	2008-08-03 08:50:30 UTC (rev 11842)
+++ branches/kde4/packages/kdegraphics/debian/changelog	2008-08-03 09:32:40 UTC (rev 11843)
@@ -3,8 +3,11 @@
   +++ Changes by Pino Toscano:
 
   * Make okular-extra-backends provide the virtual package djvu-viewer.
+  * Add the upstream patches 10_r837843_qreal.diff (r837843) and
+    12_r839973_qreal.diff (r839973) to fix the Okular compilation when qreal
+    is not double but float.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Jun 2008 15:03:32 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Jun 2008 11:30:16 +0200
 
 kdegraphics (4:4.1.0-1) experimental; urgency=low
 

Copied: branches/kde4/packages/kdegraphics/debian/patches/10_r837843_qreal.diff (from rev 11842, kde-extras/okular/trunk/debian/patches/10_r837843_qreal.diff)
===================================================================
--- branches/kde4/packages/kdegraphics/debian/patches/10_r837843_qreal.diff	                        (rev 0)
+++ branches/kde4/packages/kdegraphics/debian/patches/10_r837843_qreal.diff	2008-08-03 09:32:40 UTC (rev 11843)
@@ -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 )

Copied: branches/kde4/packages/kdegraphics/debian/patches/12_r839973_qreal.diff (from rev 11842, kde-extras/okular/trunk/debian/patches/12_r839973_qreal.diff)
===================================================================
--- branches/kde4/packages/kdegraphics/debian/patches/12_r839973_qreal.diff	                        (rev 0)
+++ branches/kde4/packages/kdegraphics/debian/patches/12_r839973_qreal.diff	2008-08-03 09:32:40 UTC (rev 11843)
@@ -0,0 +1,32 @@
+Index: kdegraphics/okular/generators/xps/generator_xps.cpp
+===================================================================
+--- kdegraphics/okular/generators/xps/generator_xps.cpp	(revision 839972)
++++ kdegraphics/okular/generators/xps/generator_xps.cpp	(revision 839973)
+@@ -981,7 +981,7 @@
+         QVector<qreal> dashPattern( pieces.count() );
+         bool ok = false;
+         for ( int i = 0; i < pieces.count(); ++i ) {
+-            double value = pieces.at( i ).toInt( &ok );
++            qreal value = pieces.at( i ).toInt( &ok );
+             if ( ok ) {
+                 dashPattern[i] = value;
+             } else {
+Index: kdegraphics/okular/ui/pageviewutils.cpp
+===================================================================
+--- kdegraphics/okular/ui/pageviewutils.cpp	(revision 839972)
++++ kdegraphics/okular/ui/pageviewutils.cpp	(revision 839973)
+@@ -102,12 +102,12 @@
+     return m_zoomFactor;
+ }
+ 
+-qreal PageViewItem::absToPageX( qreal absX ) const
++double PageViewItem::absToPageX( double absX ) const
+ {
+     return ( absX - m_uncroppedGeometry.left() ) / m_uncroppedGeometry.width();
+ }
+ 
+-qreal PageViewItem::absToPageY( qreal absY ) const
++double PageViewItem::absToPageY( double absY ) const
+ {
+     return ( absY - m_uncroppedGeometry.top() ) / m_uncroppedGeometry.height();
+ }

Added: branches/kde4/packages/kdegraphics/debian/patches/series
===================================================================
--- branches/kde4/packages/kdegraphics/debian/patches/series	                        (rev 0)
+++ branches/kde4/packages/kdegraphics/debian/patches/series	2008-08-03 09:32:40 UTC (rev 11843)
@@ -0,0 +1,2 @@
+10_r837843_qreal.diff
+12_r839973_qreal.diff