From 8a5efe60b535c5f44c86918f90dabc9a6a70b493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 19 Aug 2013 18:20:29 +0200 Subject: [PATCH 1/2] - update for unversioned docdir --- scribus-1.4.0-docdir.patch | 15 --------------- scribus.spec | 4 +--- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 scribus-1.4.0-docdir.patch diff --git a/scribus-1.4.0-docdir.patch b/scribus-1.4.0-docdir.patch deleted file mode 100644 index 8654a25..0000000 --- a/scribus-1.4.0-docdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up scribus-1.4.0/CMakeLists.txt.docdir scribus-1.4.0/CMakeLists.txt ---- scribus-1.4.0/CMakeLists.txt.docdir 2012-01-02 15:06:44.000000000 +0100 -+++ scribus-1.4.0/CMakeLists.txt 2012-01-02 15:06:57.000000000 +0100 -@@ -266,11 +266,7 @@ ELSE (WIN32 OR OS2) - IF(TAG_VERSION OR BUILD_OSX_BUNDLE) - SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") - ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) -- IF(NOT WANT_VERSIONING) -- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/") -- ELSE(NOT WANT_VERSIONING) - SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") -- ENDIF(NOT WANT_VERSIONING) - ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) - ENDIF (WIN32 OR OS2) - ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") diff --git a/scribus.spec b/scribus.spec index 8a4421b..4456637 100644 --- a/scribus.spec +++ b/scribus.spec @@ -11,8 +11,6 @@ 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 -# use versioned documentation directory -Patch0: %{name}-1.4.0-docdir.patch Patch1: %{name}-to-double.patch # fix build with non-free content removed Patch2: %{name}-1.4.2-nonfree.patch @@ -64,7 +62,6 @@ import/export and creation of color separations. %prep %setup -q -%patch0 -p1 -b .docdir %patch1 -p1 -b .double %patch2 -p1 -b .nonfree @@ -147,6 +144,7 @@ update-desktop-database &> /dev/null || : %changelog * Mon Aug 19 2013 Dan Horák - 1.4.3-1 - update to 1.4.3 (#990030) +- update for unversioned docdir * Sun Aug 04 2013 Fedora Release Engineering - 1.4.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 48dcf240ac4590adfed079402a6fb043b0d557c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 19 Sep 2013 21:54:21 +0200 Subject: [PATCH 2/2] - 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(-) create mode 100644 scribus-1.4.3-to-double.patch delete mode 100644 scribus-to-double.patch 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-to-double.patch b/scribus-to-double.patch deleted file mode 100644 index a646867..0000000 --- a/scribus-to-double.patch +++ /dev/null @@ -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(); diff --git a/scribus.spec b/scribus.spec index 4456637..c6ce61e 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 @@ -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}-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 @@ -142,6 +142,9 @@ update-desktop-database &> /dev/null || : %changelog +* Thu Sep 19 2013 Dan Horák - 1.4.3-2 +- fix the double patch (#1009979) + * Mon Aug 19 2013 Dan Horák - 1.4.3-1 - update to 1.4.3 (#990030) - update for unversioned docdir