Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Dan Horák | b845eb9727 | |
Tom Callaway | ff79b8f59a | |
Dan Horák | 3e2dd89782 |
|
@ -6,3 +6,4 @@ scribus-1.3.8.tar.bz2
|
|||
/scribus-1.4.1.tar.xz.asc
|
||||
/scribus-1.4.2-free.tar.xz
|
||||
/scribus-1.4.3-free.tar.xz
|
||||
/scribus-1.4.4-free.tar.xz
|
||||
|
|
|
@ -34,6 +34,9 @@ rm resources/swatches/givelife_colors_license.rtf
|
|||
|
||||
rm resources/swatches/Federal_Identity_Program.xml
|
||||
|
||||
# Remove non-free (CC-BY-SA-NC) dot files
|
||||
rm resources/editorconfig/dot.*
|
||||
|
||||
popd
|
||||
|
||||
echo "Creating sources ..."
|
||||
|
|
|
@ -35,3 +35,14 @@ Index: scribus-1.4.2/scribus/profiles/CMakeLists.txt
|
|||
-srgb.license
|
||||
DESTINATION ${SHAREDIR}profiles
|
||||
)
|
||||
diff -up scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot scribus-1.4.4/resources/editorconfig/CMakeLists.txt
|
||||
--- scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot 2014-06-06 17:22:12.258966553 -0400
|
||||
+++ scribus-1.4.4/resources/editorconfig/CMakeLists.txt 2014-06-06 17:22:16.326936717 -0400
|
||||
@@ -12,7 +12,6 @@ gnuplot.png
|
||||
300_lilypond.xml
|
||||
lilypond.png
|
||||
400_dot.xml
|
||||
-dot.svg
|
||||
500_povray.xml
|
||||
povray_32.png
|
||||
|
||||
|
|
|
@ -0,0 +1,138 @@
|
|||
Description: Avoid qreal/double type clashes on ARM
|
||||
Author: Colin Watson <cjwatson@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),
|
|
@ -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();
|
15
scribus.spec
15
scribus.spec
|
@ -1,6 +1,6 @@
|
|||
Name: scribus
|
||||
Version: 1.4.3
|
||||
Release: 1%{?dist}
|
||||
Version: 1.4.4
|
||||
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.4-qreal_double.patch
|
||||
# fix build with non-free content removed
|
||||
Patch2: %{name}-1.4.2-nonfree.patch
|
||||
|
||||
|
@ -145,6 +145,15 @@ update-desktop-database &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 28 2014 Dan Horák <dan[at]danny.cz> - 1.4.4-2
|
||||
- switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885)
|
||||
|
||||
* Fri Jun 6 2014 Tom Callaway <spot@fedoraproject.org> - 1.4.4-1
|
||||
- update to 1.4.4, drop non-free dot files
|
||||
|
||||
* 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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue