[Git][debian-gis-team/python-mapnik][master] 5 commits: Rebuild with Boost 1.83.0.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-mapnik


Commits:
c893c614 by Bas Couwenberg at 2023-11-16T19:20:34+01:00
Rebuild with Boost 1.83.0.

- - - - -
f1880379 by Bas Couwenberg at 2023-11-16T19:28:00+01:00
Revert "Rebuild with Boost 1.83.0."

This reverts commit c893c6140874074b29483945ff9fbe98245597d3.

- - - - -
ed2f0466 by Bas Couwenberg at 2023-11-16T19:31:11+01:00
Add patch to fix FTBFS with python3.12. (closes: #1055716)

- - - - -
bf45e679 by Bas Couwenberg at 2023-11-16T19:38:50+01:00
Rebuild with python3.12.

- - - - -
a5daf9a0 by Bas Couwenberg at 2023-11-16T19:43:42+01:00
Revert "Rebuild with python3.12."

This reverts commit bf45e679add398aa040a2721afaad14a9dcb4f64.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/python-3.12.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -7,6 +7,8 @@ python-mapnik (1:0.0~20200224-7da019cf9-5) UNRELEASED; urgency=medium
     (closes: #1045169)
   * Enable Salsa CI.
   * Switch to dh-sequence-*.
+  * Add patch to fix FTBFS with python3.12.
+    (closes: #1055716)
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Jan 2023 17:16:28 +0100
 


=====================================
debian/patches/python-3.12.patch
=====================================
@@ -0,0 +1,79 @@
+Descriptiopn: Fix python 3.12 compatibility issues
+Author: Tom Hughes <tom at compton.nu>
+Origin: https://src.fedoraproject.org/rpms/python-mapnik/c/462f98a385e0833630212110931be21a3d7c64c5?branch=rawhide
+Forwarded: not-needed
+
+--- a/src/python_grid_utils.cpp
++++ b/src/python_grid_utils.cpp
+@@ -42,6 +42,7 @@
+ #include "python_grid_utils.hpp"
+ 
+ // stl
++#include <cwchar>
+ #include <stdexcept>
+ 
+ namespace mapnik {
+@@ -67,7 +68,7 @@ void grid2utf(T const& grid_type,
+     for (std::size_t y = 0; y < data.height(); ++y)
+     {
+         std::uint16_t idx = 0;
+-        const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);
++        const std::unique_ptr<wchar_t[]> line(new wchar_t[array_size]);
+         typename T::value_type const* row = data.get_row(y);
+         for (std::size_t x = 0; x < data.width(); ++x)
+         {
+@@ -93,19 +94,19 @@ void grid2utf(T const& grid_type,
+                         keys[val] = codepoint;
+                         key_order.push_back(val);
+                     }
+-                    line[idx++] = static_cast<Py_UNICODE>(codepoint);
++                    line[idx++] = static_cast<wchar_t>(codepoint);
+                     ++codepoint;
+                 }
+                 else
+                 {
+-                    line[idx++] = static_cast<Py_UNICODE>(key_pos->second);
++                    line[idx++] = static_cast<wchar_t>(key_pos->second);
+                 }
+             }
+             // else, shouldn't get here...
+         }
+         l.append(boost::python::object(
+                      boost::python::handle<>(
+-                         PyUnicode_FromUnicode(line.get(), array_size))));
++                         PyUnicode_FromWideChar(line.get(), array_size))));
+     }
+ }
+ 
+@@ -130,7 +131,7 @@ void grid2utf(T const& grid_type,
+     for (unsigned y = 0; y < grid_type.height(); y=y+resolution)
+     {
+         std::uint16_t idx = 0;
+-        const std::unique_ptr<Py_UNICODE[]> line(new Py_UNICODE[array_size]);
++        const std::unique_ptr<wchar_t[]> line(new wchar_t[array_size]);
+         mapnik::grid::value_type const* row = grid_type.get_row(y);
+         for (unsigned x = 0; x < grid_type.width(); x=x+resolution)
+         {
+@@ -156,19 +157,19 @@ void grid2utf(T const& grid_type,
+                         keys[val] = codepoint;
+                         key_order.push_back(val);
+                     }
+-                    line[idx++] = static_cast<Py_UNICODE>(codepoint);
++                    line[idx++] = static_cast<wchar_t>(codepoint);
+                     ++codepoint;
+                 }
+                 else
+                 {
+-                    line[idx++] = static_cast<Py_UNICODE>(key_pos->second);
++                    line[idx++] = static_cast<wchar_t>(key_pos->second);
+                 }
+             }
+             // else, shouldn't get here...
+         }
+         l.append(boost::python::object(
+                      boost::python::handle<>(
+-                         PyUnicode_FromUnicode(line.get(), array_size))));
++                         PyUnicode_FromWideChar(line.get(), array_size))));
+     }
+ }
+ 


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ boost1.71.patch
 proj6-apis.patch
 proj6-syntax.patch
 no-distutils.patch
+python-3.12.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-mapnik/-/compare/b78229dd836dd57f9948376e26b4c7cac7176c29...a5daf9a059e6256fce04ee0cb4324519c083ac78

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-mapnik/-/compare/b78229dd836dd57f9948376e26b4c7cac7176c29...a5daf9a059e6256fce04ee0cb4324519c083ac78
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/20231116/d20140e1/attachment-0001.htm>