<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/077c3d3ce5262435ea6be69c8677644aaf54424d">https://github.com/macports/macports-ports/commit/077c3d3ce5262435ea6be69c8677644aaf54424d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 077c3d3 qgis3: Fix wrong relative rpaths in the server plug-ins using a patch. Also minor updates in patch-app_info_plist_in.diff.
</span>077c3d3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 077c3d3ce5262435ea6be69c8677644aaf54424d
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Sep 13 10:06:52 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> qgis3: Fix wrong relative rpaths in the server plug-ins using a patch. Also minor updates in patch-app_info_plist_in.diff.
</span>---
gis/qgis3/Portfile | 37 ++++--------------------
gis/qgis3/files/patch-MacBundleMacros.cmake.diff | 26 +++++++++++++++++
gis/qgis3/files/patch-app_info_plist_in.diff | 4 +--
3 files changed, 33 insertions(+), 34 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 2da2fef..2ce559b 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;'>@@ -11,7 +11,7 @@ PortGroup active_variants 1.1
</span> github.setup qgis QGIS 3_8_2 final-
name qgis3
version [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories gis
maintainers {vince @Veence} openmaintainer
description QGIS 3 is a user-friendly GIS based on Qt 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,8 @@ depends_build-append \
</span> port:ld64
patchfiles patch-app_info_plist_in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakelists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakelists_txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-MacBundleMacros.cmake.diff
</span>
post-patch {
reinplace -E "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +113,8 @@ configure.args-append "-DWITH_GRASS=OFF"
</span> configure.args-append "-DWITH_GRASS7=OFF"
configure.args-append "-DWITH_QSPATIALITE=OFF"
configure.args-append "-DWITH_GLOBE=OFF"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append "--trace"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.args-append "--trace-expand"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.args-append "--debug-output"
</span>
configure.ldflags "-Wl,-rpath,${prefix}/libexec/qt5/lib"
configure.args-append "-DWITH_3D=ON"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,35 +143,6 @@ variant server description "Builds with the server (FCGI) option" {
</span> depends_lib-append port:fcgi
configure.args-delete "-DWITH_SERVER=OFF"
configure.args-append "-DWITH_SERVER=ON"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix wrong @loader_path/... library paths
</span><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:#ffe0e0;'>- set w "@loader_path/.."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set d "${destroot}${applications_dir}/Qgis3.app/Contents/MacOS/lib/qgis/server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lib {"libdummy.so" "libwcs.so" "libwfs.so" "libwms.so" "libwmts.so"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec install_name_tool -change "${w}/../Frameworks/qgis_native.framework/qgis_native" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${w}/../../../Frameworks/qgis_native.framework/qgis_native" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec install_name_tool -change "${w}/../Frameworks/qgis_core.framework/qgis_core" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${w}/../../../Frameworks/qgis_core.framework/qgis_core" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec install_name_tool -change "${w}/../Frameworks/qgis_analysis.framework/qgis_analysis" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${w}/../../../Frameworks/qgis_analysis.framework/qgis_analysis" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec install_name_tool -change "${w}/lib/libqgispython.${version}.dylib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${w}/../libqgispython.${version}.dylib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec install_name_tool -change "${w}/lib/libqgis_server.${version}.dylib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${w}/../libqgis_server.${version}.dylib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/files/patch-MacBundleMacros.cmake.diff b/gis/qgis3/files/patch-MacBundleMacros.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b745632
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/files/patch-MacBundleMacros.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/MacBundleMacros.cmake.old 2019-09-13 08:15:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/MacBundleMacros.cmake 2019-09-13 08:16:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,6 +145,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOREACH (QL ${QGLIBLIST})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBDIR}/${QL}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDFOREACH (QL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # qgis server libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF (${OSX_HAVE_LOADERPATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET (LIB_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/../../${LIBMID}/${LIBPOST}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FOREACH (QL ${QGLIBSERVERLIST})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBDIR}/${QL}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDFOREACH (QL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # crssync
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF (${OSX_HAVE_LOADERPATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET (LIB_CHG_TO "${ATEXECUTABLE}/${QGIS_LIBEXEC_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,7 +232,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRING(REPLACE ".framework" ";" QGFWLIST ${QGFWLIST})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't collect any library symlinks, limit to versioned libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET (Q_LIBVER ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILE (GLOB QGLIBLIST RELATIVE "${QLIBDIR}" "${QLIBDIR}/libqgis*.dylib" "${QLIBDIR}/qgis/server/lib*.so")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FILE (GLOB QGLIBLIST RELATIVE "${QLIBDIR}" "${QLIBDIR}/libqgis*.dylib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FILE (GLOB QGLIBSERVERLIST RELATIVE "${QLIBDIR}" "${QLIBDIR}/qgis/server/lib*.so")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE (GLOB QGPLUGLIST "${QPLUGDIR}/*.so")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE (GLOB QGPYLIST "${QGISPYDIR}/qgis/*.so")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR}" "${QBINDIR}/q*.app")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/files/patch-app_info_plist_in.diff b/gis/qgis3/files/patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a3d908..33a540e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/files/patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/files/patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@
</span> + <key>GRASS_SH</key>
+ <string>/bin/sh</string>
+ <key>GRASS_PROJSHARE</key>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@PREFIX@/share/proj</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@PREFIX@/lib/proj6/share</string>
</span> + <key>GRASS_VERSION</key>
+ <string>@GRASS_VERSION@</string>
+ <key>GRASS_LD_LIBRARY_PATH</key>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@PREFIX@/share/grass-@GRASS_VERSION@/lib</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@PREFIX@/share/grass76/lib</string>
</span> + <key>GRASS_PERL</key>
+ <string>@PREFIX@/bin/perl</string>
+ </dict>
</pre><pre style='margin:0'>
</pre>