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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02272138359 for ; Wed, 5 Aug 2020 08:26:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA2DFE08EC; Wed, 5 Aug 2020 08:26:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5778E08EC for ; Wed, 5 Aug 2020 08:26:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3F3034EE50 for ; Wed, 5 Aug 2020 08:26:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 970D79C for ; Wed, 5 Aug 2020 08:26:54 +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: <1596615992.fca144ebd963f6e5a6144c499c419ecadfaae3f0.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.0.4-poppler-20.08.patch sci-libs/gdal/gdal-3.0.4-r1.ebuild X-VCS-Directories: sci-libs/gdal/ sci-libs/gdal/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fca144ebd963f6e5a6144c499c419ecadfaae3f0 X-VCS-Branch: master Date: Wed, 5 Aug 2020 08:26:54 +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: a9165df0-f3c7-4a9e-a01d-7d013b64f3ef X-Archives-Hash: 7cdad5327005ed1d3d64c34107b972ae commit: fca144ebd963f6e5a6144c499c419ecadfaae3f0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 4 19:46:08 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 5 08:26:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca144eb sci-libs/gdal: Fix build against poppler-20.08 Thanks-to: PhobosK fastmail.fm> Closes: https://bugs.gentoo.org/735828 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch | 42 ++++++++++++++++++++++ sci-libs/gdal/gdal-3.0.4-r1.ebuild | 1 + 2 files changed, 43 insertions(+) diff --git a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch new file mode 100644 index 00000000000..0fd8051c365 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch @@ -0,0 +1,42 @@ +From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Mon, 3 Aug 2020 14:52:25 +0200 +Subject: [PATCH] Unix build: fix detection of minor version number of Poppler + with the new YY.MM.X numbering scheme (fixes #2823) (#2825) + +Authored-by: @chris2553 +--- + a/configure | 4 ++-- + b/configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 4d618db8149..69d46182a26 100755 +--- a/configure ++++ b/configure +@@ -40824,8 +40824,8 @@ $as_echo "yes" >&6; } + fi + if test "$POPPLER_VERSION" != ""; then + HAVE_POPPLER=yes +- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'` +- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'` ++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` ++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` + POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` + fi + else +diff --git a/configure.ac b/configure.ac +index 0f4124e6431..7f337e77c1d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4966,8 +4966,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then + [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=]) + if test "$POPPLER_VERSION" != ""; then + HAVE_POPPLER=yes +- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'` +- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` ++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1` ++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'` + POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"` + fi + else diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild index b8e390e8e00..c7591678764 100644 --- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild +++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild @@ -89,6 +89,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840 "${FILESDIR}/${PN}-3.0.2-complete.patch" "${FILESDIR}/${PN}-3.0.2-datadir.patch" + "${FILESDIR}/${P}-poppler-20.08.patch" # bug 735828 ) src_prepare() {