<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2e8c5106c3f3a3f8a8d9be1b1d010c6e9b004168">https://github.com/macports/macports-ports/commit/2e8c5106c3f3a3f8a8d9be1b1d010c6e9b004168</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 2e8c5106c3f nextcloud-client: update version to 3.4.1
</span>2e8c5106c3f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2e8c5106c3f3a3f8a8d9be1b1d010c6e9b004168
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Mon Dec 20 18:34:49 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> nextcloud-client: update version to 3.4.1
</span>---
www/nextcloud-client/Portfile | 16 ++++++----------
www/nextcloud-client/files/patch-add-xcodeflags.diff | 16 ++++++++--------
.../files/patch-fix-inkscape-invocation.diff | 11 -----------
www/nextcloud-client/files/patch-mp-inkscape.diff | 15 ---------------
www/nextcloud-client/files/patch-no-deployqt.diff | 13 ++++++++-----
www/nextcloud-client/files/patch-remove-inkscape.diff | 13 +++++++++++++
www/nextcloud-client/files/patch-use-system-sqlite.diff | 8 +++++---
7 files changed, 40 insertions(+), 52 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 4d3193f5e51..1cf57b25785 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,14 +6,11 @@ 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 3.3.6 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 991e91faddcda0e2e0ab87e2f72370ac37a40e71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5bf7a5436a6461dd7c49dccffaee4f6c3c255803236f347a14f26c5a1e10e3dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14107390
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nextcloud desktop 3.4.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 51625d39cbb6995499d5e6634b0e08cf0b5870fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7966b4d6cc4dd0896694f7518534869497e9fb27b80bdb3b270f87a552665d7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14311471
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# due to a bug revert to previous version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/nextcloud/desktop/issues/4016
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span>
name nextcloud-client
categories www aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +28,7 @@ compiler.cxx_standard 2014
</span>
depends_lib-append port:sqlite3 port:zlib port:qtkeychain-qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append path:bin/inkscape:inkscape
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append path:lib/pkgconfig/librsvg-2.0.pc:librsvg
</span>
qt5.min_version 5.12
qt5.depends_component qtmacextras qtquickcontrols2 qtwebsockets
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +38,7 @@ qt5.depends_build_component \
</span> patchfiles patch-use-system-sqlite.diff \
patch-add-xcodeflags.diff \
patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-inkscape-invocation.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-mp-inkscape.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-remove-inkscape.diff
</span>
cmake.install_prefix ${applications_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/files/patch-add-xcodeflags.diff b/www/nextcloud-client/files/patch-add-xcodeflags.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ef2e30f605..3511a183e6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nextcloud-client/files/patch-add-xcodeflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nextcloud-client/files/patch-add-xcodeflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/shell_integration/MacOSX/CMakeLists.txt b/shell_integration/MacOSX/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2e594bfce..77df2abbd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git shell_integration/MacOSX/CMakeLists.txt shell_integration/MacOSX/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 99116c7..cd46f43 100644
</span> --- shell_integration/MacOSX/CMakeLists.txt
+++ shell_integration/MacOSX/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,7 @@ add_custom_target( mac_overlayplugin ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "OC_APPLICATION_NAME=${APPLICATION_NAME}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${XCODEFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,7 @@ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OC_APPLICATION_NAME=${APPLICATION_NAME}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${XCODEFLAGS}
</span> COMMENT building Mac Overlay icons
VERBATIM)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_dependencies(mac_overlayplugin ${APPLICATION_EXECUTABLE}) # for the ownCloud.icns to be generated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(mac_overlayplugin nextcloud) # for the ownCloud.icns to be generated
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/files/patch-fix-inkscape-invocation.diff b/www/nextcloud-client/files/patch-fix-inkscape-invocation.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1ca0f9c7711..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nextcloud-client/files/patch-fix-inkscape-invocation.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,7 +259,7 @@ function(generate_sized_png_from_svg icon_path size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(icon_output_name "${size}-${icon_name_wle}.png")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "Generate ${icon_output_name}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execute_process(COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${INKSCAPE}" -w ${size} -h ${size} --export-png "${icon_output_name}" "${icon_path}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${icon_name_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESULT_VARIABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INKSCAPE_SIDEBAR_ERROR
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/files/patch-mp-inkscape.diff b/www/nextcloud-client/files/patch-mp-inkscape.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf06f72cf75..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nextcloud-client/files/patch-mp-inkscape.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,9 +239,10 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Generate png icons from svg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_program(INKSCAPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NAMES inkscape inkscape.exe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NAMES inkscape
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REQUIRED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HINTS "/opt/local/bin" "/usr/bin" ENV INKSCAPE_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_CMAKE_SYSTEM_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # REQUIRED keyword is only supported on CMake 3.18 and above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT INKSCAPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
</span><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 b1524a480fa..dc98a5a4d5d 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,9 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/gui/CMakeLists.txt src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 794f44f..055775b 100644
</span> --- src/gui/CMakeLists.txt
+++ src/gui/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -479,38 +479,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -499,39 +499,6 @@ install(TARGETS nextcloud
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE DESTINATION "."
</span> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -# FIXME: The following lines are dup in src/gui and src/cmd because it needs to be done after both are installed
-#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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,12 +26,12 @@
</span> - set(NO_STRIP "")
- endif()
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_custom_command(TARGET ${APPLICATION_EXECUTABLE} POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(TARGET nextcloud POST_BUILD
</span> - COMMAND "${MACDEPLOYQT_EXECUTABLE}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/../.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$<TARGET_FILE_DIR:nextcloud>/../.."
</span> - -qmldir=${CMAKE_SOURCE_DIR}/src/gui
- -always-overwrite
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- -executable="$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/${cmd_NAME}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -executable="$<TARGET_FILE_DIR:nextcloud>/${cmd_NAME}"
</span> - ${NO_STRIP}
- COMMAND "${CMAKE_COMMAND}"
- -E rm -rf "${BIN_OUTPUT_DIRECTORY}/${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns/bearer"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/files/patch-remove-inkscape.diff b/www/nextcloud-client/files/patch-remove-inkscape.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d42c96add5f
</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-remove-inkscape.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/gui/CMakeLists.txt src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 794f44f..92e787c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Generate png icons from svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_program(SVG_CONVERTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NAMES inkscape inkscape.exe rsvg-convert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMES rsvg-convert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ REQUIRED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # REQUIRED keyword is only supported on CMake 3.18 and above
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/files/patch-use-system-sqlite.diff b/www/nextcloud-client/files/patch-use-system-sqlite.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 16aba0b5a98..59daa002cec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nextcloud-client/files/patch-use-system-sqlite.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nextcloud-client/files/patch-use-system-sqlite.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/csync/CMakeLists.txt.old 2021-10-27 21:48:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/csync/CMakeLists.txt 2021-10-27 21:48:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/csync/CMakeLists.txt src/csync/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ec655df..11910f1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/csync/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/csync/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@ include(DefineOptions.cmake)
</span>
include(DefineInstallationPaths)
</pre><pre style='margin:0'>
</pre>