diff options
Diffstat (limited to 'sci-geosciences/mapnik/files')
12 files changed, 229 insertions, 0 deletions
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch new file mode 100644 index 000000000000..14321c1cba30 --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch @@ -0,0 +1,24 @@ +From c33d534b802f353a2cd1b42e98a6f5e8e04bc2b5 Mon Sep 17 00:00:00 2001 +From: Dane Springmeyer <dane@dbsgeo.com> +Date: Thu, 9 Feb 2012 16:00:39 -0800 +Subject: [PATCH] link to boost system + +--- + plugins/input/templates/helloworld/build.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/input/templates/helloworld/build.py b/plugins/input/templates/helloworld/build.py +index 402b882..c0b75f0 100644 +--- a/plugins/input/templates/helloworld/build.py ++++ b/plugins/input/templates/helloworld/build.py +@@ -44,6 +44,7 @@ + libraries = [ '' ] # eg 'libfoo' + + libraries.append('mapnik') ++libraries.append('boost_system%s' % env['BOOST_APPEND']) + # link libicuuc, but ICU_LIB_NAME is used custom builds of icu can + # have different library names like osx which offers /usr/lib/libicucore.dylib + libraries.append(env['ICU_LIB_NAME']) +-- +1.7.10 + diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch new file mode 100644 index 000000000000..d7facc363a2a --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch @@ -0,0 +1,21 @@ +diff -urN mapnik-v2.0.1.old/SConstruct mapnik-v2.0.1/SConstruct +--- mapnik-v2.0.1.old/SConstruct 2012-05-26 11:04:50.364638533 +0200 ++++ mapnik-v2.0.1/SConstruct 2012-05-26 11:07:49.554621727 +0200 +@@ -501,16 +501,7 @@ + #print 'missing opt', opt + preconfigured = False + +-# if custom arguments are supplied make sure to accept them +-if opts.args: +- # since we have custom arguments update environment with all opts to +- # make sure to absorb the custom ones +- opts.Update(env) +- # now since we've got custom arguments we'll disregard any +- # pickled environment and force another configuration +- preconfigured = False +- +-elif preconfigured: ++if preconfigured: + if not HELP_REQUESTED: + color_print(4,'Using previous successful configuration...') + color_print(4,'Re-configure by running "python scons/scons.py configure".') diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch new file mode 100644 index 000000000000..4379303d71a7 --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch @@ -0,0 +1,12 @@ +diff -urN mapnik-v2.0.1.old/SConstruct mapnik-v2.0.1/SConstruct +--- mapnik-v2.0.1.old/SConstruct 2012-05-26 11:04:50.364638533 +0200 ++++ mapnik-v2.0.1/SConstruct 2012-05-26 11:26:29.003516741 +0200 +@@ -1445,7 +1445,7 @@ + site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"''' % env['PYTHON'] + else: + site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)"''' % env['PYTHON'] +- env['PYTHON_SITE_PACKAGES'] = call(site_packages) ++ env['PYTHON_SITE_PACKAGES'] = os.path.normpath(os.path.realpath(env['DESTDIR'])) + call(site_packages) + else: + env['PYTHON_SYS_PREFIX'] = os.popen('''%s -c "import sys; print sys.prefix"''' % env['PYTHON']).read().strip() + env['PYTHON_VERSION'] = os.popen('''%s -c "import sys; print sys.version"''' % env['PYTHON']).read()[0:3] diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch new file mode 100644 index 000000000000..257d1b0d58bd --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch @@ -0,0 +1,56 @@ +--- mapnik-v2.0.1.orig/SConstruct ++++ mapnik-v2.0.1/SConstruct +@@ -313,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', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), + ('PATH_REMOVE', 'A path prefix to exclude from all know command and compile paths', ''), + +@@ -342,15 +342,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'), + +@@ -1087,6 +1089,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']: +diff -ur mapnik-v2.0.1.orig/src/build.py mapnik-v2.0.1/src/build.py +--- mapnik-v2.0.1.orig/src/build.py 2012-04-09 23:56:48.000000000 +0100 ++++ mapnik-v2.0.1/src/build.py 2012-05-06 17:00:53.124452488 +0100 +@@ -333,9 +333,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])),int(major), int(minor))) diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch new file mode 100644 index 000000000000..e5ca048c39d8 --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch @@ -0,0 +1,20 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -481,16 +481,7 @@ + #print 'missing opt', opt + preconfigured = False + +-# if custom arguments are supplied make sure to accept them +-if opts.args: +- # since we have custom arguments update environment with all opts to +- # make sure to absorb the custom ones +- opts.Update(env) +- # now since we've got custom arguments we'll disregard any +- # pickled environment and force another configuration +- preconfigured = False +- +-elif preconfigured: ++if preconfigured: + if not HELP_REQUESTED: + color_print(4,'Using previous successful configuration...') + color_print(4,'Re-configure by running "python scons/scons.py configure".') diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch new file mode 100644 index 000000000000..e73e2ccb727c --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch @@ -0,0 +1,11 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -1362,7 +1362,7 @@ + site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"''' % env['PYTHON'] + else: + site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)"''' % env['PYTHON'] +- env['PYTHON_SITE_PACKAGES'] = call(site_packages) ++ env['PYTHON_SITE_PACKAGES'] = os.path.normpath(os.path.realpath(env['DESTDIR'])) + call(site_packages) + else: + env['PYTHON_SYS_PREFIX'] = os.popen('''%s -c "import sys; print sys.prefix"''' % env['PYTHON']).read().strip() + env['PYTHON_VERSION'] = os.popen('''%s -c "import sys; print sys.version"''' % env['PYTHON']).read()[0:3] diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch new file mode 100644 index 000000000000..bc6524697b01 --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch @@ -0,0 +1,12 @@ +--- a/src/build.py ++++ b/src/build.py +@@ -38,7 +38,8 @@ + print stderr + + def ldconfig(*args,**kwargs): +- call('ldconfig') ++ if 0: ++ call('ldconfig') + + if env['LINKING'] == 'static': + lib_env.Append(CXXFLAGS="-fPIC") diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch new file mode 100644 index 000000000000..18d9409532f5 --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch @@ -0,0 +1,15 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -284,10 +284,10 @@ + ('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'), + ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), + ('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', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), + ('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths', ''), + ('PATH_REPLACE', 'Two path prefixes (divided with a :) to search/replace from all known command and compile paths', ''), diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch new file mode 100644 index 000000000000..89541cb85ed7 --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch @@ -0,0 +1,20 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -503,16 +503,7 @@ for opt in pickle_store: + #print 'missing opt', opt + preconfigured = False + +-# if custom arguments are supplied make sure to accept them +-if opts.args: +- # since we have custom arguments update environment with all opts to +- # make sure to absorb the custom ones +- opts.Update(env) +- # now since we've got custom arguments we'll disregard any +- # pickled environment and force another configuration +- preconfigured = False +- +-elif preconfigured: ++if preconfigured: + if not HELP_REQUESTED: + color_print(4,'Using previous successful configuration...') + color_print(4,'Re-configure by running "python scons/scons.py configure".') diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch new file mode 100644 index 000000000000..c92c0e9a02a7 --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch @@ -0,0 +1,11 @@ +--- a/src/build.py ++++ b/src/build.py +@@ -38,7 +38,7 @@ def call(cmd, silent=True): + print stderr + + def ldconfig(*args,**kwargs): +- call('ldconfig') ++ pass + + if env['LINKING'] == 'static': + lib_env.Append(CXXFLAGS="-fPIC") diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch new file mode 100644 index 000000000000..4266f624070d --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch @@ -0,0 +1,16 @@ +diff --git a/bindings/python/mapnik_datasource.cpp b/bindings/python/mapnik_datasource.cpp +index 07383b3..85e2ff7 100644 +--- a/bindings/python/mapnik_datasource.cpp ++++ b/bindings/python/mapnik_datasource.cpp +@@ -61,7 +61,11 @@ boost::shared_ptr<mapnik::datasource> create_datasource(dict const& d) + PyObject* temp = PyUnicode_AsUTF8String(obj.ptr()); + if (temp) + { ++#if PY_VERSION_HEX >= 0x03000000 ++ char* c_str = PyBytes_AsString(temp); ++#else + char* c_str = PyString_AsString(temp); ++#endif + params[key] = std::string(c_str); + Py_DecRef(temp); + } diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch new file mode 100644 index 000000000000..0ddcd0f9e0dd --- /dev/null +++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch @@ -0,0 +1,11 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -291,7 +291,7 @@ opts.AddVariables( + ('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'), + ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), + ('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', '/'), |