[scribus] - switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885)
Dan Horák
sharkcz at fedoraproject.org
Thu Aug 28 12:55:28 UTC 2014
commit f419b028eb256f58dd6a1727e30be19163a702eb
Author: Dan Horák <dan at danny.cz>
Date: Thu Aug 28 14:55:24 2014 +0200
- switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885)
scribus-1.4.3-to-double.patch | 49 -------------
scribus-1.4.4-qreal_double.patch | 138 ++++++++++++++++++++++++++++++++++++++
scribus.spec | 7 ++-
3 files changed, 143 insertions(+), 51 deletions(-)
---
diff --git a/scribus-1.4.4-qreal_double.patch b/scribus-1.4.4-qreal_double.patch
new file mode 100644
index 0000000..9b3ec95
--- /dev/null
+++ b/scribus-1.4.4-qreal_double.patch
@@ -0,0 +1,138 @@
+Description: Avoid qreal/double type clashes on ARM
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-05-16
+
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribus.h
++++ scribus-1.4.2.dfsg+r18267/scribus/scribus.h
+@@ -466,7 +466,7 @@ public slots:
+ /** 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 */
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/pageitem.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/pageitem.cpp
+@@ -4597,7 +4597,7 @@ void PageItem::copyToCopyPasteBuffer(str
+
+
+ //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::SetFrameShape(int count,
+
+ 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::SetRectFrame()
+
+ 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,
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/pageitem.h
++++ scribus-1.4.2.dfsg+r18267/scribus/pageitem.h
+@@ -298,7 +298,7 @@ protected:
+ 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();
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/propertiespalette.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/propertiespalette.cpp
+@@ -4622,7 +4622,7 @@ void PropertiesPalette::MakeIrre(int f,
+ doc->setRedrawBounding(CurItem);
+ break;
+ default:
+- CurItem->SetFrameShape(c, (double*)vals);
++ CurItem->SetFrameShape(c, vals);
+ doc->setRedrawBounding(CurItem);
+ CurItem->FrameType = f+2;
+ break;
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribusdoc.h
++++ scribus-1.4.2.dfsg+r18267/scribus/scribusdoc.h
+@@ -1005,7 +1005,7 @@ public: // Public attributes
+ DocumentInformation documentInfo;
+ int appMode;
+ int SubMode;
+- double *ShapeValues;
++ qreal *ShapeValues;
+ int ValCount;
+ QString DocName;
+ QMap<QString,int> UsedFonts;
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/canvasmode_create.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/canvasmode_create.cpp
+@@ -122,7 +122,7 @@ void CreateMode::drawControls(QPainter*
+ {
+ 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)
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribus.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/scribus.cpp
+@@ -7599,7 +7599,7 @@ void ScribusMainWindow::GetBrushPen()
+ }
+ */
+ //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)
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/plugins/imposition/imposition.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/plugins/imposition/imposition.cpp
+@@ -542,7 +542,7 @@ void Imposition::booklet4p(QList<int>* p
+ }
+ 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 @@ void Imposition::booklet4p(QList<int>* p
+ }
+ groupcontrol->SetRectFrame();
+
+- double points[32] = {
++ qreal points[32] = {
+ //left upper corner - left lower corner
+ 0,
+ 0,
+@@ -893,7 +893,7 @@ void Imposition::booklet4p(QList<int>* p
+ }
+ groupcontrol->SetRectFrame();
+
+- double points[32] = {
++ qreal points[32] = {
+ //left upper corner - left lower corner
+ 0,
+ 0,
+@@ -1047,7 +1047,7 @@ void Imposition::booklet4p(QList<int>* p
+ }
+ 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),
diff --git a/scribus.spec b/scribus.spec
index 95db5ac..ada3926 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
Name: scribus
Version: 1.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: DeskTop Publishing application written in Qt
@@ -11,7 +11,7 @@ URL: http://www.scribus.net/
Source0: %{name}-%{version}-free.tar.xz
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
#Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
-Patch1: %{name}-1.4.3-to-double.patch
+Patch1: %{name}-1.4.4-qreal_double.patch
# fix build with non-free content removed
Patch2: %{name}-1.4.2-nonfree.patch
@@ -148,6 +148,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Thu Aug 28 2014 Dan Horák <dan[at]danny.cz> - 1.4.4-5
+- switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885)
+
* Wed Aug 20 2014 Kevin Fenzi <kevin at scrye.com> - 1.4.4-4
- Rebuild for rpm bug 1131892
More information about the scm-commits
mailing list