Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapnik
Commits: 8588c516 by Bas Couwenberg at 2018-03-09T10:25:12+01:00 Add patch to use pkg-config when freetype-config is not available. (closes: #892062) - - - - - 3 changed files: - debian/changelog - + debian/patches/freetype-pkgconfig.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mapnik (3.0.19+ds-1~exp2) UNRELEASED; urgency=medium + + * Add patch to use pkg-config when freetype-config is not available. + (closes: #892062) + + -- Bas Couwenberg <sebas...@debian.org> Fri, 09 Mar 2018 10:24:28 +0100 + mapnik (3.0.19+ds-1~exp1) experimental; urgency=medium * New upstream release. ===================================== debian/patches/freetype-pkgconfig.patch ===================================== --- /dev/null +++ b/debian/patches/freetype-pkgconfig.patch @@ -0,0 +1,41 @@ +Description: Use pkg-config when freetype-config is not available. +Author: Bas Couwenberg <sebas...@debian.org> +Bug: https://github.com/mapnik/mapnik/issues/3870 +Bug-Debian: https://bugs.debian.org/892451 + +--- a/SConstruct ++++ b/SConstruct +@@ -1393,6 +1393,8 @@ if not preconfigured: + ['harfbuzz', 'harfbuzz/hb.h',True,'C++'] + ] + ++ CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0') ++ + if env.get('FREETYPE_LIBS') or env.get('FREETYPE_INCLUDES'): + REQUIRED_LIBSHEADERS.insert(0,['freetype','ft2build.h',True,'C']) + if env.get('FREETYPE_INCLUDES'): +@@ -1413,6 +1415,15 @@ if not preconfigured: + env['EXTRA_FREETYPE_LIBS'].append('bz2') + except OSError as e: + pass ++ elif env['RUNTIME_LINK'] == 'static': ++ temp_env = env.Clone() ++ temp_env['LIBS'] = [] ++ try: ++ temp_env.ParseConfig('pkg-config freetype2 --libs') ++ if 'bz2' in temp_env['LIBS']: ++ env['EXTRA_FREETYPE_LIBS'].append('bz2') ++ except OSError as e: ++ pass + + # libxml2 should be optional but is currently not + # https://github.com/mapnik/mapnik/issues/913 +@@ -1635,8 +1646,6 @@ if not preconfigured: + env['MISSING_DEPS'].append('ICU_DATA') + + +- CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0') +- + if len(env['REQUESTED_PLUGINS']): + if env['HOST']: + for plugin in env['REQUESTED_PLUGINS']: ===================================== debian/patches/series ===================================== --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +freetype-pkgconfig.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/commit/8588c516be133d1f40176b843bd2da98df75c363 --- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/commit/8588c516be133d1f40176b843bd2da98df75c363 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel