commit: 27ae2afb66dadac740568bd610446231fd56756a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jul 15 12:16:04 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jul 15 12:27:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ae2afb
app-misc/zygrib: Fix build with >=sci-libs/proj-6 One interwebz search later... This is just a life-support commit and will break again with PROJ-8. Bug: https://bugs.gentoo.org/686078 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch | 20 ++++++++++++++++++++ app-misc/zygrib/zygrib-8.0.1-r1.ebuild | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch new file mode 100644 index 00000000000..d76a89b5e51 --- /dev/null +++ b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch @@ -0,0 +1,20 @@ +From 481e9d3f8f8086afa7deb4ac6db60a2575dc2203 Mon Sep 17 00:00:00 2001 +From: KIVACHUK Valentin <valentin.kivac...@irt-saintexupery.com> +Date: Tue, 10 Sep 2019 11:29:37 +0200 +Subject: [PATCH] Fix proj build error + +--- + proj_deprecated_api.patch | 2 ++ + 1 files changed, 2 insertions(+) + +--- a/src/map/Projection.h 2016-11-09 17:27:38.000000000 +0100 ++++ b/src/map/Projection.h 2019-09-10 10:20:27.440134499 +0200 +@@ -21,6 +21,8 @@ + #include <QObject> + #include <cstdio> + ++#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H ++ + #include "proj_api.h" + + class Projection : public QObject diff --git a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild index 68598cab472..94a696ec8e6 100644 --- a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild +++ b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild @@ -38,7 +38,10 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" -PATCHES=( "${FILESDIR}/${P}-libs.patch" ) +PATCHES=( + "${FILESDIR}/${P}-libs.patch" + "${FILESDIR}/${P}-proj-6.patch" # bug 686078 +) src_prepare() { sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile || die
