<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/14cf4a7415b642d03a336e516e6e5172a18f30b0">https://github.com/macports/macports-ports/commit/14cf4a7415b642d03a336e516e6e5172a18f30b0</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 14cf4a7415b nextcloud-client: update to 3.0.0 (#8141)
</span>14cf4a7415b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14cf4a7415b642d03a336e516e6e5172a18f30b0
</span>Author: EdwarDDay <4127904+EdwarDDay@users.noreply.github.com>
AuthorDate: Tue Aug 18 21:49:24 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> nextcloud-client: update to 3.0.0 (#8141)
</span>---
www/nextcloud-client/Portfile | 2 +-
www/nextcloud-client/files/patch-no-deployqt.diff | 22 +++++++++++++++-------
2 files changed, 16 insertions(+), 8 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 d959b925b1b..c556fe19ec2 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.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nextcloud desktop 3.0.0 v
</span> fetch.type git
name nextcloud-client
checksums rmd160 d593987e1837114843a4234c0eaf81f00cd31064 \
<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><span style='display:block; white-space:pre;color:#808080;'>index bf7cebe3029..cd510f124fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nextcloud-client/files/patch-no-deployqt.diff
</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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/crashreporter/CMakeLists.txt.old 2020-08-15 10:34:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/crashreporter/CMakeLists.txt 2020-08-15 10:37:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,16 +48,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/crashreporter/CMakeLists.txt.old 2020-08-18 16:41:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/crashreporter/CMakeLists.txt 2020-08-18 16:41:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,17 +48,4 @@
</span> #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
# currently it needs to be done because the code right above needs to be executed no matter
# if building a bundle or not and the install_qt4_executable needs to be called afterwards
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,15 +12,15 @@
</span> - add_custom_command(TARGET ${CRASHREPORTER_EXECUTABLE} POST_BUILD
- COMMAND "${MACDEPLOYQT_EXECUTABLE}"
- "$<TARGET_FILE_DIR:${CRASHREPORTER_EXECUTABLE}>/../.."
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- -qmldir=${CMAKE_SOURCE_DIR}/src/gui
</span> - -always-overwrite
- COMMENT "Running macdeployqt..."
- )
- endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/CMakeLists.txt.old 2020-08-15 10:38:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/CMakeLists.txt 2020-08-15 10:39:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -387,21 +387,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/CMakeLists.txt.old 2020-08-18 16:42:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/CMakeLists.txt 2020-08-18 16:43:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -388,29 +388,6 @@
</span> # if building a bundle or not and the install_qt4_executable needs to be called afterwards
#
# OSX: Run macdeployqt for src/gui and for src/cmd using the -executable option
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,19 @@
</span> -
- set(cmd_NAME ${APPLICATION_EXECUTABLE}cmd)
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_BUILD_TYPE MATCHES Debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(NO_STRIP "-no-strip")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(NO_STRIP "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - add_custom_command(TARGET ${APPLICATION_EXECUTABLE} POST_BUILD
- COMMAND "${MACDEPLOYQT_EXECUTABLE}"
- "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/../.."
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- -qmldir=${CMAKE_SOURCE_DIR}/src/gui
</span> - -always-overwrite
- -executable="$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/${cmd_NAME}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${NO_STRIP}
</span> - COMMENT "Running macdeployqt..."
- )
-endif()
</pre><pre style='margin:0'>
</pre>