From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 16 Mar 2019 22:55:20 +0000 (+0100)
Subject: sci-libs/gdal: Fix build with poppler-0.72 and 0.73
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2e57eba2afd0eef70172501fa51b6e937db6f8d6;p=gentoo.git

sci-libs/gdal: Fix build with poppler-0.72 and 0.73

Closes: https://bugs.gentoo.org/680530
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/sci-libs/gdal/gdal-2.4.0.ebuild b/sci-libs/gdal/gdal-2.4.0.ebuild
index 6341ce2b6aee..3faf2202c974 100644
--- a/sci-libs/gdal/gdal-2.4.0.ebuild
+++ b/sci-libs/gdal/gdal-2.4.0.ebuild
@@ -117,6 +117,11 @@ src_prepare() {
 		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
 
 	default
+
+	# fixed in git master or what will become 2.4.1:
+	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
+	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
+
 	eautoreconf
 }