[Git][debian-gis-team/mapnik][upstream] New upstream version 4.0.0~rc3+ds

[Bas Couwenberg (@sebastic)]

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


Commits:
69b5659a by Bas Couwenberg at 2024-06-14T06:14:35+02:00
New upstream version 4.0.0~rc3+ds
- - - - -


2 changed files:

- .github/workflows/build_and_test.yml
- SConstruct


Changes:

=====================================
.github/workflows/build_and_test.yml
=====================================
@@ -38,7 +38,7 @@ jobs:
           - macos-13
           - macos-14
           - ubuntu-latest
-          - windows-latest
+          - windows-2019
         cxx-standard:
           - 17
         include:
@@ -48,7 +48,7 @@ jobs:
             mono: mono
           - os: ubuntu-latest
             mono: mono
-          - os: windows-latest
+          - os: windows-2019
 
     runs-on: ${{ matrix.os }}
 
@@ -77,7 +77,7 @@ jobs:
       - name: setup vcpkg
         uses: ./.github/actions/setup_vcpkg
         with:
-          vcpkg-sha: b4a3d89125e45bc8f80fb94bef9761d4f4e14fb9
+          vcpkg-sha: ad25766aefb5313b6bc4e2a4b78a2946f84fbf66
           nuget-source: https://nuget.pkg.github.com/mapnik/index.json
           nuget-username: ${{ github.actor }}
           nuget-pat: ${{ secrets.GITHUB_TOKEN }}


=====================================
SConstruct
=====================================
@@ -1,6 +1,6 @@
 # This file is part of Mapnik (c++ mapping toolkit)
 #
-# Copyright (C) 2021 Artem Pavlenko
+# Copyright (C) 2024 Artem Pavlenko
 #
 # Mapnik is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@ import re
 import platform
 from glob import glob
 from copy import copy
-from subprocess import Popen, PIPE
+from subprocess import run, Popen, PIPE
 from SCons.SConf import SetCacheMode
 import pickle
 
@@ -949,54 +949,17 @@ int main()
     return ret
 
 def CheckProjData(context, silent=False):
-
     if not silent:
         context.Message('Checking for PROJ_LIB directory...')
-    ret, out = context.TryRun("""
-
-#include <proj.h>
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <string>
-#include <fstream>
-
-std::vector<std::string> split_searchpath(std::string const& paths)
-{
-    std::vector<std::string> output;
-    std::stringstream ss(paths);
-    std::string path;
-
-    for( std::string path;std::getline(ss, path, ':');)
-    {
-        output.push_back(path);
-    }
-    return output;
-}
+    result = run(['pkg-config', 'proj', '--variable=datadir'], stdout=PIPE)
+    value = result.stdout.decode('utf-8').strip()
 
-int main()
-{
-    PJ_INFO info = proj_info();
-    std::string result = info.searchpath;
-    for (auto path : split_searchpath(result))
-    {
-        std::ifstream file(path + "/proj.db");
-        if (file)
-        {
-            std::cout << path;
-            return 0;
-        }
-    }
-    return -1;
-}
-
-""", '.cpp')
-    value = out.strip()
     if silent:
         context.did_show_result=1
-    if ret:
-        context.Result('proj_info.searchpath returned %s' % value)
+    if os.path.exists(value):
+        context.Result('`pkg-config proj --variable=datadir` returned:\n%s ' % value)
     else:
+        value = None
         context.Result('Failed to detect (mapnik-config will have null value)')
     return value
 



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

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/69b5659a0239608c9f3cf2bcc11d17bc6c9470e2
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/20240614/c19650dc/attachment-0001.htm>