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

[Pino Toscano]

Author: pino-guest
Date: 2008-07-31 09:42:36 +0000 (Thu, 31 Jul 2008)
New Revision: 11809

Added:
   kde-extras/okular/trunk/debian/patches/11_r839617_printpreview.diff
   kde-extras/okular/trunk/debian/patches/12_r839973_qreal.diff
Modified:
   kde-extras/okular/trunk/debian/changelog
   kde-extras/okular/trunk/debian/patches/series
Log:
* add patch 11_r839617_printpreview.diff for fixing a crash in PDF print preview (kde bug #167734)
* add patch 12_r839973_qreal.diff to fix more compiling problems when qreal is float


Modified: kde-extras/okular/trunk/debian/changelog
===================================================================
--- kde-extras/okular/trunk/debian/changelog	2008-07-31 08:11:18 UTC (rev 11808)
+++ kde-extras/okular/trunk/debian/changelog	2008-07-31 09:42:36 UTC (rev 11809)
@@ -1,3 +1,14 @@
+okular (0.7-2) UNRELEASED; urgency=low
+
+  * New patch 11_r839617_printpreview.diff:
+    + Taken from upstream r839617 to avoid crashing when asking for the print
+      preview of a PDF document.
+  * New patch 12_r839973_qreal.diff:
+    + Taken from upstream r839973 to add more compile fixes when qreal is not
+      double but float.
+
+ -- Pino Toscano <pino at kde.org>  Thu, 31 Jul 2008 11:34:46 +0200
+
 okular (0.7-1) unstable; urgency=low
 
   * New upstream release.
@@ -3,5 +14,5 @@
   * New patch 10_r837843_qreal.diff:
     + Taken from upstream r837843 to (hopefully) fix the build where qreal is
-      not double but float. 
+      not double but float.
 
  -- Pino Toscano <pino at kde.org>  Fri, 25 Jul 2008 23:23:11 +0200

Added: kde-extras/okular/trunk/debian/patches/11_r839617_printpreview.diff
===================================================================
--- kde-extras/okular/trunk/debian/patches/11_r839617_printpreview.diff	                        (rev 0)
+++ kde-extras/okular/trunk/debian/patches/11_r839617_printpreview.diff	2008-07-31 09:42:36 UTC (rev 11809)
@@ -0,0 +1,17 @@
+Index: kdegraphics/okular/generators/poppler/generator_pdf.cpp
+===================================================================
+--- kdegraphics/okular/generators/poppler/generator_pdf.cpp	(revision 839616)
++++ kdegraphics/okular/generators/poppler/generator_pdf.cpp	(revision 839617)
+@@ -839,7 +839,11 @@
+         pstitle = document()->currentDocument().fileName();
+     }
+ 
+-    bool forceRasterize = pdfOptionsPage->printForceRaster();
++    bool forceRasterize = false;
++    if ( pdfOptionsPage )
++    {
++        forceRasterize = pdfOptionsPage->printForceRaster();
++    }
+ 
+     Poppler::PSConverter *psConverter = pdfdoc->psConverter();
+ 

Added: kde-extras/okular/trunk/debian/patches/12_r839973_qreal.diff
===================================================================
--- kde-extras/okular/trunk/debian/patches/12_r839973_qreal.diff	                        (rev 0)
+++ kde-extras/okular/trunk/debian/patches/12_r839973_qreal.diff	2008-07-31 09:42:36 UTC (rev 11809)
@@ -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();
+ }

Modified: kde-extras/okular/trunk/debian/patches/series
===================================================================
--- kde-extras/okular/trunk/debian/patches/series	2008-07-31 08:11:18 UTC (rev 11808)
+++ kde-extras/okular/trunk/debian/patches/series	2008-07-31 09:42:36 UTC (rev 11809)
@@ -1 +1,3 @@
 10_r837843_qreal.diff
+11_r839617_printpreview.diff
+12_r839973_qreal.diff