| 1 |
commit: 7fee9321d16014b12fe82a608c79f860dba68a61 |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 30 07:17:40 2019 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 30 07:18:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fee9321 |
| 7 |
|
| 8 |
sci-geosciences/merkaartor: fix compilation with proj-6.0.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/685234 |
| 11 |
Submitted-by: <phobosk <AT> fastmail.fm> |
| 12 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
| 14 |
|
| 15 |
sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 6 ++++-- |
| 16 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
| 19 |
index d3bb9dded76..7c990dab379 100644 |
| 20 |
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
| 21 |
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
| 22 |
@@ -1,11 +1,11 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2019 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
|
| 29 |
PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW" |
| 30 |
|
| 31 |
-inherit gnome2-utils l10n qmake-utils xdg-utils |
| 32 |
+inherit gnome2-utils l10n qmake-utils xdg-utils flag-o-matic |
| 33 |
|
| 34 |
DESCRIPTION="Qt based map editor for the openstreetmap.org project" |
| 35 |
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" |
| 36 |
@@ -65,6 +65,8 @@ src_prepare() { |
| 37 |
} |
| 38 |
|
| 39 |
src_configure() { |
| 40 |
+ append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H |
| 41 |
+ |
| 42 |
# TRANSDIR_SYSTEM is for bug #385671 |
| 43 |
eqmake5 \ |
| 44 |
PREFIX="${ED%/}/usr" \ |
Archives