<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/373527d38ff84aa0593c8621f05235b266752238">https://github.com/macports/macports-ports/commit/373527d38ff84aa0593c8621f05235b266752238</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 373527d38ff nextcloud-client: update to version 2.6.5
</span>373527d38ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 373527d38ff84aa0593c8621f05235b266752238
</span>Author: Edwar D Day <4127904+EdwarDDay@users.noreply.github.com>
AuthorDate: Sat Aug 15 11:34:54 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> nextcloud-client: update to version 2.6.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 2.6.5
</span><span style='display:block; white-space:pre;color:#404040;'> * remove macdeployqt code because of linking error
</span>---
www/nextcloud-client/Portfile | 8 +++--
www/nextcloud-client/files/patch-no-deployqt.diff | 44 +++++++++++++++++++++++
2 files changed, 49 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/Portfile b/www/nextcloud-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db702995f85..d959b925b1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nextcloud-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nextcloud-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup qt5 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup nextcloud desktop 2.6.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nextcloud desktop 2.6.5 v
</span> fetch.type git
name nextcloud-client
checksums rmd160 d593987e1837114843a4234c0eaf81f00cd31064 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,8 @@ qt5.depends_build_component \
</span>
patchfiles patch-use-system-sqlite.diff \
patch-add-xcodeflags.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openssl-1.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-openssl-1.0.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-deployqt.diff
</span>
post-fetch {
system -W ${worksrcpath} "git submodule update --init"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +56,8 @@ cmake.install_prefix ${applications_dir}
</span>
# This should match LIB_INSTALL_DIR in CMakeLists.txt
configure.args-append -DCMAKE_INSTALL_NAME_DIR=${applications_dir}/nextcloud.app/Contents/MacOS \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DXCODEFLAGS="-IDECustomDerivedDataLocation=${workpath}/DerivedData"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DXCODEFLAGS="-IDECustomDerivedDataLocation=${workpath}/DerivedData" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_UPDATER=OFF
</span>
if {${os.major} < 13} {
# Finder extension does not compile on 10.8
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/files/patch-no-deployqt.diff b/www/nextcloud-client/files/patch-no-deployqt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bf7cebe3029
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nextcloud-client/files/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/crashreporter/CMakeLists.txt.old 2020-08-15 10:34:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/crashreporter/CMakeLists.txt 2020-08-15 10:37:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,16 +48,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # currently it needs to be done because the code right above needs to be executed no matter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if building a bundle or not and the install_qt4_executable needs to be called afterwards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(BUILD_OWNCLOUD_OSX_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QT_BIN_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(TARGET ${CRASHREPORTER_EXECUTABLE} POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND "${MACDEPLOYQT_EXECUTABLE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$<TARGET_FILE_DIR:${CRASHREPORTER_EXECUTABLE}>/../.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -always-overwrite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMENT "Running macdeployqt..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/CMakeLists.txt.old 2020-08-15 10:38:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/CMakeLists.txt 2020-08-15 10:39:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,21 +387,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if building a bundle or not and the install_qt4_executable needs to be called afterwards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OSX: Run macdeployqt for src/gui and for src/cmd using the -executable option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QT_BIN_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(cmd_NAME ${APPLICATION_EXECUTABLE}cmd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(TARGET ${APPLICATION_EXECUTABLE} POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND "${MACDEPLOYQT_EXECUTABLE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/../.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -always-overwrite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -executable="$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/${cmd_NAME}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMENT "Running macdeployqt..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in
</span></pre><pre style='margin:0'>
</pre>