[packages/scribus] - updated to 1.5.6.1 - updated docs patch - removed obsolete sparc,qt-5.15,poppler-*,gcc10 patches -
qboosh
qboosh at pld-linux.org
Mon Dec 14 06:31:01 CET 2020
commit 134dcd0382ef50b0eac673d6beb863a8b41a7d28
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Dec 14 06:31:12 2020 +0100
- updated to 1.5.6.1
- updated docs patch
- removed obsolete sparc,qt-5.15,poppler-*,gcc10 patches
- standard-font-paths patch seems obsolete too (scribus now uses fontconfig to discover fonts)
gcc10.patch | 22 -----
poppler-0.84.0.patch | 157 -----------------------------
poppler-0.86.0.patch | 201 --------------------------------------
qt-5.15.patch | 10 --
scribus-docs.patch | 6 +-
scribus-sparc.patch | 28 ------
scribus-standard-font-paths.patch | 11 ---
scribus.spec | 33 +++----
8 files changed, 14 insertions(+), 454 deletions(-)
---
diff --git a/scribus.spec b/scribus.spec
index d991ec5..fab47f2 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -6,24 +6,18 @@
# Conditional build:
%bcond_without cups # CUPS support
#
-%define qt_ver 5.7.0
+%define qt_ver 5.11.0
Summary: Scribus - Open Source Desktop Publishing
Summary(pl.UTF-8): Scribus - DTP dla Wolnego Oprogramowania
Name: scribus
-Version: 1.5.5
-Release: 3
+Version: 1.5.6.1
+Release: 1
License: GPL v2+
Group: X11/Applications/Publishing
Source0: http://downloads.sourceforge.net/scribus/%{name}-%{version}.tar.xz
-# Source0-md5: 6a9ddc8c45356d3c6c741e4c7bb0565a
-Patch1: %{name}-standard-font-paths.patch
-Patch2: %{name}-docs.patch
-Patch3: %{name}-sparc.patch
-Patch4: qt-5.15.patch
-Patch5: poppler-0.84.0.patch
-Patch6: poppler-0.86.0.patch
-Patch7: gcc10.patch
-URL: http://www.scribus.net/
+# Source0-md5: 12700cd8c6f08ef02f50495d2ef2d3ce
+Patch0: %{name}-docs.patch
+URL: https://www.scribus.net/
BuildRequires: GraphicsMagick-devel
BuildRequires: Qt5Core-devel >= %{qt_ver}
BuildRequires: Qt5Gui-devel >= %{qt_ver}
@@ -34,7 +28,7 @@ BuildRequires: Qt5Widgets-devel >= %{qt_ver}
BuildRequires: Qt5Xml-devel >= %{qt_ver}
BuildRequires: boost-devel
BuildRequires: cairo-devel >= 1.2.0
-BuildRequires: cmake >= 3.2.0
+BuildRequires: cmake >= 3.12.0
%if %{with cups}
BuildRequires: cups-devel
%else
@@ -54,8 +48,7 @@ BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libmspub-devel >= 0.1
BuildRequires: libpagemaker-devel
-# disabled in 1.5.5
-#BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 1.6
BuildRequires: libqxp-devel
BuildRequires: librevenge-devel
BuildRequires: libstdc++-devel >= 6:4.7
@@ -162,13 +155,7 @@ Domyślne szablony dokumentów dostarczane wraz ze Scribusem.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
%build
mkdir -p build
@@ -195,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.{kn_IN,kn}.qm
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.{lt_LT,lt}.qm
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.{mn_MN,mn}.qm
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.{ms_MY,ms}.qm
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.{nb_NO,nb}.qm
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.{pl_PL,pl}.qm
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.{pt_PT,pt}.qm
@@ -263,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/doc/en
%lang(de) %{_datadir}/%{name}/doc/de
%lang(it) %{_datadir}/%{name}/doc/it
+%lang(ru) %{_datadir}/%{name}/doc/ru
%files icc
%defattr(644,root,root,755)
diff --git a/gcc10.patch b/gcc10.patch
deleted file mode 100644
index ba7747c..0000000
--- a/gcc10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- scribus-1.5.5/scribus/plugins/import/pdf/slaoutput.h~ 2020-08-01 12:12:08.000000000 +0200
-+++ scribus-1.5.5/scribus/plugins/import/pdf/slaoutput.h 2020-08-01 12:15:46.683302925 +0200
-@@ -229,7 +229,7 @@
-
- //----- image drawing
- void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;
-- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override;
-+ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg);
- void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
- int width, int height,
- GfxImageColorMap *colorMap,
-@@ -261,8 +261,8 @@
- //----- text drawing
- void beginTextObject(GfxState *state) override;
- void endTextObject(GfxState *state) override;
-- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override;
-- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override;
-+ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/);
-+ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/);
- void endType3Char(GfxState * /*state*/) override;
- void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override;
- void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override;
diff --git a/poppler-0.84.0.patch b/poppler-0.84.0.patch
deleted file mode 100644
index 3c44024..0000000
--- a/poppler-0.84.0.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags)
- QImage PdfPlug::readThumbnail(const QString& fName)
- {
- QString pdfFile = QDir::toNativeSeparators(fName);
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+ globalParams.reset(new GlobalParams());
-+#else
- globalParams = new GlobalParams();
-+#endif
- if (globalParams)
- {
- #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0)
-@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- if (pdfDoc->getErrorCode() == errEncrypted)
- {
- delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- delete globalParams;
-+#endif
- return QImage();
- }
- if (pdfDoc->isOk())
-@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- image.setText("YSize", QString("%1").arg(h));
- delete dev;
- delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- delete globalParams;
-+#endif
- return image;
- }
- delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- delete globalParams;
-+#endif
- }
- }
- return QImage();
-@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn)
- qApp->processEvents();
- }
-
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+ globalParams.reset(new GlobalParams());
-+#else
- globalParams = new GlobalParams();
-+#endif
- GooString *userPW = nullptr;
- if (globalParams)
- {
-@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn)
- if (progressDialog)
- progressDialog->close();
- delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- delete globalParams;
-+#endif
- return false;
- }
- if (progressDialog)
-@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn)
- progressDialog->close();
- delete optImp;
- delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- delete globalParams;
-+#endif
- return false;
- }
- pageString = optImp->getPagesString();
-@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& fn)
- }
- delete pdfDoc;
- }
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+ globalParams.release();
-+#else
- delete globalParams;
- globalParams = nullptr;
-+#endif
-
- // qDebug() << "converting finished";
- // qDebug() << "Imported" << Elements.count() << "Elements";
-diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h
-index 9913ee382..5a7e0d216 100644
---- a/scribus/plugins/import/pdf/importpdfconfig.h
-+++ b/scribus/plugins/import/pdf/importpdfconfig.h
-@@ -58,4 +58,10 @@ for which a new license (GPL+exception) is in place.
- #define POPPLER_CONST_082
- #endif
-
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+#define POPPLER_CONST_083 const
-+#else
-+#define POPPLER_CONST_083
-+#endif
-+
- #endif
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 5e4d32a55..ffcfa8450 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3678,7 +3678,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotColor *color)
- return fNam;
- }
-
--QString SlaOutputDev::convertPath(GfxPath *path)
-+QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path)
- {
- if (! path)
- return QString();
-@@ -3688,7 +3688,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
-
- for (int i = 0; i < path->getNumSubpaths(); ++i)
- {
-- GfxSubpath * subpath = path->getSubpath(i);
-+ POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i);
- if (subpath->getNumPoints() > 0)
- {
- output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 60fb90061..d928fada8 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -282,7 +282,7 @@ private:
- void getPenState(GfxState *state);
- QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade);
- QString getAnnotationColor(const AnnotColor *color);
-- QString convertPath(GfxPath *path);
-+ QString convertPath(POPPLER_CONST_083 GfxPath *path);
- int getBlendMode(GfxState *state);
- void applyMask(PageItem *ite);
- void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
- catalog = catA;
- pdfDoc = doc;
- updateGUICounter = 0;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
-+ m_fontEngine = new SplashFontEngine(true, true, true, true);
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
-+ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true);
-+#else
- m_fontEngine = new SplashFontEngine(
- #if HAVE_T1LIB_H
- globalParams->getEnableT1lib(),
-@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
- true,
- #endif
- true);
-+#endif
- }
-
- void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
diff --git a/poppler-0.86.0.patch b/poppler-0.86.0.patch
deleted file mode 100644
index 8200f64..0000000
--- a/poppler-0.86.0.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- scribus-1.5.6/scribus/plugins/import/pdf/importpdf.cpp
-+++ scribus-1.5.6/scribus/plugins/import/pdf/importpdf.cpp
-@@ -792,14 +792,15 @@ bool PdfPlug::convert(const QString& fn)
- names = catDict.dictLookup("OpenAction");
- if (names.isDict())
- {
-- LinkAction *linkAction = nullptr;
-+ std::unique_ptr<::LinkAction> linkAction;
- linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());
- if (linkAction)
- {
-- LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
-+ LinkJavaScript *jsa = static_cast<LinkJavaScript *>(linkAction.get());
- if (jsa->isOk())
- {
-- QString script = UnicodeParsedString(jsa->getScript());
-+ const GooString scriptGooString(jsa->getScript());
-+ QString script = UnicodeParsedString(&scriptGooString);
- if (script.startsWith("this."))
- {
- script.remove(0, 5);
---- scribus-1.5.6/scribus/plugins/import/pdf/slaoutput.cpp
-+++ scribus-1.5.6/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -324,7 +324,7 @@ LinkAction* SlaOutputDev::SC_getAddition
- {
- Object actionObject = additionalActionsObject.dictLookup(key);
- if (actionObject.isDict())
-- linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI());
-+ linkAction = (LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI())).release();
- }
- }
- return linkAction;
-@@ -455,7 +455,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot
- POPPLER_CONST GooString *ndst = gto->getNamedDest();
- if (ndst)
- {
-- LinkDest *dstn = pdfDoc->findDest(ndst);
-+ std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
- if (dstn)
- {
- if (dstn->getKind() == destXYZ)
-@@ -499,7 +499,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot
- POPPLER_CONST GooString *ndst = gto->getNamedDest();
- if (ndst)
- {
-- LinkDest *dstn = pdfDoc->findDest(ndst);
-+ std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
- if (dstn)
- {
- if (dstn->getKind() == destXYZ)
-@@ -516,8 +516,9 @@ bool SlaOutputDev::handleLinkAnnot(Annot
- else if (act->getKind() == actionURI)
- {
- LinkURI *gto = (LinkURI*)act;
-+ const GooString uriGooString(gto->getURI());
- validLink = true;
-- fileName = UnicodeParsedString(gto->getURI());
-+ fileName = UnicodeParsedString(&uriGooString);
- }
- if (validLink)
- {
-@@ -929,8 +930,9 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Lact;
- if (jsa->isOk())
- {
-+ const GooString scriptGooString(jsa->getScript());
- ite->annotation().setActionType(1);
-- ite->annotation().setAction(UnicodeParsedString(jsa->getScript()));
-+ ite->annotation().setAction(UnicodeParsedString(&scriptGooString));
- }
- }
- else if (Lact->getKind() == actionGoTo)
-@@ -967,7 +969,7 @@ void SlaOutputDev::handleActions(PageIte
- POPPLER_CONST GooString *ndst = gto->getNamedDest();
- if (ndst)
- {
-- LinkDest *dstn = pdfDoc->findDest(ndst);
-+ std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
- if (dstn)
- {
- if (dstn->getKind() == destXYZ)
-@@ -1019,7 +1021,7 @@ void SlaOutputDev::handleActions(PageIte
- POPPLER_CONST GooString *ndst = gto->getNamedDest();
- if (ndst)
- {
-- LinkDest *dstn = pdfDoc->findDest(ndst);
-+ std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
- if (dstn)
- {
- if (dstn->getKind() == destXYZ)
-@@ -1039,7 +1041,8 @@ void SlaOutputDev::handleActions(PageIte
- else if (Lact->getKind() == actionUnknown)
- {
- LinkUnknown *uno = (LinkUnknown*)Lact;
-- QString actString = UnicodeParsedString(uno->getAction());
-+ const GooString actionGooString(uno->getAction());
-+ QString actString = UnicodeParsedString(&actionGooString);
- if (actString == "ResetForm")
- {
- ite->annotation().setActionType(4);
-@@ -1082,8 +1085,9 @@ void SlaOutputDev::handleActions(PageIte
- else if (Lact->getKind() == actionNamed)
- {
- LinkNamed *uno = (LinkNamed*)Lact;
-+ const GooString nameGooString(uno->getName());
- ite->annotation().setActionType(10);
-- ite->annotation().setAction(UnicodeParsedString(uno->getName()));
-+ ite->annotation().setAction(UnicodeParsedString(&nameGooString));
- }
- else
- qDebug() << "Found unsupported Action of type" << Lact->getKind();
-@@ -1096,7 +1100,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setD_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- }
- }
-@@ -1110,7 +1115,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setE_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- }
- }
-@@ -1124,7 +1130,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setX_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- }
- }
-@@ -1138,7 +1145,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setFo_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- }
- }
-@@ -1152,7 +1160,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setBl_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- }
- }
-@@ -1166,7 +1175,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setC_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- }
- }
-@@ -1180,7 +1190,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setF_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- ite->annotation().setFormat(5);
- }
-@@ -1195,7 +1206,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setK_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- ite->annotation().setFormat(5);
- }
-@@ -1210,7 +1222,8 @@ void SlaOutputDev::handleActions(PageIte
- LinkJavaScript *jsa = (LinkJavaScript*)Aact;
- if (jsa->isOk())
- {
-- ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));
-+ const GooString scriptGooString(jsa->getScript());
-+ ite->annotation().setV_act(UnicodeParsedString(&scriptGooString));
- ite->annotation().setAAact(true);
- }
- }
diff --git a/qt-5.15.patch b/qt-5.15.patch
deleted file mode 100644
index 5b9bc00..0000000
--- a/qt-5.15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- scribus-1.5.5/scribus/ui/scresizecursor.cpp~ 2019-07-31 00:34:50.000000000 +0200
-+++ scribus-1.5.5/scribus/ui/scresizecursor.cpp 2020-08-01 12:08:46.353067959 +0200
-@@ -12,6 +12,7 @@
-
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QPen>
- #include <QBrush>
diff --git a/scribus-docs.patch b/scribus-docs.patch
index 2635059..19f92a6 100644
--- a/scribus-docs.patch
+++ b/scribus-docs.patch
@@ -1,6 +1,6 @@
---- scribus-1.5.5/CMakeLists.txt~ 2019-07-31 00:34:43.000000000 +0200
-+++ scribus-1.5.5/CMakeLists.txt 2020-08-01 11:43:01.688045033 +0200
-@@ -316,11 +316,11 @@
+--- scribus-1.5.6.1/CMakeLists_Directories.cmake.orig 2020-11-14 23:37:41.000000000 +0100
++++ scribus-1.5.6.1/CMakeLists_Directories.cmake 2020-12-13 06:30:34.902088690 +0100
+@@ -39,11 +39,11 @@
if(WIN32 OR OS2)
set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
diff --git a/scribus-sparc.patch b/scribus-sparc.patch
deleted file mode 100644
index 6ea3fdf..0000000
--- a/scribus-sparc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- scribus-1.3.3.11/CMakeLists.txt.orig 2008-05-11 15:01:48.000000000 +0000
-+++ scribus-1.3.3.11/CMakeLists.txt 2008-05-11 15:06:05.000000000 +0000
-@@ -74,6 +74,25 @@
- SET(ARCH_PPC 1)
- ENDIF (_machine_ppc)
-
-+STRING(REGEX MATCH "(sparc-*)" _machine_sparc "${MACHINE}")
-+IF (_machine_sparc)
-+ MESSAGE(STATUS "Found target Sparc")
-+ SET(ARCH_SPARC 1)
-+ENDIF (_machine_sparc)
-+
-+STRING(REGEX MATCH "(sparcv9-*)" _machine_sparcv9 "${MACHINE}")
-+IF (_machine_sparcv9)
-+ MESSAGE(STATUS "Found target Sparc v9")
-+ SET(ARCH_SPARCV9 1)
-+ENDIF (_machine_sparcv9)
-+
-+STRING(REGEX MATCH "(sparc64-*)" _machine_sparc64 "${MACHINE}")
-+IF (_machine_sparc64)
-+ MESSAGE(STATUS "Found target Sparc64")
-+ SET(ARCH_SPARC64 1)
-+ SET(ARCH64BIT 1)
-+ENDIF (_machine_sparc64)
-+
- #convert any 64 bit build into generic 64 tag for below
- IF (ARCH_X86_64)
- SET(ARCH64BIT 1)
diff --git a/scribus-standard-font-paths.patch b/scribus-standard-font-paths.patch
deleted file mode 100644
index bc1742a..0000000
--- a/scribus-standard-font-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus-0.8/scribus/scfonts.cpp.orig Sun Sep 22 10:54:38 2002
-+++ scribus-0.8/scribus/scfonts.cpp Thu Oct 24 11:53:26 2002
-@@ -1048,6 +1048,8 @@
- char **fontpath=XGetFontPath(display,&pathcount);
- for (i=0; i<pathcount; ++i)
- addPath(fontpath[i]);
-+ addPath("/usr/share/fonts/Type1");
-+ addPath("/usr/share/fonts/TTF");
- XFreeFontPath(fontpath);
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/scribus.git/commitdiff/134dcd0382ef50b0eac673d6beb863a8b41a7d28
More information about the pld-cvs-commit
mailing list