pool/scribus
SHA256
20
0
Fork 2
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=106

Browse Source
This commit is contained in:
Christophe Marin
2025-07-15 17:14:22 +00:00
committed by Git OBS Bridge
parent f815b6e444
commit d30648b36d
3 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scribus.changes
+5
View File
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 15 16:51:19 UTC 2025 - Christophe Marin <christophe@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.lie@gmail.com>
0001-Fix-build-with-PoDoFo-1.0.0.patch
+34 -9
View File
@@ -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 @@ index d923148..3ecff48 100644
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 @@ index d923148..3ecff48 100644
{
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,5 +153,5 @@ index 3465ccd..5c6ebd1 100644
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
+10 -7
View File
@@ -1,4 +1,4 @@
From ff6c6abfa8683028e548a269dee6a859b6f63335 Mon Sep 17 00:00:00 2001
From 4c3492c4bdf8040a82a44d5ad97caa8c5f30ec3b Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Fri, 4 Jul 2025 19:27:20 +0000
Subject: [PATCH] Fix build with poppler 25.07.0
@@ -8,11 +8,11 @@ git-svn-id: svn://scribus.net/trunk/Scribus@26940 11d20701-8431-0410-a711-e3c959
scribus/plugins/import/pdf/slaoutput.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
Index: scribus-1.6.4/scribus/plugins/import/pdf/slaoutput.cpp
===================================================================
--- scribus-1.6.4.orig/scribus/plugins/import/pdf/slaoutput.cpp
+++ scribus-1.6.4/scribus/plugins/import/pdf/slaoutput.cpp
@@ -3250,7 +3250,12 @@ void SlaOutputDev::updateFont(GfxState *
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:
@@ -26,7 +26,7 @@ Index: scribus-1.6.4/scribus/plugins/import/pdf/slaoutput.cpp
if (!fileName.empty())
ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
else
@@ -3395,7 +3400,12 @@ void SlaOutputDev::updateFont(GfxState *
@@ -3400,7 +3405,12 @@ void SlaOutputDev::updateFont(GfxState *state)
#endif
else
{
@@ -40,3 +40,6 @@ Index: scribus-1.6.4/scribus/plugins/import/pdf/slaoutput.cpp
if (!fileName.empty())
ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
else
--
2.50.0