[Git][debian-gis-team/mapnik][upstream] New upstream version 3.1.0+ds

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapnik


Commits:
4bbc5e5e by Bas Couwenberg at 2021-01-08T14:52:49+01:00
New upstream version 3.1.0+ds
- - - - -


4 changed files:

- CHANGELOG.md
- SConstruct
- include/mapnik/version.hpp
- scripts/publish_release.sh


Changes:

=====================================
CHANGELOG.md
=====================================
@@ -6,6 +6,14 @@ Developers: Please commit along with changes.
 
 For a complete change history, see the git log.
 
+## 3.1.0
+
+Released: January 8, 2021
+
+(Packaged from 445438e34)
+
+* Require c++14 compliant complier (Boost.Geometry `BOOST_VERSION >= 1_75`)
+
 ## 3.0.24
 
 Released: January 5, 2021


=====================================
SConstruct
=====================================
@@ -42,7 +42,7 @@ ICU_LIBS_DEFAULT='/usr/'
 
 DEFAULT_CC = "cc"
 DEFAULT_CXX = "c++"
-DEFAULT_CXX11_CXXFLAGS = " -std=c++11 -DU_USING_ICU_NAMESPACE=0"
+DEFAULT_CXX11_CXXFLAGS = " -std=c++14 -DU_USING_ICU_NAMESPACE=0"
 DEFAULT_CXX11_LINKFLAGS = ""
 if sys.platform == 'darwin':
     # homebrew default
@@ -62,7 +62,7 @@ SCONS_CONFIGURE_CACHE = 'config.cache'
 SCONF_TEMP_DIR = '.sconf_temp'
 # auto-search directories for boost libs/headers
 BOOST_SEARCH_PREFIXES = ['/usr/local','/opt/local','/sw','/usr',]
-BOOST_MIN_VERSION = '1.47'
+BOOST_MIN_VERSION = '1.61'
 #CAIRO_MIN_VERSION = '1.8.0'
 
 HARFBUZZ_MIN_VERSION = (0, 9, 34)
@@ -1168,12 +1168,12 @@ int main()
         return True
     return False
 
-def supports_cxx11(context,silent=False):
+def supports_cxx14(context,silent=False):
     ret = context.TryRun("""
 
 int main()
 {
-#if __cplusplus >= 201103
+#if __cplusplus >= 201402L
     return 0;
 #else
     return -1;
@@ -1182,7 +1182,7 @@ int main()
 
 """, '.cpp')
     if not silent:
-        context.Message('Checking if compiler (%s) supports -std=c++11 flag... ' % context.env.get('CXX','CXX'))
+        context.Message('Checking if compiler (%s) supports -std=c++14 flag... ' % context.env.get('CXX','CXX'))
     if silent:
         context.did_show_result=1
     context.Result(ret[0])
@@ -1214,7 +1214,7 @@ conf_tests = { 'prioritize_paths'      : prioritize_paths,
                'harfbuzz_with_freetype_support': harfbuzz_with_freetype_support,
                'boost_regex_has_icu'   : boost_regex_has_icu,
                'sqlite_has_rtree'      : sqlite_has_rtree,
-               'supports_cxx11'        : supports_cxx11,
+               'supports_cxx14'        : supports_cxx14,
                'CheckBoostScopedEnum'  : CheckBoostScopedEnum,
                }
 
@@ -1504,9 +1504,9 @@ if not preconfigured:
     if env['PRIORITIZE_LINKING']:
         conf.prioritize_paths(silent=True)
 
-    # test for C++11 support, which is required
-    if not env['HOST'] and not conf.supports_cxx11():
-        color_print(1,"C++ compiler does not support C++11 standard (-std=c++11), which is required. Please upgrade your compiler")
+    # test for C++14 support, which is required
+    if not env['HOST'] and not conf.supports_cxx14():
+        color_print(1,"C++ compiler does not support C++14 standard (-std=c++14), which is required. Please upgrade your compiler")
         Exit(1)
 
     if not env['HOST']:


=====================================
include/mapnik/version.hpp
=====================================
@@ -26,8 +26,8 @@
 #include <mapnik/stringify_macro.hpp>
 
 #define MAPNIK_MAJOR_VERSION 3
-#define MAPNIK_MINOR_VERSION 0
-#define MAPNIK_PATCH_VERSION 24
+#define MAPNIK_MINOR_VERSION 1
+#define MAPNIK_PATCH_VERSION 0
 
 #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION)
 


=====================================
scripts/publish_release.sh
=====================================
@@ -111,8 +111,9 @@ step "release notes: $RELEASE_NOTES"
 
 # create draft release
 curl --data "{\"tag_name\": \"${MAPNIK_VERSION}\",\"target_commitish\": \"master\",\"name\": \"${MAPNIK_VERSION}\",\"body\": \"${RELEASE_NOTES}\",\"draft\": ${IS_DRAFT},\"prerelease\": ${IS_PRERELEASE}}" \
-https://api.github.com/repos/mapnik/mapnik/releases?access_token=${GITHUB_TOKEN_MAPNIK_PUBLIC_REPO} \
-> create_response.json
+     -H "Authorization: token ${GITHUB_TOKEN_MAPNIK_PUBLIC_REPO}" \
+     https://api.github.com/repos/mapnik/mapnik/releases \
+     > create_response.json
 cat create_response.json
 # parse out upload url and form it up to post tarball
 UPLOAD_URL=$(python -c "import json;print json.load(open('create_response.json'))['upload_url'].replace('{?name,label}','?name=${TARBALL_COMPRESSED}')")



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/4bbc5e5efee6c0a6af1580c5b3d0556d5f93aeec

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/4bbc5e5efee6c0a6af1580c5b3d0556d5f93aeec
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210108/7779d1b0/attachment-0001.html>