commit scribus for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package scribus for openSUSE:Leap:15.2 checked in at 2020-05-11 08:40:48 Comparing /work/SRC/openSUSE:Leap:15.2/scribus (Old) and /work/SRC/openSUSE:Leap:15.2/.scribus.new.2738 (New) Package is "scribus" Mon May 11 08:40:48 2020 rev:25 rq:802355 version:1.5.5 Changes: --- /work/SRC/openSUSE:Leap:15.2/scribus/scribus.changes2020-04-14 14:24:02.929411867 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.scribus.new.2738/scribus.changes 2020-05-11 08:40:49.279215732 +0200 @@ -1,0 +2,6 @@ +Sat May 9 17:36:50 UTC 2020 - Wolfgang Bauer + +- Add 0001-Fix-build-with-Qt-5.15.patch to fix build with the + upcoming Qt 5.15 + +--- New: 0001-Fix-build-with-Qt-5.15.patch Other differences: -- ++ scribus.spec ++ --- /var/tmp/diff_new_pack.i7T886/_old 2020-05-11 08:40:50.003217299 +0200 +++ /var/tmp/diff_new_pack.i7T886/_new 2020-05-11 08:40:50.007217307 +0200 @@ -42,6 +42,8 @@ Patch6: Fails-to-build-with-python-3.8.patch # PATCH-FIX-UPSTREAM Patch7: 0001-PDF-import-plugin-support-poppler-0.86.x.patch +# PATCH-FIX-UPSTREAM +Patch8: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: breeze5-icons BuildRequires: cmake BuildRequires: cups-devel ++ 0001-Fix-build-with-Qt-5.15.patch ++ >From 78ee1626f3af37bf067b0c9d06156851bba31ee9 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Sun, 29 Mar 2020 11:16:13 +0200 Subject: [PATCH] Fix build with Qt 5.15 QPainterPath is no longer included via qtransform.h (since 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). --- scribus/ui/scresizecursor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp index f2c78e5ae..85271ed86 100644 --- a/scribus/ui/scresizecursor.cpp +++ b/scribus/ui/scresizecursor.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include -- 2.26.0
commit scribus for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package scribus for openSUSE:Leap:15.2
checked in at 2020-04-14 14:22:12
Comparing /work/SRC/openSUSE:Leap:15.2/scribus (Old)
and /work/SRC/openSUSE:Leap:15.2/.scribus.new.3248 (New)
Package is "scribus"
Tue Apr 14 14:22:12 2020 rev:24 rq:793632 version:1.5.5
Changes:
--- /work/SRC/openSUSE:Leap:15.2/scribus/scribus.changes2020-01-19
15:50:24.085806325 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.scribus.new.3248/scribus.changes
2020-04-14 14:24:02.929411867 +0200
@@ -1,0 +2,12 @@
+Wed Apr 8 10:51:25 UTC 2020 - Christophe Giboudeaux
+
+- Add upstream patch:
+ *0001-PDF-import-plugin-support-poppler-0.86.x.patch
+- Update:
+ * Fix-failure-to-build-against-poppler-0.83.0.patch
+ * Fix-failure-to-build-with-poppler-0.84.0.patch
+ * Use-same-mechanism-as-with-previous-poppler-versions.patch
+ * Work-around-poppler-0.82-signature-changes.patch
+ * port-scripter-to-Python-3.patch
+
+---
New:
0001-PDF-import-plugin-support-poppler-0.86.x.patch
Other differences:
--
++ scribus.spec ++
--- /var/tmp/diff_new_pack.1vW5CR/_old 2020-04-14 14:24:04.073412721 +0200
+++ /var/tmp/diff_new_pack.1vW5CR/_new 2020-04-14 14:24:04.077412724 +0200
@@ -40,6 +40,8 @@
Patch5: Fix-failure-to-build-with-poppler-0.84.0.patch
# PATCH-FIX-UPSTREAM
Patch6: Fails-to-build-with-python-3.8.patch
+# PATCH-FIX-UPSTREAM
+Patch7: 0001-PDF-import-plugin-support-poppler-0.86.x.patch
BuildRequires: breeze5-icons
BuildRequires: cmake
BuildRequires: cups-devel
@@ -117,11 +119,8 @@
%prep
%setup -q
# W: wrong-script-end-of-line-encoding
-dos2unix scribus/plugins/scriptplugin/scripts/Ligatursatz.py
-# necessary to be able to apply the patches
-dos2unix scribus/plugins/scriptplugin/cmdannotations.cpp
-dos2unix scribus/plugins/scriptplugin/cmddoc.cpp
-dos2unix scribus/plugins/scriptplugin/cmdstyle.cpp
+find . -type f -exec dos2unix {} \;
+
%autopatch -p1
%build
++ 0001-PDF-import-plugin-support-poppler-0.86.x.patch ++
>From 0413bebe7a8c08d75f6ea290d3ff54cb0df05a4e Mon Sep 17 00:00:00 2001
From: jghali
Date: Mon, 2 Mar 2020 14:45:59 +
Subject: [PATCH] PDF import plugin: support poppler 0.86.x
git-svn-id: svn://scribus.net/trunk/Scribus@23478
11d20701-8431-0410-a711-e3c959e3b870
---
scribus/plugins/import/pdf/importpdf.cpp | 53 ++-
scribus/plugins/import/pdf/importpdf.h | 19 ++-
scribus/plugins/import/pdf/slaoutput.cpp | 180 ---
scribus/plugins/import/pdf/slaoutput.h | 7 +
4 files changed, 226 insertions(+), 33 deletions(-)
diff --git a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
index 822617a..2c1539a 100644
--- a/scribus/plugins/import/pdf/importpdf.cpp
+++ b/scribus/plugins/import/pdf/importpdf.cpp
@@ -856,11 +856,20 @@ bool PdfPlug::convert(const QString& fn)
names =
catDict.dictLookup("OpenAction");
if
(names.isDict())
{
-
LinkAction *linkAction = nullptr;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
+
std::unique_ptr linkAction;
linkAction = LinkAction::parseAction(,
pdfDoc->getCatalog()->getBaseURI());
+#else
+
LinkAction *linkAction = nullptr;
+
linkAction = LinkAction::parseAction(,
pdfDoc->getCatalog()->getBaseURI());
+#endif
if
(linkAction)
{
-
LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
+
LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get();
+#else
+
LinkJavaScript *jsa = (LinkJavaScript*) linkAction;
+#endif
if (jsa->isOk())
{
commit scribus for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package scribus for openSUSE:Leap:15.2
checked in at 2020-01-19 15:48:50
Comparing /work/SRC/openSUSE:Leap:15.2/scribus (Old)
and /work/SRC/openSUSE:Leap:15.2/.scribus.new.26092 (New)
Package is "scribus"
Sun Jan 19 15:48:50 2020 rev:23 rq:765335 version:1.5.5
Changes:
--- /work/SRC/openSUSE:Leap:15.2/scribus/scribus.changes2020-01-15
16:01:38.619868960 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.scribus.new.26092/scribus.changes
2020-01-19 15:50:24.085806325 +0100
@@ -1,0 +2,12 @@
+Thu Jan 16 11:28:56 UTC 2020 - Wolfgang Bauer
+
+- Add port-scripter-to-Python-3.patch and build with python3
+- Add patches to fix build with newer poppler versions:
+ * Work-around-poppler-0.82-signature-changes.patch
+ * Use-same-mechanism-as-with-previous-poppler-versions.patch
+ * Fix-failure-to-build-against-poppler-0.83.0.patch
+ * Fix-failure-to-build-with-poppler-0.84.0.patch
+- Add Fails-to-build-with-python-3.8.patch to fix build with python
+ 3.8
+
+---
New:
Fails-to-build-with-python-3.8.patch
Fix-failure-to-build-against-poppler-0.83.0.patch
Fix-failure-to-build-with-poppler-0.84.0.patch
Use-same-mechanism-as-with-previous-poppler-versions.patch
Work-around-poppler-0.82-signature-changes.patch
port-scripter-to-Python-3.patch
Other differences:
--
++ scribus.spec ++
--- /var/tmp/diff_new_pack.26F1xK/_old 2020-01-19 15:50:25.329807063 +0100
+++ /var/tmp/diff_new_pack.26F1xK/_new 2020-01-19 15:50:25.329807063 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scribus
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) Peter Linnell and 2010 SUSE LINUX Products GmbH, Nuernberg,
Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -28,6 +28,18 @@
Source: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch
+# PATCH-FEATURE-UPSTREAM
+Patch1: port-scripter-to-Python-3.patch
+# PATCH-FIX-UPSTREAM
+Patch2: Work-around-poppler-0.82-signature-changes.patch
+# PATCH-FIX-UPSTREAM
+Patch3: Use-same-mechanism-as-with-previous-poppler-versions.patch
+# PATCH-FIX-UPSTREAM
+Patch4: Fix-failure-to-build-against-poppler-0.83.0.patch
+# PATCH-FIX-UPSTREAM
+Patch5: Fix-failure-to-build-with-poppler-0.84.0.patch
+# PATCH-FIX-UPSTREAM
+Patch6: Fails-to-build-with-python-3.8.patch
BuildRequires: breeze5-icons
BuildRequires: cmake
BuildRequires: cups-devel
@@ -47,7 +59,7 @@
BuildRequires: libwpg-devel
BuildRequires: libzmf-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python3-devel
BuildRequires: update-desktop-files
BuildRequires: cmake(Qt5Core) >= 5.7.0
BuildRequires: cmake(Qt5Gui) >= 5.7.0
@@ -72,8 +84,8 @@
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(poppler)
BuildRequires: pkgconfig(zlib)
-Recommends: python2-Pillow
-Recommends: python-tk
+Recommends: python3-Pillow
+Recommends: python3-tk
# Only available in graphics for the moment
Recommends: uniconvertor
Recommends: scribus-doc
@@ -103,9 +115,14 @@
This package provides the documentation for Scribus.
%prep
-%autosetup -p1
+%setup -q
# W: wrong-script-end-of-line-encoding
dos2unix scribus/plugins/scriptplugin/scripts/Ligatursatz.py
+# necessary to be able to apply the patches
+dos2unix scribus/plugins/scriptplugin/cmdannotations.cpp
+dos2unix scribus/plugins/scriptplugin/cmddoc.cpp
+dos2unix scribus/plugins/scriptplugin/cmdstyle.cpp
+%autopatch -p1
%build
# Don't use the %%cmake macro, it causes crashes when starting scribus
++ Fails-to-build-with-python-3.8.patch ++
>From df0ba0a365fd36bf4a4abac3b45e65a65a46c82c Mon Sep 17 00:00:00 2001
From: Jean Ghali
Date: Sun, 3 Nov 2019 01:15:12 +
Subject: [PATCH] #15901: Fails to build with python 3.8
git-svn-id: svn://scribus.net/trunk/Scribus@23314
11d20701-8431-0410-a711-e3c959e3b870
---
.../plugins/scriptplugin/objimageexport.cpp | 52 ---
scribus/plugins/scriptplugin/objpdffile.cpp | 13 -
scribus/plugins/scriptplugin/objprinter.cpp | 13 -
3 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/scribus/plugins/scriptplugin/objimageexport.cpp
b/scribus/plugins/scriptplugin/objimageexport.cpp
index cfc3c3fa06..7d2fb2f0a8 100644
--- a/scribus/plugins/scriptplugin/objimageexport.cpp
+++ b/scribus/plugins/scriptplugin/objimageexport.cpp
@@ -220,29 +220,62 @@ PyTypeObject ImageExport_Type = {
const_cast("scribus.ImageExport"), // char
