Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package scribus for openSUSE:Factory checked 
in at 2022-09-21 14:41:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scribus (Old)
 and      /work/SRC/openSUSE:Factory/.scribus.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "scribus"

Wed Sep 21 14:41:43 2022 rev:82 rq:1004934 version:1.5.8

Changes:
--------
--- /work/SRC/openSUSE:Factory/scribus/scribus.changes  2022-04-28 
23:07:21.448647568 +0200
+++ /work/SRC/openSUSE:Factory/.scribus.new.2083/scribus.changes        
2022-09-21 14:42:35.865782467 +0200
@@ -1,0 +2,6 @@
+Tue Sep 20 10:46:04 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add poppler 22.09 compatibility patch:
+  * scribus-1.5.8-poppler-22.09.0.patch
+
+-------------------------------------------------------------------

New:
----
  scribus-1.5.8-poppler-22.09.0.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ scribus.spec ++++++
--- /var/tmp/diff_new_pack.nWqoeE/_old  2022-09-21 14:42:36.949785473 +0200
+++ /var/tmp/diff_new_pack.nWqoeE/_new  2022-09-21 14:42:36.953785484 +0200
@@ -41,6 +41,8 @@
 Patch5:         0001-16764-Better-patch-avoid-a-memory-leak.patch
 # PATCH-FIX-UPSTREAM
 Patch6:         0001-Fix-build-with-poppler-22.04.0.patch
+# PATCH-FIX-UPSTREAM
+Patch7:         scribus-1.5.8-poppler-22.09.0.patch
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  cups-devel
 BuildRequires:  dos2unix

++++++ scribus-1.5.8-poppler-22.09.0.patch ++++++
poppler 22.09 compatibility.
Origin: archlinux
https://github.com/archlinux/svntogit-community/blob/packages/scribus/trunk/scribus-1.5.8-poppler-22.09.0.patch
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp 
b/scribus/plugins/import/pdf/slaoutput.cpp
index 8723b36..0f75cec 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -3627,9 +3627,16 @@ void SlaOutputDev::getPenState(GfxState *state)
                        break;
        }
        double lw = state->getLineWidth();
-       double *dashPattern;
        int dashLength;
-       state->getLineDash(&dashPattern, &dashLength, &DashOffset);
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)
+       const double *dashPattern;
+       const std::vector<double> &dash = state->getLineDash(&DashOffset);
+       dashPattern = dash.data();
+       dashLength = dash.size();
+#else
+       double *dashPattern;
+       state->getLineDash(&dashPattern, &dashLength, &DashOffset);
+#endif
        QVector<double> pattern(dashLength);
        for (int i = 0; i < dashLength; ++i)
        {

Reply via email to