diff -urwN python-mapnik-0.0~20151125-92e79d2-orig/debian/changelog python-mapnik-0.0~20151125-92e79d2/debian/changelog --- python-mapnik-0.0~20151125-92e79d2-orig/debian/changelog 2016-08-27 11:43:13.604000000 +0100 +++ python-mapnik-0.0~20151125-92e79d2/debian/changelog 2016-08-27 12:43:30.132926658 +0100 @@ -1,3 +1,9 @@ +python-mapnik (1:0.0~20151125-92e79d2-1build1ppa1) xenial; urgency=medium + + * Enable cairo support. + + -- Tom Hughes (Ubuntu Package Signing Key) Sat, 27 Aug 2016 11:15:00 +0000 + python-mapnik (1:0.0~20151125-92e79d2-1build1) xenial; urgency=medium * No-change rebuild to drop python3.4 support. diff -urwN python-mapnik-0.0~20151125-92e79d2-orig/debian/control python-mapnik-0.0~20151125-92e79d2/debian/control --- python-mapnik-0.0~20151125-92e79d2-orig/debian/control 2016-08-27 11:43:13.604000000 +0100 +++ python-mapnik-0.0~20151125-92e79d2/debian/control 2016-08-27 12:23:01.101391325 +0100 @@ -8,9 +8,11 @@ libboost-python-dev, libmapnik-dev (>= 3.0.9), python-all-dev, + python-cairo-dev, python-setuptools, python-nose, python3-all-dev, + python3-cairo-dev, python3-setuptools, python3-nose Standards-Version: 3.9.6 diff -urwN python-mapnik-0.0~20151125-92e79d2-orig/debian/patches/series python-mapnik-0.0~20151125-92e79d2/debian/patches/series --- python-mapnik-0.0~20151125-92e79d2-orig/debian/patches/series 2016-08-27 11:43:13.604000000 +0100 +++ python-mapnik-0.0~20151125-92e79d2/debian/patches/series 2016-08-27 12:21:13.459703397 +0100 @@ -1 +1,2 @@ mapnik-libdir.patch +setup-cairo.patch diff -urwN python-mapnik-0.0~20151125-92e79d2-orig/debian/patches/setup-cairo.patch python-mapnik-0.0~20151125-92e79d2/debian/patches/setup-cairo.patch --- python-mapnik-0.0~20151125-92e79d2-orig/debian/patches/setup-cairo.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-mapnik-0.0~20151125-92e79d2/debian/patches/setup-cairo.patch 2016-08-27 12:20:57.744055456 +0100 @@ -0,0 +1,25 @@ +commit 5d8692482df4fcb7c84e5b5c9b4acfbb587a8723 +Author: Tom Hughes +Date: Wed Dec 2 22:21:00 2015 +0000 + + Enable cairo support when PYCAIRO is set in the environment + +diff --git a/setup.py b/setup.py +index 1e6095c..29dd0ee 100755 +--- a/setup.py ++++ b/setup.py +@@ -236,6 +236,14 @@ if proj_path: + + extra_comp_args = check_output([mapnik_config, '--cflags']).split(' ') + ++if os.environ.get("PYCAIRO", "false") == "true": ++ try: ++ extra_comp_args.append('-DHAVE_PYCAIRO') ++ extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' ')) ++ linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' ')) ++ except: ++ raise Exception("Failed to find compiler options for pycairo") ++ + if sys.platform == 'darwin': + extra_comp_args.append('-mmacosx-version-min=10.8') + # silence warning coming from boost python macros which diff -urwN python-mapnik-0.0~20151125-92e79d2-orig/debian/rules python-mapnik-0.0~20151125-92e79d2/debian/rules --- python-mapnik-0.0~20151125-92e79d2-orig/debian/rules 2016-08-27 11:43:13.600000000 +0100 +++ python-mapnik-0.0~20151125-92e79d2/debian/rules 2016-08-27 12:21:36.303198613 +0100 @@ -12,6 +12,9 @@ # Custom mapnik libraries export LIB_DIR_NAME=/mapnik/3.0 +# Enable cairo +export PYCAIRO=true + %: dh $@ \ --with python2,python3 \