public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tom Hughes <tom@compton.nu>
To: git-commits@fedoraproject.org
Subject: [rpms/mapnik] rawhide: Update to 4.3.2 upstream release
Date: Fri, 25 Sep 2026 14:53:51 GMT [thread overview]
Message-ID: <179034803126.1.7161678369264818313.rpms-mapnik-823feab6c19a@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/mapnik
Branch : rawhide
Commit : 823feab6c19ae5c663a41ab6fad6564b8f125f9d
Author : Tom Hughes <tom@compton.nu>
Date : 2026-09-25T15:29:58+01:00
Stats : +45/-17 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/mapnik/c/823feab6c19ae5c663a41ab6fad6564b8f125f9d?branch=rawhide
Log:
Update to 4.3.2 upstream release
---
diff --git a/.gitignore b/.gitignore
index c46270a..8787959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ mapnik-0.7.1.tar.bz2
/test-data-visual-ead7ca50d04002d7da7fca032cf4bfe97e8f938c.tar.gz
/mapnik-v4.3.1.tar.bz2
/test-data-visual-29cb2dd71074417a46716749babd256337bfc0fd.tar.gz
+/mapnik-v4.3.2.tar.bz2
diff --git a/mapnik-languages.patch b/mapnik-languages.patch
new file mode 100644
index 0000000..389c323
--- /dev/null
+++ b/mapnik-languages.patch
@@ -0,0 +1,25 @@
+From f3d3314bc6d6f4cbef6ae9a93d6683ecebb18147 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Fri, 25 Sep 2026 15:26:13 +0100
+Subject: [PATCH 4/4] Add C to declared languages for proj 9.9.0
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5926cb340..590084116 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,7 +10,7 @@ project(mapnik
+ VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATCH_VERSION}
+ HOMEPAGE_URL "https://mapnik.org/"
+ DESCRIPTION "Mapnik is an open source toolkit for developing mapping applications"
+- LANGUAGES CXX
++ LANGUAGES C CXX
+ )
+ message(STATUS "mapnik version: ${PROJECT_VERSION}")
+
+--
+2.55.0
+
diff --git a/mapnik-system-catch.patch b/mapnik-system-catch.patch
index fc5314e..4850081 100644
--- a/mapnik-system-catch.patch
+++ b/mapnik-system-catch.patch
@@ -1,7 +1,7 @@
-From 13353e3657a3d0820e22f0b9fd8beff7f59ad67e Mon Sep 17 00:00:00 2001
+From 058a0b6ad0e407ee2f23c062a609692d839c3163 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 18 Jun 2024 09:33:05 +0100
-Subject: [PATCH 2/3] Use system catch
+Subject: [PATCH 2/4] Use system catch
---
test/CMakeLists.txt | 20 +-
@@ -10,7 +10,7 @@ Subject: [PATCH 2/3] Use system catch
delete mode 100644 test/catch.hpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index f36b2c39c..317e28cca 100644
+index e809653c0..360823845 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,13 +1,7 @@
@@ -28,7 +28,7 @@ index f36b2c39c..317e28cca 100644
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0")
# for cmake 3.19+ https://cmake.org/cmake/help/git-stage/policy/CMP0110.html
-@@ -115,7 +109,7 @@ target_link_libraries(mapnik-test-unit PUBLIC
+@@ -117,7 +111,7 @@ target_link_libraries(mapnik-test-unit PUBLIC
# workaround since the "offical" include dir would be <catch2/catch.hpp>
file(COPY catch_ext.hpp DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
file(COPY cleanup.hpp DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
@@ -37,7 +37,7 @@ index f36b2c39c..317e28cca 100644
add_executable(agg_rasterizer_integer_overflow_test standalone/agg_rasterizer_integer_overflow_test.cpp)
target_link_libraries(agg_rasterizer_integer_overflow_test PUBLIC
-@@ -125,7 +119,7 @@ target_link_libraries(agg_rasterizer_integer_overflow_test PUBLIC
+@@ -127,7 +121,7 @@ target_link_libraries(agg_rasterizer_integer_overflow_test PUBLIC
mapnik::json
ICU::data ICU::i18n ICU::uc # needed for the static build (TODO: why isn't this correctly propagated from mapnik::mapnik?)
)
@@ -46,7 +46,7 @@ index f36b2c39c..317e28cca 100644
add_executable(datasource_registration_test standalone/datasource_registration_test.cpp)
target_link_libraries(datasource_registration_test PUBLIC
-@@ -134,7 +128,7 @@ target_link_libraries(datasource_registration_test PUBLIC
+@@ -136,7 +130,7 @@ target_link_libraries(datasource_registration_test PUBLIC
mapnik::agg
ICU::data ICU::i18n ICU::uc # needed for the static build (TODO: why isn't this correctly propagated from mapnik::mapnik?)
)
@@ -55,7 +55,7 @@ index f36b2c39c..317e28cca 100644
add_executable(font_registration_test standalone/font_registration_test.cpp)
target_link_libraries(font_registration_test PUBLIC
-@@ -144,7 +138,7 @@ target_link_libraries(font_registration_test PUBLIC
+@@ -146,7 +140,7 @@ target_link_libraries(font_registration_test PUBLIC
mapnik::json
ICU::data ICU::i18n ICU::uc # needed for the static build (TODO: why isn't this correctly propagated from mapnik::mapnik?)
)
@@ -64,7 +64,7 @@ index f36b2c39c..317e28cca 100644
add_executable(map_xml_test standalone/map_xml_test.cpp)
target_link_libraries(map_xml_test PUBLIC
-@@ -154,9 +148,9 @@ target_link_libraries(map_xml_test PUBLIC
+@@ -156,9 +150,9 @@ target_link_libraries(map_xml_test PUBLIC
mapnik::json
ICU::data ICU::i18n ICU::uc # needed for the static build (TODO: why isn't this correctly propagated from mapnik::mapnik?)
)
@@ -20536,5 +20536,5 @@ index d003ee289..000000000
-// end catch.hpp
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
--
-2.53.0
+2.55.0
diff --git a/mapnik-system-sparsehash.patch b/mapnik-system-sparsehash.patch
index 569f78d..a3cec1e 100644
--- a/mapnik-system-sparsehash.patch
+++ b/mapnik-system-sparsehash.patch
@@ -1,7 +1,7 @@
-From 11de17227cce348bc7ad21f67116005f5ea2299a Mon Sep 17 00:00:00 2001
+From e5afee6a9dd8310eeca4dc574365722610e27208 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Jun 2013 18:45:57 +0100
-Subject: [PATCH 1/3] Use system sparsehash
+Subject: [PATCH 1/4] Use system sparsehash
---
include/mapnik/palette.hpp | 2 +-
@@ -21,5 +21,5 @@ index 35a4464a4..3a6316501 100644
#else
#include <unordered_map>
--
-2.53.0
+2.55.0
diff --git a/mapnik-visual-compare.patch b/mapnik-visual-compare.patch
index c6127f8..7d4de0b 100644
--- a/mapnik-visual-compare.patch
+++ b/mapnik-visual-compare.patch
@@ -1,7 +1,7 @@
-From bc521046a5b7f255426f75abebfe47ecea35c88b Mon Sep 17 00:00:00 2001
+From 677acab257210f042dadeabb5430b210f720f59e Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 2 Mar 2025 12:24:19 +0000
-Subject: [PATCH 3/3] Allow some minor differences in images
+Subject: [PATCH 3/4] Allow some minor differences in images
---
test/visual/renderer.hpp | 5 +++--
@@ -31,5 +31,5 @@ index e5e6278de..9650d5ff9 100644
void save(image_type const& image, mapnik::fs::path const& path) const
--
-2.53.0
+2.55.0
diff --git a/mapnik.spec b/mapnik.spec
index b9bf19e..0da4ff2 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -6,7 +6,7 @@
%global vectortileshortcommit %(c=%{vectortilecommit}; echo ${c:0:7})
Name: mapnik
-Version: 4.3.1
+Version: 4.3.2
Release: %autorelease
Summary: Free Toolkit for developing mapping applications
License: LGPL-2.1-only
@@ -23,6 +23,8 @@ Patch: mapnik-system-sparsehash.patch
Patch: mapnik-system-catch.patch
# Allow some minor differences in the visual tests
Patch: mapnik-visual-compare.patch
+# Add C to cmake languages for proj 9.9.0
+Patch: mapnik-languages.patch
# Exclude big endian architectures as mapnik does not support them
# https://github.com/mapnik/mapnik/issues/2313
diff --git a/sources b/sources
index f9f39e8..d78fcc5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (mapnik-v4.3.1.tar.bz2) = ca00b7e54bc416f8bb2c823cd2a4f52c3e2360bd4e75809f7e682bfa592d6eddd430d6b4adef9f3b12819c0fdce5547b8a3fee9d85b0c557ef11f4452d08d2bc
+SHA512 (mapnik-v4.3.2.tar.bz2) = 01ec78470d9f14d16b22f9c8e5ed219f1587c3b71268e8336046fee313cd290e21690d7ea5ecc67332eba731bfbaa5c44342ea914567a5de778844ca42e8ef65
SHA512 (mapnik-vector-tile-5a0cfbb6b909ae945f4a9e40777772a2b1c8fe9b.tar.gz) = c637f323daadb4af9071e2b88cb9d14a4b21568e19081687da204eb342efa09c67148ddcbf0d6c9ddc419049a7a2436b3b812603a3d9a3bb7ed390c81f6484f2
SHA512 (test-data-be28538869c7055246e80bcea1afe6032d5f6edf.tar.gz) = 58c82f570fb5a0a11cb1b5a50e9a46ac70b6573b4b92c970219a722216f7990a81f2ab6d0d81b48f959358499424c97cc7d2d19a9537fd03e63572f6476881bf
SHA512 (test-data-visual-29cb2dd71074417a46716749babd256337bfc0fd.tar.gz) = 71f9ed5c7a67baad670a9a79024adef07f8742dc4c969dda6f28951ec414aa09cbd46d37952d8bfb54c84f6233508e80be44de7ce2e4c9bc039809c7fb54960b
reply other threads:[~2026-09-25 14:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179034803126.1.7161678369264818313.rpms-mapnik-823feab6c19a@fedoraproject.org \
--to=tom@compton.nu \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox