diff --git a/.gitignore b/.gitignore index 84085b0..d85d151 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,3 @@ scribus-1.3.8.tar.bz2 /scribus-1.6.1-free.tar.xz /scribus-1.6.3-free.tar.xz /scribus-1.6.4-free.tar.xz -/scribus-1.6.5-free.tar.xz diff --git a/scribus-1.6.3-poppler-25.06.0.patch b/scribus-1.6.3-poppler-25.06.0.patch new file mode 100644 index 0000000..6427f66 --- /dev/null +++ b/scribus-1.6.3-poppler-25.06.0.patch @@ -0,0 +1,24 @@ +From 8dcf8d777bd85a0741c455961f2de382e3ed47ec Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 3 Jun 2025 22:50:26 +0000 +Subject: Fix build with poppler 25.06.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26919 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 0b878b6e2..63f28fa4f 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -580,7 +580,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, + FormWidget *fm = m_formWidgets->getWidget(i); + if (!fm) + continue; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) ++ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); ++ AnnotWidget* ano = anoSharedPtr.get(); ++#else + AnnotWidget *ano = fm->getWidgetAnnotation(); ++#endif + if (!ano) + continue; + if (ano != (AnnotWidget*) annota) diff --git a/scribus-1.6.3-poppler-25.07.0.patch b/scribus-1.6.3-poppler-25.07.0.patch new file mode 100644 index 0000000..2f784b0 --- /dev/null +++ b/scribus-1.6.3-poppler-25.07.0.patch @@ -0,0 +1,39 @@ +From ff6c6abfa8683028e548a269dee6a859b6f63335 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Fri, 4 Jul 2025 19:27:20 +0000 +Subject: Fix build with poppler 25.07.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26940 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 63f28fa4f..a575c91bb 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3091,7 +3091,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 +@@ -3226,7 +3231,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 diff --git a/scribus.spec b/scribus.spec index 3e913a6..5605d15 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.5 +Version: 1.6.4 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,6 +14,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc +Patch0: scribus-1.6.3-poppler-25.06.0.patch +Patch1: scribus-1.6.3-poppler-25.07.0.patch BuildRequires: boost-devel BuildRequires: cmake diff --git a/sources b/sources index 9563bfe..623b22e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.5-free.tar.xz) = f023b42e7c59447c52bc41adcb2b4800568d1cf8c88a5b3d6b155f78403a5c92b518ed95e74a20d671e043c206757b0a0e4724b1562ec814901422364f326dfe +SHA512 (scribus-1.6.4-free.tar.xz) = 5186b9244b27d2b3a5aaa2a1f21beacc9a2aa90add0d3111f8b83b1fa376544049e9b57caf9f6a4749a463398cc2f4aeb69fca6f2d153d4571cea02dce97b9d1