Your message dated Wed, 15 Feb 2012 04:02:49 +0000
with message-id <e1rxw4v-0002bz...@franck.debian.org>
and subject line Bug#659916: fixed in scribus 1.4.0.dfsg+r17300-1
has caused the Debian Bug report #659916,
regarding scribus FTBFS on armel and armhf, qreal VS double issues (again)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
659916: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=659916
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: Scribus
Severity: Serious
Tags: Patch
Your package FTBFS on armel and armhf with the following error.
[ 60%] Building CXX object
scribus/CMakeFiles/scribus.dir/pageitem_textframe.cpp.o
/build/buildd-scribus_1.4.0.dfsg+r17287-1-armel-qlKYbT/scribus-1.4.0.dfsg+r17287/scribus/pageitem_textframe.cpp:
In member function 'double LineControl::endOfLine(const QRegion&, double, int,
int)':
/build/buildd-scribus_1.4.0.dfsg+r17287-1-armel-qlKYbT/scribus-1.4.0.dfsg+r17287/scribus/pageitem_textframe.cpp:557:70:
error: no matching function for call to 'qMax(qreal&, const double&)'
/build/buildd-scribus_1.4.0.dfsg+r17287-1-armel-qlKYbT/scribus-1.4.0.dfsg+r17287/scribus/pageitem_textframe.cpp:557:70:
note: candidate is:
/usr/include/qt4/QtCore/qglobal.h:1116:17: note: template<class T> const T& qMax(const
T&, const T&)
make[3]: *** [scribus/CMakeFiles/scribus.dir/pageitem_textframe.cpp.o] Error 1
qreal on most architectures is defined as double but on arm architetures it is
defined as float¹. It is OK to make assignments between qreal and double since
it is ok to make assignments between float and double. But in more complex
situations involving pointers, templates and/or overloading indiscriminate
mixing of qreal and double can cause problems.
In the case of your package there were a couple of such problems, the template
related issue that showed up in the build log and a pointer related issue.
Both were trival to fix.
Patch is attatched.
¹Note this is a QT upstream descision not a debian descision.
Description: Fix qreal VS double
Fix two qreal vs double issues that were preventing build on armel/armhf
One invlolving a template the other involving pointers.
Author: Peter Michael Green <plugw...@p10link.net>
Bug-Debian: http://bugs.debian.org/?????
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- scribus-1.4.0.dfsg+r17287.orig/scribus/pageitem_textframe.cpp
+++ scribus-1.4.0.dfsg+r17287/scribus/pageitem_textframe.cpp
@@ -554,7 +554,7 @@ struct LineControl {
double maxX = colRight - morespace;
if (legacy) maxX -= lineCorr;
- double StartX = floor(qMax(line.x, qMin(maxX,breakXPos-maxShrink-1))-1);
+ double StartX = floor(qMax((double)line.x, qMin(maxX,breakXPos-maxShrink-1))-1);
int xPos = static_cast<int>(ceil(maxX));
QPoint pt12 (xPos, yAsc);
--- scribus-1.4.0.dfsg+r17287.orig/scribus/scribusview.cpp
+++ scribus-1.4.0.dfsg+r17287/scribus/scribusview.cpp
@@ -1711,7 +1711,7 @@ bool ScribusView::slotSetCurs(int x, int
FPoint point(pf.x() - currItem->xPos(), pf.y() - currItem->yPos());
if (transform.isInvertible() && currItem->itemText.length() > 0)
{
- double tx = 0, ty = 0;
+ qreal tx = 0, ty = 0;
transform.inverted().map(pf.x(), pf.y(), &tx, &ty);
point.setXY(tx, ty);
}
--- End Message ---
--- Begin Message ---
Source: scribus
Source-Version: 1.4.0.dfsg+r17300-1
We believe that the bug you reported is fixed in the latest version of
scribus, which is due to be installed in the Debian FTP archive:
scribus_1.4.0.dfsg+r17300-1.debian.tar.gz
to main/s/scribus/scribus_1.4.0.dfsg+r17300-1.debian.tar.gz
scribus_1.4.0.dfsg+r17300-1.dsc
to main/s/scribus/scribus_1.4.0.dfsg+r17300-1.dsc
scribus_1.4.0.dfsg+r17300-1_amd64.deb
to main/s/scribus/scribus_1.4.0.dfsg+r17300-1_amd64.deb
scribus_1.4.0.dfsg+r17300.orig.tar.gz
to main/s/scribus/scribus_1.4.0.dfsg+r17300.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 659...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Oleksandr Moskalenko <ma...@debian.org> (supplier of updated scribus package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Tue, 14 Feb 2012 15:58:50 -0600
Source: scribus
Binary: scribus
Architecture: source amd64
Version: 1.4.0.dfsg+r17300-1
Distribution: unstable
Urgency: low
Maintainer: Oleksandr Moskalenko <ma...@debian.org>
Changed-By: Oleksandr Moskalenko <ma...@debian.org>
Description:
scribus - Open Source Desktop Page Layout - stable branch
Closes: 659916
Changes:
scribus (1.4.0.dfsg+r17300-1) unstable; urgency=low
.
* Update from the scribus svn with armel patches included (Closes: #659916).
Checksums-Sha1:
70529528ccc8c3b31dce2759dba0539b6caa2f01 1480 scribus_1.4.0.dfsg+r17300-1.dsc
332bcbb730d268f3ebd081f7e5caa25b030a2d61 24326822
scribus_1.4.0.dfsg+r17300.orig.tar.gz
36fe5169894311da75cd11462d7066fb12f48109 26547
scribus_1.4.0.dfsg+r17300-1.debian.tar.gz
3c76ac2519b98c16afe1d7ce5cf761819473507c 25975282
scribus_1.4.0.dfsg+r17300-1_amd64.deb
Checksums-Sha256:
1ede67ae897fcf913c4db4a95b509076627ac1442917faf00d2d30ffd71e6fa3 1480
scribus_1.4.0.dfsg+r17300-1.dsc
976d590eaaadd1bf98c8cdbf292c503788251f7bea58dfc38eb71d1c8a9d4b73 24326822
scribus_1.4.0.dfsg+r17300.orig.tar.gz
96de2268c7740b96113594659e3f2718f57292800e4322d6963d17bb8927a198 26547
scribus_1.4.0.dfsg+r17300-1.debian.tar.gz
57f11b2e8e61d6a85f6833b9003f43562d8094081d2715a07d02f289fdfacc26 25975282
scribus_1.4.0.dfsg+r17300-1_amd64.deb
Files:
e3aaa70deb913c62640ae55d254dcf80 1480 graphics optional
scribus_1.4.0.dfsg+r17300-1.dsc
57bd3505f0c6a98694d4a4f1ef3e125f 24326822 graphics optional
scribus_1.4.0.dfsg+r17300.orig.tar.gz
ee911efcf2239bdced4e7f4460d1d61c 26547 graphics optional
scribus_1.4.0.dfsg+r17300-1.debian.tar.gz
9d4b8bd1a1525c33c759dca691cc2bfb 25975282 graphics optional
scribus_1.4.0.dfsg+r17300-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iD8DBQFPOyvH2ihvMmxfGWsRAg6+AJ9c+rK9m0SMrSqVzZQ7qSl0RZ9/QgCgilC/
memrnNrxt8TVHTCjbVK//R4=
=rGSR
-----END PGP SIGNATURE-----
--- End Message ---
