commit: 0a2bd8e4ffe2f323737aa466c362bf7ee1a33bff Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 13 22:37:22 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 13 22:44:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2bd8e4
app-office/scribus: Fix build w/ >=app-text/poppler-24.11.0 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...patch => scribus-1.6.2-poppler-24.11.0-1.patch} | 0 .../files/scribus-1.6.2-poppler-24.11.0-2.patch | 42 ++++++++++++++++++++++ app-office/scribus/scribus-1.6.2.ebuild | 3 +- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch similarity index 100% rename from app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch rename to app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch new file mode 100644 index 000000000000..1402ebd8d26e --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch @@ -0,0 +1,42 @@ +From 874e1c13995223b1433026bc26e13911a74f3880 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 13 Nov 2024 23:19:51 +0100 +Subject: [PATCH] Drop unused headers to fix build w/ poppler-24.11 + +Fix still pending upstream: +https://bugs.scribus.net/view.php?id=17308 + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + scribus/plugins/import/pdf/pdftextrecognition.h | 1 - + scribus/plugins/import/pdf/slaoutput.h | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/scribus/plugins/import/pdf/pdftextrecognition.h b/scribus/plugins/import/pdf/pdftextrecognition.h +index a04b45358..6edac9906 100644 +--- a/scribus/plugins/import/pdf/pdftextrecognition.h ++++ b/scribus/plugins/import/pdf/pdftextrecognition.h +@@ -16,7 +16,6 @@ for which a new license (GPL+exception) is in place. + #include "slaoutput.h" + + #include <poppler/GfxState.h> +-#include <poppler/CharCodeToUnicode.h> + + /* PDF TextBox Framework */ + /* +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 69bebbf5f..ae7630d29 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -45,8 +45,6 @@ for which a new license (GPL+exception) is in place. + #include <poppler/Form.h> + #include <poppler/Page.h> + #include <poppler/Catalog.h> +-#include <poppler/CharCodeToUnicode.h> +-#include <poppler/FontEncodingTables.h> + #include <poppler/splash/SplashFontFileID.h> + #include <poppler/splash/SplashFontFile.h> + #include <poppler/splash/SplashFontEngine.h> +-- +2.47.0 + diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild index 753044e56f3c..71b32025e6fc 100644 --- a/app-office/scribus/scribus-1.6.2.ebuild +++ b/app-office/scribus/scribus-1.6.2.ebuild @@ -83,7 +83,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch - "${FILESDIR}"/${P}-poppler-24.{10,11}.0.patch # bug 941932 + "${FILESDIR}"/${P}-poppler-24.10.0.patch # bug 941932 + "${FILESDIR}"/${P}-poppler-24.11.0-{1,2}.patch ) src_prepare() {
