[Git][debian-gis-team/mapnik][master] 3 commits: Add patch to fix FTBFS with libxml2 2.12. (closes: #1073332)

[Bas Couwenberg (@sebastic)]

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


Commits:
31ec0406 by Bas Couwenberg at 2024-06-16T16:34:09+02:00
Add patch to fix FTBFS with libxml2 2.12. (closes: #1073332)

- - - - -
2d8a76bb by Bas Couwenberg at 2024-06-16T16:39:49+02:00
Mark python3.12-imp.patch as Forwarded: not-needed.

- - - - -
f6ba5e95 by Bas Couwenberg at 2024-06-16T16:40:04+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/libxml-2.12.patch
- debian/patches/python3.12-imp.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,11 @@
-mapnik (3.1.0+ds-8) UNRELEASED; urgency=medium
+mapnik (3.1.0+ds-8) unstable; urgency=medium
 
   * Add patch to fix FTBFS with Python 3.12.
     (closes: #1067163)
+  * Add patch to fix FTBFS with libxml2 2.12.
+    (closes: #1073332)
 
- -- Bas Couwenberg <sebastic at debian.org>  Tue, 19 Mar 2024 18:13:04 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 16 Jun 2024 16:39:50 +0200
 
 mapnik (3.1.0+ds-7) unstable; urgency=medium
 


=====================================
debian/patches/libxml-2.12.patch
=====================================
@@ -0,0 +1,24 @@
+Description: Fix broken builds with libxml2 >= v2.12.0
+Author: David Hummel <6109326+hummeltech at users.noreply.github.com>
+Bug: https://github.com/mapnik/mapnik/pull/4423
+
+--- a/src/libxml2_loader.cpp
++++ b/src/libxml2_loader.cpp
+@@ -79,7 +79,7 @@ public:
+ 
+         if (!doc)
+         {
+-            xmlError * error = xmlCtxtGetLastError(ctx_);
++            const xmlError * error = xmlCtxtGetLastError(ctx_);
+             if (error)
+             {
+                 std::string msg("XML document not well formed:\n");
+@@ -118,7 +118,7 @@ public:
+         if (!doc)
+         {
+             std::string msg("XML document not well formed");
+-            xmlError * error = xmlCtxtGetLastError( ctx_ );
++            const xmlError * error = xmlCtxtGetLastError( ctx_ );
+             if (error)
+             {
+                 msg += ":\n";


=====================================
debian/patches/python3.12-imp.patch
=====================================
@@ -1,6 +1,7 @@
 Description: Fix FTBFS with Python 3.12.
 Author: Mats Wichmann <mats at linux.com>
 Origin: https://github.com/SCons/scons/commit/97c7246f5efb311b007d7aa6b585aa6b47a17230
+Forwarded: not-needed
 
 --- a/scons/scons-local-3.0.1/SCons/Platform/__init__.py
 +++ b/scons/scons-local-3.0.1/SCons/Platform/__init__.py


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ boost-1.81.patch
 boost-1.83-1.patch
 boost-1.83-2.patch
 python3.12-imp.patch
+libxml-2.12.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/95704ee405be16734cb34ab7c0c8af8b43dd022b...f6ba5e95e062091d3f84a3ffb93cb437ab09c055

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/95704ee405be16734cb34ab7c0c8af8b43dd022b...f6ba5e95e062091d3f84a3ffb93cb437ab09c055
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/20240616/24492342/attachment-0001.htm>