<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50deffd870210fb91d22dc1c2d63fb866fd896c7">https://github.com/macports/macports-ports/commit/50deffd870210fb91d22dc1c2d63fb866fd896c7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 50deffd870210fb91d22dc1c2d63fb866fd896c7
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue May 7 07:24:17 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> qgis3: bump to 3.6.2 and adapts to the new py-gdal layout (names w/trailing python version)
</span>---
gis/qgis3/Portfile | 45 ++++++++++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91f622a..766c143 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup github 1.0
</span> PortGroup qt5 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup qgis QGIS 3_6_0 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup qgis QGIS 3_6_2 final-
</span> name qgis3
version [string map {_ .} ${github.version}]
revision 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ license GPL-2+
</span>
homepage http://www.qgis.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b227ab566fd03371e4ef886fd2f18832aa40968c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d11507783e2ee3f7ed22ba693c8c8497372a47fdb6bc34460cf8066a92d21903 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 92706111
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0eedec75916562a51e4e8f02540ee3a269668996 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a0133373d7e478924f611e8fbdec0255156271fc2efd3197aea2ab20290194ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 94655141
</span>
depends_lib-append port:libiconv \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +67,21 @@ post-patch {
</span> # Handle QGIS Fix #11399 which doesn’t seem to work anymore
reinplace -E "s|#ifdef Q_OS_MAC$|#if 0|" \
${worksrcpath}/src/app/layout/qgslayoutdesignerdialog.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Complies with py-gdal layout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gdal_py_prefix "${worksrcpath}/python/plugins/processing/algs/gdal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach file {"AssignProjection" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "fillnodata" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "gdal2tiles" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "gdal2xyz" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "gdalcalc" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "merge" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "polygonize" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "proximity" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "retile" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "sieve" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|\\+ '.py'|\\+ '.py-${pyversion}'|" ${gdal_py_prefix}/${file}.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
compiler.blacklist {clang < 500}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,29 +141,29 @@ variant server description "Builds with the server (FCGI) option" {
</span>
post-destroot {
# Fix wrong @loader_path/... library paths
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set r "${applications_dir}/Qgis3.app/Contents"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set r "${applications_dir}/Qgis3.app/Contents"
</span> set w "@loader_path/.."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set d "${destroot}${r}/MacOS/lib/qgis/server"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set d "${destroot}${applications_dir}/Qgis3.app/Contents/MacOS/lib/qgis/server"
</span>
foreach lib {"libdummy.so" "libwcs.so" "libwfs.so" "libwms.so" "libwmts.so"} {
exec install_name_tool -change "${w}/../Frameworks/qgis_native.framework/qgis_native" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${r}/Frameworks/qgis_native.framework/qgis_native" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${w}/../../../Frameworks/qgis_native.framework/qgis_native" \
</span> "${d}/${lib}"
exec install_name_tool -change "${w}/../Frameworks/qgis_core.framework/qgis_core" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${r}/Frameworks/qgis_core.framework/qgis_core" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${w}/../../../Frameworks/qgis_core.framework/qgis_core" \
</span> "${d}/${lib}"
exec install_name_tool -change "${w}/../Frameworks/qgis_analysis.framework/qgis_analysis" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${r}/Frameworks/qgis_analysis.framework/qgis_analysis" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${w}/../../../Frameworks/qgis_analysis.framework/qgis_analysis" \
</span> "${d}/${lib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- exec install_name_tool -change "${w}/lib/libqgispython.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${r}/MacOS/lib/libqgispython.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec install_name_tool -change "${w}/lib/libqgispython.${version}.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${w}/../libqgispython.${version}.dylib" \
</span> "${d}/${lib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- exec install_name_tool -change "${w}/lib/libqgis_server.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${r}/MacOS/lib/libqgis_server.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec install_name_tool -change "${w}/lib/libqgis_server.${version}.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${w}/../libqgis_server.${version}.dylib" \
</span> "${d}/${lib}"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,14 +283,14 @@ variant grass description "Build Grass 7 plugin" {
</span>
depends_lib-append port:grass7
global grass_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set grass_version 7.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set grass_version 76
</span> post-patch {
reinplace "s|@GRASS_VERSION@|${grass_version}|g" \
${worksrcpath}/mac/app.info.plist.in
}
configure.args-delete "-DWITH_GRASS7=OFF"
configure.args-append "-DWITH_GRASS7=ON"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DGRASS_PREFIX7=${prefix}/share/grass-${grass_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DGRASS_PREFIX7=${prefix}/share/grass${grass_version}
</span> }
default_variants +grass
</pre><pre style='margin:0'>
</pre>