<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/3a90293461e7329334e9a25a6702afd48ec24960">https://github.com/macports/macports-ports/commit/3a90293461e7329334e9a25a6702afd48ec24960</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3a90293461e7329334e9a25a6702afd48ec24960
</span>Author: sideeffect42 <sideeffect42@users.noreply.github.com>
AuthorDate: Fri Oct 29 13:24:48 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> nextcloud-client: update to 3.3.6
</span>---
www/nextcloud-client/Portfile | 27 +++++------
.../files/patch-add-xcodeflags.diff | 2 +-
.../files/patch-fix-inkscape-invocation.diff | 11 +++++
www/nextcloud-client/files/patch-mp-inkscape.diff | 15 ++++++
www/nextcloud-client/files/patch-no-deployqt.diff | 53 +++++++++-------------
www/nextcloud-client/files/patch-openssl-1.0.diff | 13 ------
.../files/patch-use-system-sqlite.diff | 16 +++----
7 files changed, 69 insertions(+), 68 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 106df73aba0..fd2bceca95b 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,21 +6,18 @@ 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.0.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nextcloud desktop 3.3.6 v
</span> fetch.type git
name nextcloud-client
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d593987e1837114843a4234c0eaf81f00cd31064 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7938fa4b34ecdd98bd3d940b2b015fb6cdff7cede98f5d0a81ac51ee88fb0770 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18918775
</span>
categories www aqua
maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Desktop Syncing Client for NextCloud
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Desktop Syncing Client for Nextcloud
</span>
long_description \
The Nextcloud Desktop Client is a tool to synchronize files from Nextcloud \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Server with your computer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ server with your computer.
</span>
homepage https://nextcloud.com/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,18 +32,22 @@ compiler.library_path
</span> compiler.blacklist-append {clang < 602} macports-clang-3.4 macports-clang-3.3
compiler.fallback-append macports-clang-5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:qtkeychain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:openssl11 port:sqlite3 port:zlib port:qtkeychain
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append bin:git:git \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:inkscape:inkscape
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component qtmacextras qtwebkit qtwebengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.min_version 5.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qtmacextras qtquickcontrols2 qtwebsockets
</span> qt5.depends_build_component \
qttools
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:#ffe0e0;'>- patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-deployqt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-inkscape-invocation.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mp-inkscape.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
post-fetch {
system -W ${worksrcpath} "git submodule update --init"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +56,7 @@ post-fetch {
</span> cmake.install_prefix ${applications_dir}
# This should match LIB_INSTALL_DIR in CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_INSTALL_NAME_DIR=${applications_dir}/nextcloud.app/Contents/MacOS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_INSTALL_NAME_DIR=${applications_dir}/Nextcloud.app/Contents/MacOS \
</span> -DXCODEFLAGS="-IDECustomDerivedDataLocation=${workpath}/DerivedData" \
-DBUILD_UPDATER=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +66,6 @@ if {${os.major} < 13} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${applications_dir}/nextcloud.app/Contents/MacOS/nextcloudcmd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/Nextcloud.app/Contents/MacOS/nextcloudcmd \
</span> ${destroot}${prefix}/bin/nextcloudcmd
}
<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 c06fb11f532..1ef2e30f605 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;'>@@ -2,7 +2,7 @@ diff --git a/shell_integration/MacOSX/CMakeLists.txt b/shell_integration/MacOSX/
</span> index 2e594bfce..77df2abbd 100644
--- shell_integration/MacOSX/CMakeLists.txt
+++ shell_integration/MacOSX/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +22,7 @@ add_custom_target( mac_overlayplugin ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,7 @@ add_custom_target( mac_overlayplugin ALL
</span> "OC_APPLICATION_NAME=${APPLICATION_NAME}"
"OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}"
"OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}"
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1ca0f9c7711
</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-fix-inkscape-invocation.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</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;'>+@@ -258,7 +259,7 @@ function(generate_sized_png_from_svg icon_path size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(icon_output_name "${size}-${icon_name_wle}.png")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Generate ${icon_output_name}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(COMMAND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${INKSCAPE}" -w ${size} -h ${size} --export-png "${icon_output_name}" "${icon_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY "${icon_name_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESULT_VARIABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bf06f72cf75
</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-mp-inkscape.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</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;'>+@@ -239,9 +239,10 @@ 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(INKSCAPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NAMES inkscape inkscape.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMES inkscape
</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 INKSCAPE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HINTS "/opt/local/bin" "/usr/bin" ENV INKSCAPE_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NO_CMAKE_SYSTEM_PATH)
</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;background:#e0ffe0;'>+ if (NOT INKSCAPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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 cd510f124fc..b1524a480fa 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,29 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/crashreporter/CMakeLists.txt.old 2020-08-18 16:41:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/crashreporter/CMakeLists.txt 2020-08-18 16:41:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,17 +48,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # 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:#ffe0e0;'>-- if(BUILD_OWNCLOUD_OSX_BUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QT_BIN_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_custom_command(TARGET ${CRASHREPORTER_EXECUTABLE} POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND "${MACDEPLOYQT_EXECUTABLE}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "$<TARGET_FILE_DIR:${CRASHREPORTER_EXECUTABLE}>/../.."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -qmldir=${CMAKE_SOURCE_DIR}/src/gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -always-overwrite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMENT "Running macdeployqt..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/CMakeLists.txt.old 2020-08-18 16:42:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/CMakeLists.txt 2020-08-18 16:43:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -388,29 +388,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OSX: Run macdeployqt for src/gui and for src/cmd using the -executable option
</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;'>+@@ -479,38 +479,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# FIXME: The following lines are dup in src/gui and src/cmd because it needs to be done after both are installed
</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;'>+-#
</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> -if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
- get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
- get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,14 +25,17 @@
</span> -
- add_custom_command(TARGET ${APPLICATION_EXECUTABLE} POST_BUILD
- 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:#ffe0e0;'>-- -qmldir=${CMAKE_SOURCE_DIR}/src/gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -always-overwrite
</span><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:#ffe0e0;'>-- ${NO_STRIP}
</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;'>+- -qmldir=${CMAKE_SOURCE_DIR}/src/gui
</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;'>+- ${NO_STRIP}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND "${CMAKE_COMMAND}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -E rm -rf "${BIN_OUTPUT_DIRECTORY}/${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns/bearer"
</span> - COMMENT "Running macdeployqt..."
- )
-endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32)
configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/${LINUX_APPLICATION_ID}.desktop)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nextcloud-client/files/patch-openssl-1.0.diff b/www/nextcloud-client/files/patch-openssl-1.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6df24b9a59..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nextcloud-client/files/patch-openssl-1.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f1d07eea2..50d4871cd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Sphinx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(PdfLatex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(OpenSSL 1.1 REQUIRED )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(OpenSSL REQUIRED )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(ZLIB REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(GLib2)
</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 9e3f83a5ed3..16aba0b5a98 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,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/modules/FindSQLite3.cmake b/cmake/modules/FindSQLite3.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2fa9e4100..721720469 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/modules/FindSQLite3.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/modules/FindSQLite3.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@ if (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SQLite3_VERSION _SQLITE3_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/csync/CMakeLists.txt.old 2021-10-27 21:48:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/csync/CMakeLists.txt 2021-10-27 21:48:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(DefineInstallationPaths)
</span>
-if (APPLE OR WIN32)
+if (WIN32)
set(USE_OUR_OWN_SQLITE3 TRUE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SQLITE3_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SQLITE3_LIBRARIES "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(SQLite3 3.8.0 REQUIRED)
</span></pre><pre style='margin:0'>
</pre>