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 A7FB6158011 for ; Mon, 10 Jan 2022 23:19:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6C0A2BC021; Mon, 10 Jan 2022 23:19:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 50DD02BC021 for ; Mon, 10 Jan 2022 23:19:14 +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 1D334343159 for ; Mon, 10 Jan 2022 23:19:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CE6F21D for ; Mon, 10 Jan 2022 23:19:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1641856726.5f490d3e5588fb52ccf6fd5ccc57630be75dc1e4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch sci-libs/gdal/gdal-3.4.1.ebuild X-VCS-Directories: sci-libs/gdal/files/ sci-libs/gdal/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5f490d3e5588fb52ccf6fd5ccc57630be75dc1e4 X-VCS-Branch: master Date: Mon, 10 Jan 2022 23:19:11 +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: fd1546d5-c487-4b51-97a5-d08d7b7d78c8 X-Archives-Hash: 350cabd7fa4a15a7344131cd674c65a9 commit: 5f490d3e5588fb52ccf6fd5ccc57630be75dc1e4 Author: Sam James gentoo org> AuthorDate: Mon Jan 10 23:18:46 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 10 23:18:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f490d3e sci-libs/gdal: fix build with Poppler 22.01.0 (build with C++ 17) Closes: https://bugs.gentoo.org/830883 Signed-off-by: Sam James gentoo.org> .../files/gdal-3.4.1-poppler-22.01.0-c++17.patch | 23 ++++++++++++++++++++++ sci-libs/gdal/gdal-3.4.1.ebuild | 1 + 2 files changed, 24 insertions(+) diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch new file mode 100644 index 000000000000..dac3bd3776d9 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/830883 +https://github.com/OSGeo/gdal/commit/3f528f2b5f9244698c89d31b74155765538ef362 + +From: Even Rouault +Date: Sat, 8 Jan 2022 14:25:09 +0100 +Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes + #5071) + +--- a/frmts/pdf/GNUmakefile ++++ b/frmts/pdf/GNUmakefile +@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle + endif + + ifeq ($(HAVE_POPPLER),yes) ++# Poppler 2022.1 requires c++17 ++ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0) ++CXX := $(subst -std=c++11,,${CXX}) ++CXX := $(subst -std=c++14,,${CXX}) ++CXX := ${CXX} -std=c++17 ++endif + CPPFLAGS += -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION) + endif + diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild index 4967e5533a3b..56d451eed723 100644 --- a/sci-libs/gdal/gdal-3.4.1.ebuild +++ b/sci-libs/gdal/gdal-3.4.1.ebuild @@ -91,6 +91,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.2.3-soname.patch" "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840 "${FILESDIR}/${PN}-3.3.0-libdir.patch" + "${FILESDIR}/${P}-poppler-22.01.0-c++17.patch" ) src_prepare() {