Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package scribus for openSUSE:Factory checked 
in at 2025-07-16 17:35:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scribus (Old)
 and      /work/SRC/openSUSE:Factory/.scribus.new.7373 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "scribus"

Wed Jul 16 17:35:24 2025 rev:92 rq:1293491 version:1.6.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/scribus/scribus.changes  2025-06-10 
08:56:45.702276218 +0200
+++ /work/SRC/openSUSE:Factory/.scribus.new.7373/scribus.changes        
2025-07-16 17:35:27.580719478 +0200
@@ -1,0 +2,11 @@
+Tue Jul 15 16:51:19 UTC 2025 - Christophe Marin <christo...@krop.fr>
+
+- Amend 0001-Fix-build-with-PoDoFo-1.0.0.patch to really fix build with podofo 
1.0
+
+-------------------------------------------------------------------
+Tue Jul 15 08:08:58 UTC 2025 - Bjørn Lie <bjorn....@gmail.com>
+
+- Add  0001-Fix-build-with-poppler-25.07.0.patch: Fix build with
+  poppler 25.07.0
+
+-------------------------------------------------------------------

New:
----
  0001-Fix-build-with-poppler-25.07.0.patch

----------(New B)----------
  New:
- Add  0001-Fix-build-with-poppler-25.07.0.patch: Fix build with
  poppler 25.07.0
----------(New E)----------

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

Other differences:
------------------
++++++ scribus.spec ++++++
--- /var/tmp/diff_new_pack.hXpq6Y/_old  2025-07-16 17:35:28.468756610 +0200
+++ /var/tmp/diff_new_pack.hXpq6Y/_new  2025-07-16 17:35:28.468756610 +0200
@@ -45,6 +45,8 @@
 Patch1:         0001-Fix-build-with-poppler-25.06.0.patch
 # PATCH-FIX-UPSTREAM
 Patch2:         0001-Fix-build-with-PoDoFo-1.0.0.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         0001-Fix-build-with-poppler-25.07.0.patch
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  cups-devel
 BuildRequires:  dos2unix
@@ -58,6 +60,7 @@
 %if %{with podofo}
 BuildRequires:  libpodofo-devel
 %endif
+BuildRequires:  %{pyver}-devel
 BuildRequires:  libqxp-devel
 BuildRequires:  librevenge-devel
 BuildRequires:  libtiff-devel
@@ -66,7 +69,6 @@
 BuildRequires:  libwpg-devel
 BuildRequires:  libzmf-devel
 BuildRequires:  pkgconfig
-BuildRequires:  %{pyver}-devel
 BuildRequires:  cmake(Qt5Core) >= 5.14.0
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)

++++++ 0001-Fix-build-with-PoDoFo-1.0.0.patch ++++++
--- /var/tmp/diff_new_pack.hXpq6Y/_old  2025-07-16 17:35:28.488757446 +0200
+++ /var/tmp/diff_new_pack.hXpq6Y/_new  2025-07-16 17:35:28.492757613 +0200
@@ -1,19 +1,44 @@
-From 857b62b7e88eb024539650a3de3c9b26c338ff64 Mon Sep 17 00:00:00 2001
+From 714feaa96db8c0ad86b43e0a69833a5ec24b7c62 Mon Sep 17 00:00:00 2001
 From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
 Date: Fri, 6 Jun 2025 23:40:58 +0000
 Subject: [PATCH] Fix build with PoDoFo 1.0.0
 
 git-svn-id: svn://scribus.net/trunk/Scribus@26920 
11d20701-8431-0410-a711-e3c959e3b870
 ---
- scribus/pdf_analyzer.cpp | 31 +++++++++++++++++++++++++++++++
- scribus/pdflib_core.cpp  | 18 ++++++++++++++++++
- 2 files changed, 49 insertions(+)
+ scribus/pdf_analyzer.cpp | 47 +++++++++++++++++++++++++++++++---------
+ scribus/pdflib_core.cpp  | 18 +++++++++++++++
+ 2 files changed, 55 insertions(+), 10 deletions(-)
 
 diff --git a/scribus/pdf_analyzer.cpp b/scribus/pdf_analyzer.cpp
