Bas Couwenberg pushed to branch master at Debian GIS Project / mapnik
Commits: 2165850e by Bas Couwenberg at 2020-01-21T15:14:57+01:00 Add patch to use pkg-config for libxml2. (closes: #949412) - - - - - 3 changed files: - debian/changelog - + debian/patches/libxml2.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -2,6 +2,8 @@ mapnik (3.0.22+ds1-2) UNRELEASED; urgency=medium * Bump Standards-Version to 4.4.1, no changes. * Drop Name field from upstream metadata. + * Add patch to use pkg-config for libxml2. + (closes: #949412) -- Bas Couwenberg <[email protected]> Mon, 30 Sep 2019 19:24:02 +0200 ===================================== debian/patches/libxml2.patch ===================================== @@ -0,0 +1,30 @@ +Description: Use pkg-config for libxml2. +Author: Bas Couwenberg <[email protected]> +Bug: https://github.com/mapnik/mapnik/issues/4109 +Bug-Debian: https://bugs.debian.org/949412 +Forwarded: https://github.com/mapnik/mapnik/pull/4114 + +--- a/SConstruct ++++ b/SConstruct +@@ -1441,6 +1441,21 @@ if not preconfigured: + if env.get('XML2_LIBS'): + lib_path = env['XML2_LIBS'] + env.AppendUnique(LIBPATH = fix_path(lib_path)) ++ elif CHECK_PKG_CONFIG and conf.CheckPKG('libxml-2.0'): ++ # libxml2 2.9.10+ doesn't use xml2-config and uses pkg-config instead ++ cmd = 'pkg-config libxml-2.0 --libs --cflags' ++ ++ temp_env = Environment(ENV=os.environ) ++ try: ++ temp_env.ParseConfig(cmd) ++ for inc in temp_env['CPPPATH']: ++ env.AppendUnique(CPPPATH = fix_path(inc)) ++ env['HAS_LIBXML2'] = True ++ for lib in temp_env['LIBS']: ++ env.AppendUnique(LIBPATH = fix_path(lib)) ++ env['HAS_LIBXML2'] = True ++ except OSError as e: ++ pass + elif conf.parse_config('XML2_CONFIG',checks='--cflags'): + env['HAS_LIBXML2'] = True + else: ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 0001-Use-pkg-config-to-find-FreeType2-if-available.patch +libxml2.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/commit/2165850e49749bb002791828c8339c26118e978b -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/commit/2165850e49749bb002791828c8339c26118e978b 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
