- fix the double patch (#1009979)
This commit is contained in:
parent
8a5efe60b5
commit
48dcf240ac
49
scribus-1.4.3-to-double.patch
Normal file
49
scribus-1.4.3-to-double.patch
Normal file
@ -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:
|
@ -1,43 +0,0 @@
|
|||||||
--- Scribus/scribus/ui/modetoolbar.h.orig 2012-08-06 19:23:10.575771593 -0400
|
|
||||||
+++ Scribus/scribus/ui/modetoolbar.h 2012-08-06 19:23:17.106075153 -0400
|
|
||||||
@@ -51,13 +51,13 @@
|
|
||||||
|
|
||||||
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:
|
|
||||||
-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();
|
|
||||||
--- Scribus/scribus/ui/modetoolbar.cpp.orig 2012-08-06 20:58:27.562827072 -0400
|
|
||||||
+++ Scribus/scribus/ui/modetoolbar.cpp 2012-08-06 20:59:13.344968068 -0400
|
|
||||||
@@ -40,7 +40,7 @@
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
@@ -95,7 +95,7 @@
|
|
||||||
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();
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: scribus
|
Name: scribus
|
||||||
Version: 1.4.3
|
Version: 1.4.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Summary: DeskTop Publishing application written in Qt
|
Summary: DeskTop Publishing application written in Qt
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ URL: http://www.scribus.net/
|
|||||||
Source0: %{name}-%{version}-free.tar.xz
|
Source0: %{name}-%{version}-free.tar.xz
|
||||||
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
||||||
#Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
|
#Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
|
||||||
Patch1: %{name}-to-double.patch
|
Patch1: %{name}-1.4.3-to-double.patch
|
||||||
# fix build with non-free content removed
|
# fix build with non-free content removed
|
||||||
Patch2: %{name}-1.4.2-nonfree.patch
|
Patch2: %{name}-1.4.2-nonfree.patch
|
||||||
|
|
||||||
@ -142,6 +142,9 @@ update-desktop-database &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon Aug 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-1
|
||||||
- update to 1.4.3 (#990030)
|
- update to 1.4.3 (#990030)
|
||||||
- update for unversioned docdir
|
- update for unversioned docdir
|
||||||
|
Loading…
Reference in New Issue
Block a user