[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     d89e178ab6335aafa7fbcc8c1afd6b9c23a61b83
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 07:37:49 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <fordfrog <AT> 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 <asturm@gentoo.org>
----
- 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 <jghali@libertysurf.fr>
+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() {