rpm/scribus
SHA256
1
0
Fork 0
forked from pool/scribus
Code Pull Requests Activity

Accepting request 888442 from home:wolfi323:branches:KDE:Extra

Browse Source 
- Update to 1.5.7
  * General:
    + Improvements for undo and redo of grouped items
    + Support for later versions of dependencies such as poppler
      and podofo
    + Fixed: Issue with Qt menu heuristics causing translations not
      to work
    + As of version 1.5.7, the minimum Qt version to compile
      Scribus is 5.14
  * PDF import:
    + As of version 1.5.7, Scribus can import text as editable text
      from PDF files. It should be noted that this new feature is
      still experimental.
  * PDF export:
    + Improved font embedding for OpenType fonts in PDF/X-4
  * User interface:
    + Unification and standardization of the user interface
      regarding margins, button and widget sizing, thanks to the
      tireless work of Gyuris Gellért
  * Render frames:
    + Render frames are now pre-configured for the use of XeLaTeX
- Drop patches merged upstream:
  * 0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
  * 0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
  * 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch
- Rebase 0001-Make-sure-information-displayed-on-the-about-window-.patch

OBS-URL: https://build.opensuse.org/request/show/888442
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=69
This commit is contained in:
Christophe Giboudeaux 2021-04-26 11:14:34 +00:00 committed by Git OBS Bridge
parent 40c168528d
commit 42e2ac9561
8 changed files with 53 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
0001-Make-sure-information-displayed-on-the-about-window-.patch
View File

@ -16,18 +16,18 @@ diff --git a/scribus/ui/about.cpp b/scribus/ui/about.cpp
index b70d1eb..d1a4f1b 100644 index b70d1eb..d1a4f1b 100644
--- a/scribus/ui/about.cpp --- a/scribus/ui/about.cpp
+++ b/scribus/ui/about.cpp +++ b/scribus/ui/about.cpp
@@ -179,7 +179,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) @@ -164,7 +164,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
tabLayout->setSpacing(6); tabLayout->setSpacing(6);
tabLayout->setMargin( 10 ); tabLayout->setContentsMargins(9, 9, 9, 9);
authorView = new QTextBrowser( tab_2 ); authorView = new QTextBrowser( tab_2 );
- authorView->setHtml(About::parseAuthorFile(ScPaths::instance().docDir() + "AUTHORS")); - authorView->setHtml(About::parseAuthorFile(ScPaths::instance().docDir() + "AUTHORS"));
+ authorView->setHtml(About::parseAuthorFile(ScPaths::instance().shareDir() + "/aboutData/AUTHORS")); + authorView->setHtml(About::parseAuthorFile(ScPaths::instance().shareDir() + "/aboutData/AUTHORS"));
tabLayout->addWidget( authorView ); tabLayout->addWidget( authorView );
tabWidget2->addTab( tab_2, tr("A&uthors")); tabWidget2->addTab( tab_2, tr("A&uthors"));
@@ -189,14 +189,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) @@ -174,14 +174,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
tabLayout_2->setSpacing(6); tabLayout_2->setSpacing(6);
tabLayout_2->setMargin( 10 ); tabLayout_2->setContentsMargins(9, 9, 9, 9);
transView = new QTextBrowser( tab_3); transView = new QTextBrowser( tab_3);
- transView->setHtml(About::parseTranslationFile(ScPaths::instance().docDir() + "TRANSLATION")); - transView->setHtml(About::parseTranslationFile(ScPaths::instance().docDir() + "TRANSLATION"));
+ transView->setHtml(About::parseTranslationFile(ScPaths::instance().shareDir() + "/aboutData/TRANSLATION")); + transView->setHtml(About::parseTranslationFile(ScPaths::instance().shareDir() + "/aboutData/TRANSLATION"));
@ -42,7 +42,7 @@ index b70d1eb..d1a4f1b 100644
onlineView->setOpenExternalLinks(true); onlineView->setOpenExternalLinks(true);
tabLayout_4 = new QHBoxLayout( tab_4 ); tabLayout_4 = new QHBoxLayout( tab_4 );
tabLayout_4->setSpacing(6); tabLayout_4->setSpacing(6);
@@ -225,7 +225,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) @@ -210,7 +210,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
textViewLicence = new QTextBrowser( tab_Licence); textViewLicence = new QTextBrowser( tab_Licence);
licenceLayout->addWidget( textViewLicence ); licenceLayout->addWidget( textViewLicence );

53
0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
View File

@ -1,53 +0,0 @@
From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Mon, 1 Mar 2021 21:52:54 +0000
Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler
21.03.0
git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++-
scribus/plugins/import/pdf/slaoutput.h | 4 ++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index 7cbc73e8d4..d1b37a0c21 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh
return gTrue;
}
-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep)
+#else
+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
+#endif
{
// qDebug() << "SlaOutputDev::tilingPatternFill";
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
+ const double *bbox = tPat->getBBox();
+ const double *pmat = tPat->getMatrix();
+ Dict *resDict = tPat->getResDict();
+#endif
+
PDFRectangle box;
Gfx *gfx;
QString id;
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
index 5149f19e31..66c34203ae 100644
--- a/scribus/plugins/import/pdf/slaoutput.h
+++ b/scribus/plugins/import/pdf/slaoutput.h
@@ -196,7 +196,11 @@ class SlaOutputDev : public OutputDev
void stroke(GfxState *state) override;
void fill(GfxState *state) override;
void eoFill(GfxState *state) override;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
+#else
GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
+#endif
GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; }
GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override { return (shading->getExtend0() == shading->getExtend1()); }

