diff options
Diffstat (limited to 'science')
| -rw-r--r-- | science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch | 24 | ||||
| -rwxr-xr-x | science/qmapshack/DETAILS | 4 | ||||
| -rw-r--r-- | science/qmapshack/HISTORY | 5 | ||||
| -rwxr-xr-x | science/qmapshack/PRE_BUILD | 6 |
4 files changed, 8 insertions, 31 deletions
diff --git a/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch b/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch deleted file mode 100644 index 2271649b6a..0000000000 --- a/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/DETAILS b/science/qmapshack/DETAILS index 09c60e3bdc..244d0a6414 100755 --- a/science/qmapshack/DETAILS +++ b/science/qmapshack/DETAILS @@ -1,9 +1,9 @@ source $GRIMOIRE/CMAKE_FUNCTIONS SPELL=qmapshack - VERSION=1.15.1 + VERSION=1.16.0 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=https://github.com/Maproom/qmapshack/archive/V_$VERSION.tar.gz - SOURCE_HASH=sha512:c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a + SOURCE_HASH=sha512:768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-V_${VERSION}" WEB_SITE=https://github.com/Maproom/qmapshack WEB_SITE="https://bitbucket.org/maproom/qmapshack/wiki/Home" diff --git a/science/qmapshack/HISTORY b/science/qmapshack/HISTORY index 587b212ff0..705f049d76 100644 --- a/science/qmapshack/HISTORY +++ b/science/qmapshack/HISTORY @@ -1,3 +1,8 @@ +2021-05-24 Florian Franzmann <bwlf@bandrate.org> + * DETAILS: version 1.16.0 + * PRE_BUILD, 0001-fix-incompatibility-with-recent-proj.patch: remove + obsolete patch + 2020-11-28 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 1.15.1 diff --git a/science/qmapshack/PRE_BUILD b/science/qmapshack/PRE_BUILD index 673b935580..053e0964e6 100755 --- a/science/qmapshack/PRE_BUILD +++ b/science/qmapshack/PRE_BUILD @@ -1,8 +1,4 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-include.patch" && -patch -p1 < "$SPELL_DIRECTORY/0001-fix-incompatibility-with-recent-proj.patch" && -patch -p1 < "$SOURCE_DIRECTORY/FindQuaZip5.patch" - - +patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-include.patch" |