<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f5cc63bd1e079447089e9f6797ecf0ec36f4a808">https://github.com/macports/macports-ports/commit/f5cc63bd1e079447089e9f6797ecf0ec36f4a808</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 f5cc63bd1e0 owncloud-client: lock in 2.6.3 for El Capitan and below
</span>f5cc63bd1e0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f5cc63bd1e079447089e9f6797ecf0ec36f4a808
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Dec 7 09:20:06 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> owncloud-client: lock in 2.6.3 for El Capitan and below
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61772
</span>---
www/owncloud-client/Portfile | 62 ++++++++++++++--------
.../files/patch-use-system-sqlite.diff | 13 +++++
2 files changed, 52 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/owncloud-client/Portfile b/www/owncloud-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 720687388e8..79e60b453ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/owncloud-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/owncloud-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,36 +2,57 @@
</span>
PortSystem 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span> PortGroup qt5 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check https://github.com/owncloud/client/tags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to find the build_id in the source tarball:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ownCloud-${version}.${build_id}.tar.xz
</span> name owncloud-client
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup owncloud client 2.7.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set build_id 2626
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d800103105981947603fec06ef91d26e1968d006 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 96a0af9131f413389ab48264dadc5dfd24cabe31edbb0c942df310beb4c25b5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19243282
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> categories www aqua
maintainers {mps @Schamschula} openmaintainer
license GPL-2+
description Desktop Syncing Client for ownCloud
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description \
The ownCloud Desktop Client is a tool to synchronize files from ownCloud \
Server with your computer.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span> homepage https://owncloud.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_id 14058
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version_id 14058
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 effe036ca72c8714b80947430b4aa9bdea7dff2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e3d38de31e041f0e1836b2b74acfc1fc76eea4955968952a65643cbf36a493f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21246672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use-system-sqlite.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.min_version 5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check https://github.com/owncloud/client/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to find the build_id in the source tarball:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ownCloud-${version}.${build_id}.tar.xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup owncloud client 2.7.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_id 2626
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d800103105981947603fec06ef91d26e1968d006 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 96a0af9131f413389ab48264dadc5dfd24cabe31edbb0c942df310beb4c25b5b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19243282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:kde-extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.min_version 5.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKDE_INSTALL_BUNDLEDIR:PATH=${applications_dir}
</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;'>+use_xcode yes
</span>
compiler.cpath
compiler.library_path
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +61,7 @@ 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_build-append port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:kde-extra-cmake-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:doxygen
</span>
depends_lib-append port:qtkeychain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,16 +69,12 @@ qt5.depends_component qtmacextras qtwebkit
</span> qt5.depends_build_component \
qttools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.min_version 5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-add-xcodeflags.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-add-xcodeflags.diff
</span>
cmake.install_prefix ${applications_dir}
# This should match LIB_INSTALL_DIR in CMakeLists.txt
configure.args-append -DCMAKE_INSTALL_NAME_DIR=${applications_dir}/owncloud.app/Contents/MacOS \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKDE_INSTALL_BUNDLEDIR:PATH=${applications_dir} \
</span> -DXCODEFLAGS="-IDECustomDerivedDataLocation=${workpath}/DerivedData" \
-DMIRALL_VERSION_BUILD=${build_id}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/owncloud-client/files/patch-use-system-sqlite.diff b/www/owncloud-client/files/patch-use-system-sqlite.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..adb157ebea1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/owncloud-client/files/patch-use-system-sqlite.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 a/cmake/modules/FindSQLite3.cmake b/cmake/modules/FindSQLite3.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2fa9e4100..721720469 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/FindSQLite3.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/FindSQLite3.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@ if (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(SQLite3_VERSION _SQLITE3_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE OR WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(USE_OUR_OWN_SQLITE3 TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(SQLITE3_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(SQLITE3_LIBRARIES "")
</span></pre><pre style='margin:0'>
</pre>