27
0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
View File

@ -1,27 +0,0 @@
From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Mon, 1 Mar 2021 22:00:02 +0000
Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler
21.03.0
git-svn-id: svn://scribus.net/trunk/Scribus@24538 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/plugins/import/pdf/slaoutput.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index d1b37a0c21..de0a4145ef 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -2335,7 +2335,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c
// Unset the clip path as it is unrelated to the pattern's coordinate space.
QPainterPath savedClip = m_currentClipPath;
m_currentClipPath = QPainterPath();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
+ gfx->display(tPat->getContentStream());
+#else
gfx->display(str);
+#endif
m_currentClipPath = savedClip;
inPattern--;
gElements = m_groupStack.pop();

27
0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch
View File

@ -1,27 +0,0 @@
From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Sun, 4 Apr 2021 21:37:04 +0000
Subject: [PATCH] #16536: Page::getFormWidgets() returns unique_ptr in poppler
21.04.0
git-svn-id: svn://scribus.net/trunk/Scribus@24599 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/plugins/import/pdf/slaoutput.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
index 66c34203ae..cb191b1023 100644
--- a/scribus/plugins/import/pdf/slaoutput.h
+++ b/scribus/plugins/import/pdf/slaoutput.h
@@ -379,7 +379,11 @@ class SlaOutputDev : public OutputDev
Catalog *catalog {nullptr};
SplashFontEngine *m_fontEngine {nullptr};
SplashFont *m_font {nullptr};
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0)
+ std::unique_ptr<FormPageWidgets> m_formWidgets;
+#else
FormPageWidgets *m_formWidgets {nullptr};
+#endif
QHash<QString, QList<int> > m_radioMap;
QHash<int, PageItem*> m_radioButtons;
int m_actPage;

3
scribus-1.5.6.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
size 74307132

3
scribus-1.5.7.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
size 74490040

30
scribus.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Mon Apr 26 09:23:12 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
- Update to 1.5.7
* General:
+ Improvements for undo and redo of grouped items
+ Support for later versions of dependencies such as poppler
and podofo
+ Fixed: Issue with Qt menu heuristics causing translations not
to work
+ As of version 1.5.7, the minimum Qt version to compile
Scribus is 5.14
* PDF import:
+ As of version 1.5.7, Scribus can import text as editable text
from PDF files. It should be noted that this new feature is
still experimental.
* PDF export:
+ Improved font embedding for OpenType fonts in PDF/X-4
* User interface:
+ Unification and standardization of the user interface
regarding margins, button and widget sizing, thanks to the
tireless work of Gyuris Gellért
* Render frames:
+ Render frames are now pre-configured for the use of XeLaTeX
- Drop patches merged upstream:
* 0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
* 0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
* 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch
- Rebase 0001-Make-sure-information-displayed-on-the-about-window-.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 16 16:21:16 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr> Fri Apr 16 16:21:16 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

27
scribus.spec
View File

@ -18,22 +18,17 @@
Name: scribus Name: scribus
Version: 1.5.6.1 Version: 1.5.7
Release: 0 Release: 0
Summary: Page Layout and Desktop Publishing (DTP) Summary: Page Layout and Desktop Publishing (DTP)
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Publishing/Other Group: Productivity/Publishing/Other
URL: https://www.scribus.net/ URL: https://www.scribus.net/
# https://sourceforge.net/projects/scribus/files/scribus-devel/1.5.6.1/ # https://sourceforge.net/projects/scribus/files/scribus-devel/1.5.7/
Source: %{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch
# PATCH-FIX-UPSTREAM BuildRequires: cmake >= 3.14.0
Patch1: 0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
Patch2: 0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch
# PATCH-FIX-UPSTREAM
Patch3: 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch
BuildRequires: cmake >= 3.12.0
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
@ -54,14 +49,14 @@ BuildRequires: libzmf-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: cmake(Qt5Core) >= 5.11.0 BuildRequires: cmake(Qt5Core) >= 5.14.0
BuildRequires: cmake(Qt5Gui) >= 5.11.0 BuildRequires: cmake(Qt5Gui) >= 5.14.0
BuildRequires: cmake(Qt5LinguistTools) >= 5.11.0 BuildRequires: cmake(Qt5LinguistTools) >= 5.14.0
BuildRequires: cmake(Qt5Network) >= 5.11.0 BuildRequires: cmake(Qt5Network) >= 5.14.0
BuildRequires: cmake(Qt5OpenGL) >= 5.11.0 BuildRequires: cmake(Qt5OpenGL) >= 5.14.0
BuildRequires: cmake(Qt5PrintSupport) >= 5.11.0 BuildRequires: cmake(Qt5PrintSupport) >= 5.14.0
BuildRequires: cmake(Qt5Widgets) >= 5.11.0 BuildRequires: cmake(Qt5Widgets) >= 5.14.0
BuildRequires: cmake(Qt5Xml) >= 5.11.0 BuildRequires: cmake(Qt5Xml) >= 5.14.0
BuildRequires: pkgconfig(GraphicsMagick) BuildRequires: pkgconfig(GraphicsMagick)
BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)