From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C5D2158042 for ; Wed, 13 Nov 2024 22:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DB29E0815; Wed, 13 Nov 2024 22:45:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 682E1E0815 for ; Wed, 13 Nov 2024 22:45:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 111BF335D6A for ; Wed, 13 Nov 2024 22:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3075A1DC3 for ; Wed, 13 Nov 2024 22:45:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1731537889.0a2bd8e4ffe2f323737aa466c362bf7ee1a33bff.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch app-office/scribus/scribus-1.6.2.ebuild X-VCS-Directories: app-office/scribus/ app-office/scribus/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0a2bd8e4ffe2f323737aa466c362bf7ee1a33bff X-VCS-Branch: master Date: Wed, 13 Nov 2024 22:45:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f3ecc259-deab-43be-943b-9e3ddc68698f X-Archives-Hash: 651d7af21bf694e2348b377d005900f9 commit: 0a2bd8e4ffe2f323737aa466c362bf7ee1a33bff Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 13 22:37:22 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 +--- + 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 +-#include + + /* 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 + #include + #include +-#include +-#include + #include + #include + #include +-- +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() {