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

[Bas Couwenberg (@sebastic)]

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


Commits:
bd70bbaf by Bas Couwenberg at 2024-06-14T19:29:36+02:00
New upstream version 4.0.0~rc4+ds
- - - - -


3 changed files:

- .github/workflows/build_and_test.yml
- src/build.py
- test/unit/imaging/image_io_test.cpp


Changes:

=====================================
.github/workflows/build_and_test.yml
=====================================
@@ -15,7 +15,7 @@ env:
 jobs:
   checkSource:
     name: Check Source Code
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout at v4
@@ -35,20 +35,17 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-13
           - macos-14
-          - ubuntu-latest
-          - windows-2019
+          - ubuntu-22.04
+          - windows-2022
         cxx-standard:
           - 17
         include:
-          - os: macos-13
-            mono: mono
           - os: macos-14
             mono: mono
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             mono: mono
-          - os: windows-2019
+          - os: windows-2022
 
     runs-on: ${{ matrix.os }}
 
@@ -88,7 +85,7 @@ jobs:
         run: |
           LC_RUNNER_OS=$(echo "${RUNNER_OS}" | perl -ne "print lc")
           if [ "${RUNNER_OS}" == "macOS" ]; then
-            MACOS_ARCH=${{ (matrix.os == 'macos-14' || matrix.os == 'macos-latest') && 'arm64' || 'x64' }}
+            MACOS_ARCH=${{ matrix.os == 'macos-14' && 'arm64' || 'x64' }}
             echo "PRESET=${LC_RUNNER_OS}-ci-${MACOS_ARCH}" >> ${GITHUB_ENV}
           else
             echo "PRESET=${LC_RUNNER_OS}-ci" >> ${GITHUB_ENV}


=====================================
src/build.py
=====================================
@@ -161,7 +161,7 @@ else: # unix, non-macos
         if env['FULL_LIB_PATH']:
             mapnik_lib_link_flag += ' -Wl,-rpath=%s' % env['MAPNIK_LIB_BASE']
         else:
-            mapnik_lib_link_flag += ' -Wl,-z,origin -Wl,-rpath=\$$ORIGIN'
+            mapnik_lib_link_flag += ' -Wl,-z,origin -Wl,-rpath=\\$$ORIGIN'
 
 source = Split(
     """


=====================================
test/unit/imaging/image_io_test.cpp
=====================================
@@ -23,11 +23,6 @@ MAPNIK_DISABLE_WARNING_POP
 #include <mapnik/filesystem.hpp>
 #include <mapnik/util/mapped_memory_file.hpp>
 
-inline void make_directory(std::string const& dir)
-{
-    mapnik::fs::create_directories(dir);
-}
-
 namespace {
 template<typename T>
 void check_tiny_png_image_quantising(T const& im)
@@ -182,8 +177,9 @@ TEST_CASE("image io")
         supported_types.push_back(std::make_tuple("webp", "webp"));
 #endif
 
-        std::string directory_name("/tmp/mapnik-tests/");
-        make_directory(directory_name);
+        std::string directory_name = mapnik::fs::path(mapnik::fs::temp_directory_path() / "mapnik-tests").string();
+
+        mapnik::fs::create_directories(directory_name);
         REQUIRE(mapnik::util::exists(directory_name));
 
         for (auto const& info : supported_types)
@@ -191,7 +187,7 @@ TEST_CASE("image io")
             std::string extension;
             std::string format;
             std::tie(extension, format) = info;
-            std::string filename = (boost::format(directory_name + "mapnik-%1%.%2%") % named_color % extension).str();
+            std::string filename = (boost::format(directory_name + "/mapnik-%1%.%2%") % named_color % extension).str();
             mapnik::save_to_file(im, filename);
             std::string str = mapnik::save_to_string(im, format);
             std::ostringstream ss;



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

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