tags 707882 patch thanks Attached to this email there is a debdiff fixing the bug, where the patch is imported from the Ubuntu package. I tested the restulting package in a amd64 architecture, since I don't own any arm* device.
--
regards,
Mattia Rizzolo
GPG Key: 4096R/B9444540 http://goo.gl/I8TMB
more about me: http://mapreri.org
Launchpad User: https://launchpad.net/~mapreri
Ubuntu Wiki page: https://wiki.ubuntu.com/MattiaRizzolo
diff -Nru scribus-1.4.2.dfsg+r18267/debian/changelog
scribus-1.4.2.dfsg+r18267/debian/changelog
--- scribus-1.4.2.dfsg+r18267/debian/changelog 2013-04-24 18:58:46.000000000
+0200
+++ scribus-1.4.2.dfsg+r18267/debian/changelog 2013-12-21 16:17:40.000000000
+0100
@@ -1,3 +1,11 @@
+scribus (1.4.2.dfsg+r18267-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patch/qreal_double.patch: Avoid qreal/double clashes on ARM
+ (imported from Ubuntu). (Closes: #707882)
+
+ -- Mattia Rizzolo <mat...@mapreri.org> Sat, 21 Dec 2013 16:13:37 +0100
+
scribus (1.4.2.dfsg+r18267-1) unstable; urgency=low
* Update from the upstream svn, which fixes many bugs.
diff -Nru scribus-1.4.2.dfsg+r18267/debian/patches/qreal_double.patch
scribus-1.4.2.dfsg+r18267/debian/patches/qreal_double.patch
--- scribus-1.4.2.dfsg+r18267/debian/patches/qreal_double.patch 1970-01-01
01:00:00.000000000 +0100
+++ scribus-1.4.2.dfsg+r18267/debian/patches/qreal_double.patch 2013-12-21
08:13:23.000000000 +0100
@@ -0,0 +1,154 @@
+Description: Avoid qreal/double type clashes on ARM
+Author: Colin Watson <cjwat...@ubuntu.com>
+Forwarded: no
+Last-Update: 2013-05-16
+
+Index: b/scribus/canvasmode_create.cpp
+===================================================================
+--- a/scribus/canvasmode_create.cpp
++++ b/scribus/canvasmode_create.cpp
+@@ -122,7 +122,7 @@
+ {
+ FPointArray poly;
+ int valCount = m_doc->ValCount;
+- double *vals = m_doc->ShapeValues;
++ qreal *vals = m_doc->ShapeValues;
+ for (int a = 0; a < valCount-3; a += 4)
+ {
+ if (vals[a] < 0)
+Index: b/scribus/pageitem.cpp
+===================================================================
+--- a/scribus/pageitem.cpp
++++ b/scribus/pageitem.cpp
+@@ -4597,7 +4597,7 @@
+
+
+ //Moved from View
+-void PageItem::SetFrameShape(int count, double *vals)
++void PageItem::SetFrameShape(int count, qreal *vals)
+ {
+ PoLine.resize(0);
+ for (int a = 0; a < count-3; a += 4)
+@@ -4620,7 +4620,7 @@
+
+ void PageItem::SetRectFrame()
+ {
+- static double rect[] = { 0.0, 0.0, 0.0, 0.0,
++ static qreal rect[] = { 0.0, 0.0, 0.0, 0.0,
+ 100.0, 0.0, 100.0,
0.0,
+ 100.0, 0.0, 100.0,
0.0,
+ 100.0, 100.0, 100.0,
100.0,
+@@ -4635,7 +4635,7 @@
+
+ void PageItem::SetOvalFrame()
+ {
+- static double rect[] = { 100.0, 50.0, 100.0, 77.615235,
++ static qreal rect[] = { 100.0, 50.0, 100.0, 77.615235,
+ 50.0, 100.0,
77.615235, 100.0,
+ 50.0, 100.0,
22.385765, 100.0,
+ 0.0, 50.0,
0.0, 77.615235,
+Index: b/scribus/pageitem.h
+===================================================================
+--- a/scribus/pageitem.h
++++ b/scribus/pageitem.h
+@@ -298,7 +298,7 @@
+ void DrawObj_PathText(ScPainter *p, double sc);
+ public:
+ void DrawObj_Embedded(ScPainter *p, QRectF e, const CharStyle& style,
PageItem* cembedded);
+- void SetFrameShape(int count, double *vals);
++ void SetFrameShape(int count, qreal *vals);
+ void SetRectFrame();
+ void SetOvalFrame();
+ void SetFrameRound();
+Index: b/scribus/plugins/imposition/imposition.cpp
+===================================================================
+--- a/scribus/plugins/imposition/imposition.cpp
++++ b/scribus/plugins/imposition/imposition.cpp
+@@ -542,7 +542,7 @@
+ }
+ groupcontrol->SetRectFrame();
+
+- double points[32] = {
++ qreal points[32] = {
+ //left upper corner - left lower corner
+
targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
+
targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),
+@@ -730,7 +730,7 @@
+ }
+ groupcontrol->SetRectFrame();
+
+- double points[32] = {
++ qreal points[32] = {
+ //left upper corner - left lower corner
+ 0,
+ 0,
+@@ -893,7 +893,7 @@
+ }
+ groupcontrol->SetRectFrame();
+
+- double points[32] = {
++ qreal points[32] = {
+ //left upper corner - left lower corner
+ 0,
+ 0,
+@@ -1047,7 +1047,7 @@
+ }
+ groupcontrol->SetRectFrame();
+
+- double points[32] = {
++ qreal points[32] = {
+ //left upper corner - left lower corner
+
targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
+
targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),
+Index: b/scribus/propertiespalette.cpp
+===================================================================
+--- a/scribus/propertiespalette.cpp
++++ b/scribus/propertiespalette.cpp
+@@ -4622,7 +4622,7 @@
+ doc->setRedrawBounding(CurItem);
+ break;
+ default:
+- CurItem->SetFrameShape(c, (double*)vals);
++ CurItem->SetFrameShape(c, vals);
+ doc->setRedrawBounding(CurItem);
+ CurItem->FrameType = f+2;
+ break;
+Index: b/scribus/scribus.cpp
+===================================================================
+--- a/scribus/scribus.cpp
++++ b/scribus/scribus.cpp
+@@ -7599,7 +7599,7 @@
+ }
+ */
+ //CB-->??
+-void ScribusMainWindow::MakeFrame(int f, int c, double *vals)
++void ScribusMainWindow::MakeFrame(int f, int c, qreal *vals)
+ {
+ PageItem *currItem = doc->m_Selection->itemAt(0);
+ switch (f)
+Index: b/scribus/scribus.h
+===================================================================
+--- a/scribus/scribus.h
++++ b/scribus/scribus.h
+@@ -466,7 +466,7 @@
+ /** Fragt nach den Farben */
+ // void GetBrushPen();
+ /** Erzeugt einen Rahmen */
+- void MakeFrame(int f, int c, double *vals);
++ void MakeFrame(int f, int c, qreal *vals);
+ //** Loescht ein Element */
+ //void DeleteObjekt();
+ /** Duplicate current item */
+Index: b/scribus/scribusdoc.h
+===================================================================
+--- a/scribus/scribusdoc.h
++++ b/scribus/scribusdoc.h
+@@ -1005,7 +1005,7 @@
+ DocumentInformation documentInfo;
+ int appMode;
+ int SubMode;
+- double *ShapeValues;
++ qreal *ShapeValues;
+ int ValCount;
+ QString DocName;
+ QMap<QString,int> UsedFonts;
diff -Nru scribus-1.4.2.dfsg+r18267/debian/patches/series
scribus-1.4.2.dfsg+r18267/debian/patches/series
--- scribus-1.4.2.dfsg+r18267/debian/patches/series 2013-04-24
19:03:30.000000000 +0200
+++ scribus-1.4.2.dfsg+r18267/debian/patches/series 2013-12-21
08:13:23.000000000 +0100
@@ -1,2 +1,3 @@
profiles_cmakelists.patch
scribus_cmakelists.patch
+qreal_double.patch
signature.asc
Description: Digital signature
