<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f9bfb5055434c29c3276586d801701b18920787">https://github.com/macports/macports-ports/commit/9f9bfb5055434c29c3276586d801701b18920787</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9f9bfb5055434c29c3276586d801701b18920787
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Fri Apr 5 15:30:22 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> mapnik: enable on ARM; update to proj7, postgresql15 dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/56429
</span>---
gis/mapnik/Portfile | 22 ++++++++++++----------
gis/mapnik/files/patch-scons-default.diff | 11 +++++++++++
gis/mapnik/files/patch-sconstruct.diff | 12 ++++++++++++
3 files changed, 35 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapnik/Portfile b/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index af1984df25f..9943ff79959 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,9 @@ PortGroup boost 1.0
</span>
name mapnik
version 3.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span> categories gis devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license LGPL-2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 x86_64
</span>
maintainers panulla.com:macports {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +45,9 @@ set python_version [string map {. {}} ${python_branch}]
</span>
patchfiles patch-scons-action.py.diff \
patch-scons-tool-javac.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-scons-util.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scons-util.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scons-default.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sconstruct.diff
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ depends_lib-append path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span> port:webp \
port:zlib \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj7
</span>
conflicts_build antigraingeometry
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +80,9 @@ variant gdal description {Build GDAL/OGR plugin} {
</span> }
variant postgis description {Build PostGIS plugin} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libpq.dylib:postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libpq.dylib:postgresql15
</span> if {![file exists ${prefix}/lib/libpq.dylib]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append PG_CONFIG=${prefix}/lib/postgresql10/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PG_CONFIG=${prefix}/lib/postgresql15/bin/pg_config
</span> }
lappend input_plugins postgis
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,12 +123,14 @@ configure.args CXX="\$CXX" \
</span> DESTDIR=${destroot} \
CAIRO=False \
CPP_TESTS=False \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FREETYPE_CONFIG=${prefix}/bin/freetype-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROJ_INCLUDES=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROJ_LIBS=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJ_INCLUDES=${prefix}/lib/proj7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJ_LIBS=${prefix}/lib/proj7/lib \
</span> BOOST_INCLUDES=[boost::include_dir] \
BOOST_LIBS=[boost::lib_dir]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach lib {ICU PNG JPEG TIFF CAIRO SQLITE HB WEBP} {
configure.args-append ${lib}_INCLUDES=${prefix}/include \
${lib}_LIBS=${prefix}/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapnik/files/patch-scons-default.diff b/gis/mapnik/files/patch-scons-default.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b2aef79cb02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapnik/files/patch-scons-default.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scons/scons-local-3.0.1/SCons/Defaults.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scons/scons-local-3.0.1/SCons/Defaults.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +210,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise SyntaxError("Could not find +, - or =")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ operation_list = operation.split(operator)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if len(operation_list) is not 2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if len(operation_list) != 2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise SyntaxError("More than one operator found")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ user = operation_list[0].strip().replace("a", "ugo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ permission = operation_list[1].strip()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapnik/files/patch-sconstruct.diff b/gis/mapnik/files/patch-sconstruct.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..664731d0718
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapnik/files/patch-sconstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SConstruct.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SConstruct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1417,7 +1417,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ temp_env.ParseConfig(cmd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for lib in temp_env['LIBS']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env.AppendUnique(LIBPATH = fix_path(lib))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.Append(LIBS = lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for inc in temp_env['CPPPATH']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.AppendUnique(CPPPATH = fix_path(inc))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except OSError as e:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>