[texmaker] 71/103: Fix FTBFS on armel and armhf arches

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository texmaker.

commit 0ae962d989790cdb463475530656fe6b4d8d45de
Author: Julián Moreno Patiño <julian at debian.org>
Date:   Fri Aug 9 23:20:21 2013 +0000

    Fix FTBFS on armel and armhf arches
---
 debian/changelog                      |  8 ++++
 debian/patches/30-fix-ftbfs-arm.patch | 80 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 89 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 43868e4..571a3c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+texmaker (4.0.3-2) unstable; urgency=low
+
+  * Team upload.
+  * Add 30-fix-ftbfs-arm.patch to fix FTBFS on
+    armel and armhf arches.
+
+ -- Julián Moreno Patiño <julian at debian.org>  Fri, 09 Aug 2013 17:55:44 -0500
+
 texmaker (4.0.3-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/30-fix-ftbfs-arm.patch b/debian/patches/30-fix-ftbfs-arm.patch
new file mode 100644
index 0000000..b33c080
--- /dev/null
+++ b/debian/patches/30-fix-ftbfs-arm.patch
@@ -0,0 +1,80 @@
+Author: Pascal Brachet <pbrachet at xm1math.net>
+Purpose: Fix FTBFS on armel and armhf arches.
+--- a/documentview.cpp
++++ b/documentview.cpp
+@@ -680,12 +680,12 @@
+     {
+         PageItem* page = m_pages.at(m_currentPage - 1);
+ 
+-        setScaleFactor(qMin(page->scaleFactor() + 0.1, s_maximumScaleFactor));
++        setScaleFactor(qMin(page->scaleFactor() + 0.1f, s_maximumScaleFactor));
+         setScaleMode(ScaleFactor);
+     }
+     else
+     {
+-        setScaleFactor(qMin(scaleFactor() + 0.1, s_maximumScaleFactor));
++        setScaleFactor(qMin(scaleFactor() + 0.1f, s_maximumScaleFactor));
+     }
+ }
+ 
+@@ -696,12 +696,12 @@
+     {
+         PageItem* page = m_pages.at(m_currentPage - 1);
+ 
+-        setScaleFactor(qMax(page->scaleFactor() - 0.1, s_minimumScaleFactor));
++        setScaleFactor(qMax(page->scaleFactor() - 0.1f, s_minimumScaleFactor));
+         setScaleMode(ScaleFactor);
+     }
+     else
+     {
+-        setScaleFactor(qMax(scaleFactor() - 0.1, s_minimumScaleFactor));
++        setScaleFactor(qMax(scaleFactor() - 0.1f, s_minimumScaleFactor));
+     }
+ }
+ 
+@@ -1352,7 +1352,7 @@
+ 
+                 pageHeight = boundingRect.height();
+ 
+-                left = qMin(left, -boundingRect.width() - 1.5 * s_pageSpacing);
++                left = qMin(left, -boundingRect.width() - 1.5f * s_pageSpacing);
+             }
+             else
+             {
+@@ -1360,7 +1360,7 @@
+ 
+                 pageHeight = qMax(pageHeight, boundingRect.height());
+ 
+-                right = qMax(right, boundingRect.width() + 1.5 * s_pageSpacing);
++                right = qMax(right, boundingRect.width() + 1.5f * s_pageSpacing);
+                 height += pageHeight + s_pageSpacing;
+             }
+         }
+@@ -1372,15 +1372,15 @@
+ 
+             pageHeight = boundingRect.height();
+ 
+-            left = qMin(left, -0.5 * boundingRect.width() - s_pageSpacing);
+-            right = qMax(right, 0.5 * boundingRect.width() + s_pageSpacing);
++            left = qMin(left, -0.5f * boundingRect.width() - s_pageSpacing);
++            right = qMax(right, 0.5f * boundingRect.width() + s_pageSpacing);
+             height += pageHeight + s_pageSpacing;
+         }
+     }
+ 
+     if(m_twoPagesMode && m_numberOfPages % 2 != 0)
+     {
+-        right = qMax(right, 0.5 * s_pageSpacing);
++        right = qMax(right, 0.5f * s_pageSpacing);
+         height += pageHeight + s_pageSpacing;
+     }
+ 
+@@ -1434,7 +1434,7 @@
+                 QRectF boundingRect = page->boundingRect().translated(page->pos());
+ 
+                 top = qMin(top, boundingRect.top() - s_pageSpacing);
+-                height = qMax(height, boundingRect.height() + 2.0 * s_pageSpacing);
++                height = qMax(height, boundingRect.height() + 2.0f * s_pageSpacing);
+             }
+             else
+             {
diff --git a/debian/patches/series b/debian/patches/series
index 3f0ad86..f823fef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_spelling_dict.patch
 20-add-keywords-desktop-file.patch
+30-fix-ftbfs-arm.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git