springmeyer

diff --git a/compositing-circles/.thumb.png b/compositing-circles/.thumb.png
index fb6d816..567e586 100644
Binary files a/compositing-circles/.thumb.png and b/compositing-circles/.thumb.png differ
diff --git a/compositing-circles/style.mss b/compositing-circles/style.mss
index 4833f53..81d2292 100644
--- a/compositing-circles/style.mss
+++ b/compositing-circles/style.mss
@@ -12,11 +12,11 @@ Map {
 }
 

springmeyer

this patch is no longer relevant, changes have been committed: 

 - https://trac.openstreetmap.org/changeset/29246/subversion
 - https://trac.openstreetmap.org/changeset/29247/subversion
 - https://trac.openstreetmap.org/changeset/29248/subversion

springmeyer

(env)~/projects/OSMTM[master]$ python setup.py test
/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'paster_plugins'
  warnings.warn(msg)
running test
running egg_info
writing requirements to OSMTM.egg-info/requires.txt
writing OSMTM.egg-info/PKG-INFO
writing top-level names to OSMTM.egg-info/top_level.txt
writing dependency_links to OSMTM.egg-info/dependency_links.txt
writing entry points to OSMTM.egg-info/entry_points.txt

springmeyer

 
~/projects/OSMTM[master]$ python setup.py test
running test
Searching for js.lesscss
Reading http://pypi.python.org/simple/js.lesscss/
Best match: js.lesscss 1.3.0
Downloading http://pypi.python.org/packages/source/j/js.lesscss/js.lesscss-1.3.0.tar.gz#md5=0e781fb5d0fbbdca9ea69ddad532735c
Processing js.lesscss-1.3.0.tar.gz
Running js.lesscss-1.3.0/setup.py -q bdist_egg --dist-dir /var/folders/dw/3_t671bx2cx9f23ywm4300080000gn/T/easy_install-fEENyG/js.lesscss-1.3.0/egg-dist-tmp-yEd1wY

springmeyer

Index: include/mapnik/datasource_cache.hpp
===================================================================
--- include/mapnik/datasource_cache.hpp	(revision 2515)
+++ include/mapnik/datasource_cache.hpp	(working copy)
@@ -47,7 +47,7 @@
         datasource_cache& operator=(const datasource_cache&);
         static std::map<std::string,boost::shared_ptr<PluginInfo> > plugins_;
         static bool registered_;
-        static bool insert(const std::string&  name,const lt_dlhandle module);
+		static bool insert(const std::string& name, const TDynamicLibraryHandle module);

springmeyer

Index: include/mapnik/font_engine_freetype.hpp
===================================================================
--- include/mapnik/font_engine_freetype.hpp	(revision 3225)
+++ include/mapnik/font_engine_freetype.hpp	(working copy)
@@ -329,10 +329,10 @@
     typedef boost::ptr_vector<glyph_t> glyphs_t;
     typedef T pixmap_type;
 
-    text_renderer (pixmap_type & pixmap, face_set_ptr faces, stroker & s)
+    text_renderer (pixmap_type & pixmap, face_set_ptr faces/*, stroker & s*/)

springmeyer

Index: include/mapnik/layer.hpp
===================================================================
--- include/mapnik/layer.hpp	(revision 3315)
+++ include/mapnik/layer.hpp	(working copy)
@@ -180,6 +180,10 @@
      */
     bool cache_features() const; 
         
+    void set_deferred_labels(bool deferred_labels);
+    

springmeyer

diff --git a/bindings/python/build.py b/bindings/python/build.py
index 2a83607..4e336d2 100644
--- a/bindings/python/build.py
+++ b/bindings/python/build.py
@@ -187,18 +187,16 @@ _mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LIBS=libraries, LDMOD
 
 Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
 
+cxx_module_path = target_path
 if env['PLATFORM'] == 'SunOS' and env['PYTHON_IS_64BIT']:

springmeyer

#!/usr/bin/env python
# -*- coding: utf-8 -*-

import optparse
import mapnik
import sys
import os

parser = optparse.OptionParser(usage="""%prog datasource files (like .geojson, .shp, .csv, .sqlite, .osm, .kml)

springmeyer

> tilemill@0.10.0 postinstall /Users/dane/projects/tilemill
> node ./lib/gitutil.js

sphericalmercator@1.0.2 node_modules/sphericalmercator

step@0.0.5 node_modules/step

chrono@1.0.4 node_modules/chrono

semver@1.0.14 node_modules/semver