[scribus/f19] - fix the double patch (#1009979)

[Dan Horák]

commit 3e2dd89782828dc5a52097711ebf388f231ebb10
Author: Dan Horák <dan at danny.cz>
Date:   Thu Sep 19 21:54:21 2013 +0200

    - fix the double patch (#1009979)

 scribus-1.4.3-to-double.patch |   49 +++++++++++++++++++++++++++++++++++++++++
 scribus-to-double.patch       |   43 ------------------------------------
 scribus.spec                  |    7 ++++-
 3 files changed, 54 insertions(+), 45 deletions(-)
---
diff --git a/scribus-1.4.3-to-double.patch b/scribus-1.4.3-to-double.patch
new file mode 100644
index 0000000..055bd10
--- /dev/null
+++ b/scribus-1.4.3-to-double.patch
@@ -0,0 +1,49 @@
+diff -up scribus-1.4.3/scribus/ui/modetoolbar.cpp.double scribus-1.4.3/scribus/ui/modetoolbar.cpp
+--- scribus-1.4.3/scribus/ui/modetoolbar.cpp.double	2012-05-21 18:00:08.000000000 +0200
++++ scribus-1.4.3/scribus/ui/modetoolbar.cpp	2013-09-19 21:50:48.000000000 +0200
+@@ -40,7 +40,7 @@ ModeToolBar::ModeToolBar(ScribusMainWind
+ {
+ 	SubMode = 0;
+ 	ValCount = 32;
+-	static qreal AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
++	static double AutoShapes0[] = {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, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
+ 									0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
+ 	ShapeVals = AutoShapes0;
+@@ -84,7 +84,7 @@ ModeToolBar::ModeToolBar(ScribusMainWind
+ 	this->addAction(m_ScMW->scrActions["toolsEyeDropper"]);
+ 
+ 	languageChange();
+-	connect(Rechteck, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(SelShape(int, int, qreal *)));
++	connect(Rechteck, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(SelShape(int, int, double *)));
+ }
+ 
+ void ModeToolBar::GetPolyProps()
+@@ -98,7 +98,7 @@ void ModeToolBar::GetPolyProps()
+ 	delete dia;
+ }
+ 
+-void ModeToolBar::SelShape(int s, int c, qreal *vals)
++void ModeToolBar::SelShape(int s, int c, double *vals)
+ {
+ 	m_ScMW->scrActions["toolsInsertShape"]->setIcon(QIcon(Rechteck->getIconPixmap(s,16)));
+ //	insertShapeButtonMenu->hide();
+diff -up scribus-1.4.3/scribus/ui/modetoolbar.h.double scribus-1.4.3/scribus/ui/modetoolbar.h
+--- scribus-1.4.3/scribus/ui/modetoolbar.h.double	2012-02-14 23:57:05.000000000 +0100
++++ scribus-1.4.3/scribus/ui/modetoolbar.h	2013-08-19 17:13:59.000000000 +0200
+@@ -51,13 +51,13 @@ public:
+ 
+ 	int SubMode;
+ 	int ValCount;
+-	qreal *ShapeVals;
++	double *ShapeVals;
+ 	
+ 	virtual void changeEvent(QEvent *e);
+ 
+ public slots:
+ 	void GetPolyProps();
+-	void SelShape(int s, int c, qreal *vals);
++	void SelShape(int s, int c, double *vals);
+ 	void languageChange();
+ 		
+ protected:
diff --git a/scribus.spec b/scribus.spec
index 8a4421b..2b2b973 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -13,7 +13,7 @@ Source0:        %{name}-%{version}-free.tar.xz
 #Source1:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
 # use versioned documentation directory
 Patch0:         %{name}-1.4.0-docdir.patch
-Patch1:         %{name}-to-double.patch
+Patch1:         %{name}-1.4.3-to-double.patch
 # fix build with non-free content removed
 Patch2:         %{name}-1.4.2-nonfree.patch
 
@@ -145,6 +145,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Sep 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-2
+- fix the double patch (#1009979)
+
 * Mon Aug 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-1
 - update to 1.4.3 (#990030)