[Git][debian-gis-team/mapnik][experimental] 2 commits: Add upstream patch to use pkg-config for freetype2.
Bas Couwenberg
gitlab at salsa.debian.org
Thu Oct 25 14:50:08 BST 2018
Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapnik
Commits:
cd32506d by Bas Couwenberg at 2018-10-25T13:24:50Z
Add upstream patch to use pkg-config for freetype2.
- - - - -
37851b12 by Bas Couwenberg at 2018-10-25T13:25:14Z
Set distribution to unstable.
- - - - -
3 changed files:
- debian/changelog
- debian/patches/freetype-pkgconfig.patch → debian/patches/0001-Use-pkg-config-to-find-FreeType2-if-available.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+mapnik (3.0.21+ds-2) unstable; urgency=medium
+
+ * Add upstream patch to use pkg-config for freetype2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 25 Oct 2018 15:24:53 +0200
+
mapnik (3.0.21+ds-1) unstable; urgency=medium
* Move from experimental to unstable.
=====================================
debian/patches/freetype-pkgconfig.patch → debian/patches/0001-Use-pkg-config-to-find-FreeType2-if-available.patch
=====================================
@@ -1,39 +1,46 @@
-Description: Use pkg-config when freetype-config is not available.
-Author: Bas Couwenberg <sebastic at debian.org>
+Description: Use pkg-config to find FreeType2 if available
+Author: Raul Marin <rmrodriguez at cartodb.com>
+Origin: https://github.com/mapnik/mapnik/pull/3892/commits/23755a527a5e0f24a7591fcc41dece7ce5f080b7
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:
+@@ -1393,6 +1393,7 @@ 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'] = []
+@@ -1401,6 +1402,21 @@ if not preconfigured:
+ if env.get('FREETYPE_LIBS'):
+ lib_path = env['FREETYPE_LIBS']
+ env.AppendUnique(LIBPATH = fix_path(lib_path))
++ elif CHECK_PKG_CONFIG and conf.CheckPKG('freetype2'):
++ # Freetype 2.9+ doesn't use freetype-config and uses pkg-config instead
++ cmd = 'pkg-config freetype2 --libs --cflags'
++ if env['RUNTIME_LINK'] == 'static':
++ cmd += ' --static'
++
++ temp_env = Environment(ENV=os.environ)
+ try:
-+ temp_env.ParseConfig('pkg-config freetype2 --libs')
-+ if 'bz2' in temp_env['LIBS']:
-+ env['EXTRA_FREETYPE_LIBS'].append('bz2')
++ temp_env.ParseConfig(cmd)
++ for lib in temp_env['LIBS']:
++ env.AppendUnique(LIBPATH = fix_path(lib))
++ for inc in temp_env['CPPPATH']:
++ env.AppendUnique(CPPPATH = fix_path(inc))
+ 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:
+ elif conf.parse_config('FREETYPE_CONFIG'):
+ # check if freetype links to bz2
+ if env['RUNTIME_LINK'] == 'static':
+@@ -1634,9 +1650,6 @@ if not preconfigured:
+ color_print(1,'%s not detected on your system' % env['QUERIED_ICU_DATA'] )
env['MISSING_DEPS'].append('ICU_DATA')
-
+-
- CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0')
-
if len(env['REQUESTED_PLUGINS']):
=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-freetype-pkgconfig.patch
+0001-Use-pkg-config-to-find-FreeType2-if-available.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/compare/f81b69ac77b01624ae71df1868336b6755c31aa1...37851b12abd21aac40b9217038e4c90c5ad10eca
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/compare/f81b69ac77b01624ae71df1868336b6755c31aa1...37851b12abd21aac40b9217038e4c90c5ad10eca
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/20181025/2f8b3c77/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list