diff options
| author | Florian Franzmann | 2019-10-05 18:19:22 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2019-10-05 18:29:12 +0200 |
| commit | 3bca0139bdeeee977a6ea69dd6a67da0cd4d7993 (patch) | |
| tree | aa7a22e8c14715e5abd7ebfd117ffe02a5f9d2f7 /science | |
| parent | 70d14a716203039ba1a89ad0ea85d4084bbaa93a (diff) | |
science/qmapshack: fix build error
Diffstat (limited to 'science')
| -rw-r--r-- | science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch | 24 | ||||
| -rw-r--r-- | science/qmapshack/HISTORY | 1 | ||||
| -rwxr-xr-x | science/qmapshack/PRE_BUILD | 4 |
3 files changed, 28 insertions, 1 deletions
diff --git a/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch b/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch new file mode 100644 index 0000000000..2271649b6a --- /dev/null +++ b/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch @@ -0,0 +1,24 @@ +From 5d636ad60cde62d576e3b2e66e22620bad2c5e65 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <bwlf@bandrate.org> +Date: Sat, 5 Oct 2019 18:12:35 +0200 +Subject: [PATCH] fix incompatibility with recent proj + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 397dbdb..4d0aa15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,6 +28,7 @@ project(QMapShack VERSION 1.11.1) + set(VERSION_SUFFIX "") + # !!! Do not forget to update versions in the sub-repos, too!!! + ++add_definitions("-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") + + ############################################################################################### + # Define paths and include other modules +-- +2.23.0 + diff --git a/science/qmapshack/HISTORY b/science/qmapshack/HISTORY index 135f8945dc..b775746c33 100644 --- a/science/qmapshack/HISTORY +++ b/science/qmapshack/HISTORY @@ -1,5 +1,6 @@ 2019-10-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * CONFIGURE, DEPENDS, DETAILS: use CMAKE_* + * PRE_BUILD, 0001-fix-incompatibility-with-recent-proj.patch: fix build error 2018-07-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DEPENDS, DETAILS, BUILD, 0001-add-missing-include.patch, PRE_BUILD: spell diff --git a/science/qmapshack/PRE_BUILD b/science/qmapshack/PRE_BUILD index 7c8eb15502..bedfa9533a 100755 --- a/science/qmapshack/PRE_BUILD +++ b/science/qmapshack/PRE_BUILD @@ -1,5 +1,7 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-include.patch" +patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-include.patch" && +patch -p1 < "$SPELL_DIRECTORY/0001-fix-incompatibility-with-recent-proj.patch" + |