diff options
Diffstat (limited to 'sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch')
-rw-r--r-- | sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch b/sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch new file mode 100644 index 000000000000..e463cf33b9de --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.0.0-gentoo.patch @@ -0,0 +1,65 @@ +--- SConstruct.orig 2011-11-06 09:52:20.000000000 -0800 ++++ SConstruct 2011-11-06 09:55:03.000000000 -0800 +@@ -314,9 +313,9 @@ + ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), + + # Install Variables +- ('PREFIX', 'The install path "prefix"', '/usr/local'), ++ ('PREFIX', 'The install path "prefix"', '/usr'), + ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''), +- ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), ++ ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '${D}'), + ('PATH_INSERT', 'A custom path to append to the $PATH env to prioritize usage of shell programs like pkg-config will be used if multiple are present on the system', ''), + + # Boost variables +@@ -342,15 +341,17 @@ + PathVariable('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), + PathVariable('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include', PathVariable.PathAccept), + PathVariable('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), +- PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include', PathVariable.PathAccept), +- PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA, PathVariable.PathAccept), ++ PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept), ++ PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), ++ PathVariable('AGG_INCLUDES', 'Search path for AGG include files', '/usr/include/agg2', PathVariable.PathAccept), ++ PathVariable('AGG_LIBS', 'Search path for AGG library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept), + ('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''), + + # Variables affecting rendering back-ends + + BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'), + +- BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'), ++ BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'False'), + + BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'), + +@@ -1098,6 +1099,7 @@ + ['z', 'zlib.h', True,'C'], + ['proj', 'proj_api.h', True,'C'], + [env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'], ++ ['agg','agg2/agg_config.h' , True,'C++'], + ] + + if env['JPEG']: +--- src/build.py.orig 2011-11-05 18:30:33.000000000 -0700 ++++ src/build.py 2011-11-05 18:31:14.000000000 -0700 +@@ -37,9 +37,6 @@ + elif not silent: + print stderr + +-def ldconfig(*args,**kwargs): +- call('ldconfig') +- + if env['LINKING'] == 'static': + lib_env.Append(CXXFLAGS="-fPIC") + +@@ -326,9 +323,6 @@ + if 'uninstall' not in COMMAND_LINE_TARGETS: + result = env.InstallAs(target=target, source=mapnik) + env.Alias(target='install', source=result) +- if result: +- env.AddPostAction(result, ldconfig) +- + + # Install symlinks + target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)) |