Bas Couwenberg pushed to branch master at Debian GIS Project / tilestache
Commits: 1b59db9e by Bas Couwenberg at 2018-09-07T09:57:23Z Add upstream patch for Mapnik FontEngine changes. (closes: #908198) - - - - - 0c572bc2 by Bas Couwenberg at 2018-09-07T09:57:32Z Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - + debian/patches/0001-Modify-so-that-Mapnik-FontEngine-API-can-be-used-wit.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,11 @@ -tilestache (1.51.5-4) UNRELEASED; urgency=medium +tilestache (1.51.5-4) unstable; urgency=medium * Bump Standards-Version to 4.2.1, no changes. * Update watch file to limit matches to archive path. + * Add upstream patch for Mapnik FontEngine changes. + (closes: #908198) - -- Bas Couwenberg <[email protected]> Sun, 05 Aug 2018 21:01:49 +0200 + -- Bas Couwenberg <[email protected]> Fri, 07 Sep 2018 11:57:24 +0200 tilestache (1.51.5-3) unstable; urgency=medium ===================================== debian/patches/0001-Modify-so-that-Mapnik-FontEngine-API-can-be-used-wit.patch ===================================== @@ -0,0 +1,21 @@ +Description: Modify so that Mapnik FontEngine API can be used with older and newer Mapnik builds. +Author: Sean Brewer <[email protected]> +Origin: https://github.com/TileStache/TileStache/pull/327/commits/c36a0d699e4852e85aeb555ef326b0739b77079e +Bug: https://github.com/TileStache/TileStache/pull/327 +Bug-Debian: https://bugs.debian.org/908198 + +--- a/TileStache/Mapnik.py ++++ b/TileStache/Mapnik.py +@@ -91,7 +91,11 @@ class ImageProvider: + self.layer = layer + self.mapnik = None + +- engine = mapnik.FontEngine.instance() ++ # Maintain compatiblity between old and new Mapnik FontEngine API ++ try: ++ engine = mapnik.FontEngine.instance() ++ except AttributeError: ++ engine = mapnik.FontEngine + + if fonts: + fontshref = urljoin(layer.config.dirpath, fonts) ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ 00-use_system_font.patch 03-use_system_modestmaps.patch +0001-Modify-so-that-Mapnik-FontEngine-API-can-be-used-wit.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/tilestache/compare/058a055730e01bfcfb79146700aa1108e23d6608...0c572bc2d113e7bebc5d851fd9827091224b1814 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/tilestache/compare/058a055730e01bfcfb79146700aa1108e23d6608...0c572bc2d113e7bebc5d851fd9827091224b1814 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
