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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 277711581D3 for ; Wed, 22 May 2024 07:39:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B3D9E2A57; Wed, 22 May 2024 07:39:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 499D1E2A57 for ; Wed, 22 May 2024 07:39:15 +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 5D94E33BEA5 for ; Wed, 22 May 2024 07:39:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCF4BAAF for ; Wed, 22 May 2024 07:39:12 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1716363469.d89e178ab6335aafa7fbcc8c1afd6b9c23a61b83.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch app-office/scribus/scribus-1.6.1-r1.ebuild X-VCS-Directories: app-office/scribus/files/ app-office/scribus/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d89e178ab6335aafa7fbcc8c1afd6b9c23a61b83 X-VCS-Branch: master Date: Wed, 22 May 2024 07:39:12 +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: 4f36fc9d-ee5f-4789-bd40-723fe7b15abe X-Archives-Hash: 5b253520c3b5c0c52e3719a05789343a commit: d89e178ab6335aafa7fbcc8c1afd6b9c23a61b83 Author: Miroslav Šulc gentoo org> AuthorDate: Wed May 22 07:37:49 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed May 22 07:37:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89e178a app-office/scribus: fixed compilation with poppler 24.05.0 Closes: https://bugs.gentoo.org/931916 Signed-off-by: Miroslav Šulc gentoo.org> .../files/scribus-1.6.1-poppler-24.03.patch | 6 ------ .../files/scribus-1.6.1-poppler-24.05.patch | 24 ++++++++++++++++++++++ app-office/scribus/scribus-1.6.1-r1.ebuild | 1 + 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch index 076e48e14fd9..0a8d317b6109 100644 --- a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch +++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch @@ -9,12 +9,6 @@ Fixes build errors caused by: Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 Signed-off-by: Andreas Sturmlechner ---- - scribus/plugins/import/pdf/slaoutput.cpp | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 4e31e4b6c..3e4a768ec 100644 --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch new file mode 100644 index 000000000000..9d2ae918768c --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch @@ -0,0 +1,24 @@ +From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Thu, 2 May 2024 22:26:03 +0000 +Subject: [PATCH] Enforce C++20 when building with poppler >= 24.05.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 +--- a/CMakeLists_Dependencies.cmake ++++ b/CMakeLists_Dependencies.cmake +@@ -28,7 +28,14 @@ if (poppler_FOUND) + message(STATUS "Found poppler") + message(STATUS "Found poppler libs: ${poppler_LIBRARY}") + message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}") +- if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) ++ if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0) ++ message(STATUS "Poppler Version:" ${poppler_VERSION}) ++ if (CMAKE_CXX_STANDARD LESS 20) ++ message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0") ++ message(STATUS "Enabling C++20 compiler features") ++ set(CMAKE_CXX_STANDARD 20) ++ endif() ++ elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) + message(STATUS "Poppler Version:" ${poppler_VERSION}) + if (CMAKE_CXX_STANDARD LESS 17) + message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0") diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild index 6943d0b9a6bc..1614345f8f40 100644 --- a/app-office/scribus/scribus-1.6.1-r1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -77,6 +77,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch + "${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch ) src_prepare() {