From fcc50c9835e35da89b8b5f83814e50a7bf8c293b Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2014 14:29:24 +0200 Subject: [PATCH 1/6] Rebuild for boost 1.55.0 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index c6ce61e..7dbe404 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DeskTop Publishing application written in Qt @@ -142,6 +142,9 @@ update-desktop-database &> /dev/null || : %changelog +* Fri May 23 2014 Petr Machata - 1.4.3-3 +- Rebuild for boost 1.55.0 + * Thu Sep 19 2013 Dan Horák - 1.4.3-2 - fix the double patch (#1009979) From 6b9f626b6377c6d8ff41284700a09b01b743bf97 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 6 Jun 2014 17:43:10 -0400 Subject: [PATCH 2/6] 1.4.4, remove non-free dot files --- .gitignore | 1 + make-free-archive.sh | 3 +++ scribus-1.4.2-nonfree.patch | 11 +++++++++++ scribus.spec | 7 +++++-- sources | 2 +- 5 files changed, 21 insertions(+), 3 deletions(-) mode change 100644 => 100755 make-free-archive.sh diff --git a/.gitignore b/.gitignore index 0f27afd..3821ef3 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/make-free-archive.sh b/make-free-archive.sh old mode 100644 new mode 100755 index 62176bc..028d757 --- a/make-free-archive.sh +++ b/make-free-archive.sh @@ -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 ..." diff --git a/scribus-1.4.2-nonfree.patch b/scribus-1.4.2-nonfree.patch index 94248a2..7f13fe6 100644 --- a/scribus-1.4.2-nonfree.patch +++ b/scribus-1.4.2-nonfree.patch @@ -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 + diff --git a/scribus.spec b/scribus.spec index 7dbe404..b20e2bc 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: DeskTop Publishing application written in Qt @@ -142,6 +142,9 @@ update-desktop-database &> /dev/null || : %changelog +* Fri Jun 6 2014 Tom Callaway - 1.4.4-1 +- update to 1.4.4, drop non-free dot files + * Fri May 23 2014 Petr Machata - 1.4.3-3 - Rebuild for boost 1.55.0 diff --git a/sources b/sources index e7fab26..8ea4abe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f63f615842f05fb36cd5401bcaa54386 scribus-1.4.3-free.tar.xz +1373e797409c1d6477a1f3cb9d061d0e scribus-1.4.4-free.tar.xz From d1f572a37b03d12b4d7351d13e2702dcb39069d4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 9 Aug 2014 11:28:00 -0500 Subject: [PATCH 3/6] optimize/update scriptlets --- scribus.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scribus.spec b/scribus.spec index b20e2bc..87be323 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DeskTop Publishing application written in Qt @@ -117,13 +117,19 @@ rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name} %post -update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database &> /dev/null || : - +touch --no-create %{_datadir}/mime/packages &> /dev/null || : %postun -update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +if [ $1 -eq 0 ] ; then +touch --no-create %{_datadir}/mime/packages &> /dev/null || : update-desktop-database &> /dev/null || : +update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +fi + +%posttrans +update-desktop-database &> /dev/null || : +update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : + %files @@ -142,6 +148,9 @@ update-desktop-database &> /dev/null || : %changelog +* Sat Aug 09 2014 Rex Dieter 1.4.4-2 +- optimize/update scriptlets + * Fri Jun 6 2014 Tom Callaway - 1.4.4-1 - update to 1.4.4, drop non-free dot files From 867608c327b4572b3a9b45d9b6d653da2755105d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 01:46:22 +0000 Subject: [PATCH 4/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 87be323..ea98f7e 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DeskTop Publishing application written in Qt @@ -148,6 +148,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Aug 09 2014 Rex Dieter 1.4.4-2 - optimize/update scriptlets From b003a2ea5cb34c47ae6ed1bfa18992f005de582a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 20 Aug 2014 17:31:31 -0600 Subject: [PATCH 5/6] Rebuild for rpm bug 1131892 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index ea98f7e..95db5ac 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: DeskTop Publishing application written in Qt @@ -148,6 +148,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Aug 20 2014 Kevin Fenzi - 1.4.4-4 +- Rebuild for rpm bug 1131892 + * Mon Aug 18 2014 Fedora Release Engineering - 1.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From f419b028eb256f58dd6a1727e30be19163a702eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 28 Aug 2014 14:55:24 +0200 Subject: [PATCH 6/6] - 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(-) delete mode 100644 scribus-1.4.3-to-double.patch create mode 100644 scribus-1.4.4-qreal_double.patch diff --git a/scribus-1.4.3-to-double.patch b/scribus-1.4.3-to-double.patch deleted file mode 100644 index 055bd10..0000000 --- a/scribus-1.4.3-to-double.patch +++ /dev/null @@ -1,49 +0,0 @@ -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-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 +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 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* 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* 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* 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* 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 - 1.4.4-5 +- switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885) + * Wed Aug 20 2014 Kevin Fenzi - 1.4.4-4 - Rebuild for rpm bug 1131892