commit: fca144ebd963f6e5a6144c499c419ecadfaae3f0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Aug 4 19:46:08 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <phobosk <AT> fastmail.fm> Closes: https://bugs.gentoo.org/735828 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 <even.roua...@spatialys.com> +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() {