-index d923148..3ecff48 100644
+index d923148..3f2083c 100644
 --- a/scribus/pdf_analyzer.cpp
 +++ b/scribus/pdf_analyzer.cpp
-@@ -276,7 +276,11 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, 
QList<PDFColorSpace> & usedCo
+@@ -40,18 +40,14 @@ using namespace PoDoFo;
+ #include <string_view>
+ #include <utility>
+ 
+-namespace std
++namespace PoDoFo
+ {
+-      template<>
+-      struct less<PoDoFo::PdfName>
++      bool operator<(const PdfName& n1, const PdfName& n2)
+       {
+-              bool operator()(const PoDoFo::PdfName& n1, const 
PoDoFo::PdfName& n2) const
+-              {
+-                      std::string_view s1 = n1.GetRawData();
+-                      std::string_view s2 = n2.GetRawData();
+-                      return s1 < s2;
+-              }
+-      };
++              std::string_view s1 = n1.GetRawData();
++              std::string_view s2 = n2.GetRawData();
++              return s1 < s2;
++      }
+ }
+ #endif
+ 
+@@ -276,7 +272,11 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, 
QList<PDFColorSpace> & usedCo
        try
        {
                // start parsing the content stream
@@ -25,7 +50,7 @@
                PdfContentStreamReader tokenizer(*canvas, tokenizerArgs);
                PdfContent pdfContent;
                PdfVariant var;
-@@ -289,13 +293,29 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, 
QList<PDFColorSpace> & usedCo
+@@ -289,13 +289,29 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, 
QList<PDFColorSpace> & usedCo
                while (tokenizer.TryReadNext(pdfContent))
                {
                        ++tokenNumber;
@@ -55,7 +80,7 @@
                                {
                                case PdfOperator::q:
                                        gsStack.push(currGS);
-@@ -677,12 +697,23 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, 
QList<PDFColorSpace> & usedCo
+@@ -677,12 +693,23 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, 
QList<PDFColorSpace> & usedCo
                                }
                                args.clear();
                        }
@@ -128,6 +153,6 @@
                        double imgHeight = (rotation == 90 || rotation == 270) 
? pageRect.Width : pageRect.Height;
                        QTransform pageM;
 -- 
-2.49.0
+2.50.0
 
 

++++++ 0001-Fix-build-with-poppler-25.07.0.patch ++++++
>From 4c3492c4bdf8040a82a44d5ad97caa8c5f30ec3b Mon Sep 17 00:00:00 2001
From: Jean Ghali <jgh...@libertysurf.fr>
Date: Fri, 4 Jul 2025 19:27:20 +0000
Subject: [PATCH] Fix build with poppler 25.07.0

git-svn-id: svn://scribus.net/trunk/Scribus@26940 
11d20701-8431-0410-a711-e3c959e3b870
---
 scribus/plugins/import/pdf/slaoutput.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scribus/plugins/import/pdf/slaoutput.cpp 
b/scribus/plugins/import/pdf/slaoutput.cpp
index 3c65c3f..3a8cb52 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -3255,7 +3255,12 @@ void SlaOutputDev::updateFont(GfxState *state)
                        break;
                case fontTrueType:
                case fontTrueTypeOT:
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
+                       if (!fileName.empty())
+                               ff = FoFiTrueType::load(fileName.c_str(), 
fontLoc->fontNum);
+                       else
+                               ff = FoFiTrueType::make(fontsrc->buf, 
fontLoc->fontNum);
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
                        if (!fileName.empty())
                                ff = FoFiTrueType::load(fileName.c_str(), 
fontLoc->fontNum);
                        else
@@ -3400,7 +3405,12 @@ void SlaOutputDev::updateFont(GfxState *state)
 #endif
                        else
                        {
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
+                               if (!fileName.empty())
+                                       ff = 
FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
+                               else
+                                       ff = FoFiTrueType::make(fontsrc->buf, 
fontLoc->fontNum);
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
                                if (!fileName.empty())
                                        ff = 
FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
                                else
-- 
2.50.0

Reply via email to