From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1630818-garchives=archives.gentoo.org@lists.gentoo.org>
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 B49B21581D3
for <garchives@archives.gentoo.org>; Mon, 13 May 2024 23:15:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C3021E2A6A;
Mon, 13 May 2024 23:15:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7D29AE2A6A
for <gentoo-commits@lists.gentoo.org>; Mon, 13 May 2024 23:15:00 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BF0E033C84E
for <gentoo-commits@lists.gentoo.org>; Mon, 13 May 2024 23:14:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BDDE15F8
for <gentoo-commits@lists.gentoo.org>; Mon, 13 May 2024 23:14:58 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1715642065.6db9200aefab8f1d62f87d4a0ef20adc20bc4c12.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch sci-libs/gdal/gdal-3.8.5.ebuild
X-VCS-Directories: sci-libs/gdal/files/ sci-libs/gdal/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 6db9200aefab8f1d62f87d4a0ef20adc20bc4c12
X-VCS-Branch: master
Date: Mon, 13 May 2024 23:14:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 732e0151-b08e-4823-b11a-ca12665b671f
X-Archives-Hash: 388ff67c11cf8a3a3b83628ecd47e5a1
commit: 6db9200aefab8f1d62f87d4a0ef20adc20bc4c12
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 22:04:29 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 23:14:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db9200a
sci-libs/gdal: Fix build with Poppler 24.05
Upstream commit 60dcddbf5fab917338caf433b3e7dca283cf9720
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../gdal/files/gdal-3.8.5-poppler-24.05.0.patch | 23 ++++++++++++++++++++++
sci-libs/gdal/gdal-3.8.5.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
new file mode 100644
index 000000000000..837a50f6b825
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
@@ -0,0 +1,23 @@
+From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Thu, 4 Apr 2024 17:48:33 +0200
+Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet)
+
+---
+ frmts/pdf/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt
+index 9b9a1898a730..bcb19c3aa24c 100644
+--- a/frmts/pdf/CMakeLists.txt
++++ b/frmts/pdf/CMakeLists.txt
+@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER)
+ if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+")
+ string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR})
+ endif ()
++ if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05")
++ target_compile_features(gdal_PDF PRIVATE cxx_std_20)
++ endif ()
+ target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR}
+ -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR})
+ endif ()
diff --git a/sci-libs/gdal/gdal-3.8.5.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild
index bb1c2e0bde5e..3b40e02bfefc 100644
--- a/sci-libs/gdal/gdal-3.8.5.ebuild
+++ b/sci-libs/gdal/gdal-3.8.5.ebuild
@@ -101,6 +101,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
PATCHES=(
"${FILESDIR}"/${PN}-3.8.0-java21.patch
"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+ "${FILESDIR}"/${P}-poppler-24.05.0.patch # in 3.9.0
)
pkg_setup() {