From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- net-misc/nextcloud-client/Manifest | 7 +- .../files/nextcloud-client-2.6.4-qt515.patch | 22 ++++++ .../nextcloud-client/nextcloud-client-2.6.2.ebuild | 89 ---------------------- .../nextcloud-client/nextcloud-client-2.6.3.ebuild | 89 ---------------------- .../nextcloud-client/nextcloud-client-2.6.4.ebuild | 4 +- 5 files changed, 27 insertions(+), 184 deletions(-) create mode 100644 net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild (limited to 'net-misc/nextcloud-client') diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 3ab775046742..76cfb8c07ce0 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,10 +1,7 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f +AUX nextcloud-client-2.6.4-qt515.patch 678 BLAKE2B 767ff6f3bb4ecd9ff6e87484d8e2b74b7c8f1753b71d5037f98838fa8ea5c78f63a75b66b8ee8cbd20f48a47296603136f525e090f0f625ee15e1fe6a6e688ac SHA512 19caea8c5b8b14db7af6520e72b4e4e2f20b45e6c6c8dcd2e1b0de5d8abd8d274127bb50fc16ba448d9fea189fc5cfb8c5f1e0d7c6d00661a2738ac959156049 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae -DIST nextcloud-client-2.6.2.tar.gz 18982053 BLAKE2B 53f4d13b42f50a272012909ed5c937b0a37543f11b8ef0119db670107ed10629d79cb2fcfbbe9148ff847f7ef9e38183f613ae3162206bf9e8f7424ae8280b72 SHA512 b56a7d6751381ffb546b0c8a4b9dbb7991f523ac2ff06dbc87ee36927a4326f57f520ea96a2116ead5d36db6b9900f552834ec9dff8ad5adf80e896829428199 -DIST nextcloud-client-2.6.3.tar.gz 18983292 BLAKE2B 89fdb35c12f4d126c19f31d09d54e027f9edf684fa4904bfba0e7c49a628295aabe00f2b6bc79496876a252dbc9d82772a95bcc59ae4220f8c91dd09bd2661d9 SHA512 ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025 DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17 -EBUILD nextcloud-client-2.6.2.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d -EBUILD nextcloud-client-2.6.3.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d -EBUILD nextcloud-client-2.6.4.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d +EBUILD nextcloud-client-2.6.4.ebuild 2065 BLAKE2B df0c4509008bb3543d7e62a4edba47b0b9a826598b5c1de227a0d958626b24054db79b6664341777bdcf6636a19c0c757a09e0677fdbee561205597c73e9ba06 SHA512 f569089d81fba7bec1c4659ee7776303356283795717a522a6aac8e38e02699ce538d351716e4560b9e4ce9f28834158b0b7d284436cf99b29c022dd22585fc6 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch new file mode 100644 index 000000000000..5c59cf46bf39 --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch @@ -0,0 +1,22 @@ +From 0fe7a657386b107ae498e7749ff4c20116b9752a Mon Sep 17 00:00:00 2001 +From: Michael Schuster +Date: Sun, 7 Jun 2020 02:43:45 +0200 +Subject: [PATCH] Fix Qt 5.15.0 build error (missing include) + +Signed-off-by: Michael Schuster +--- + src/libsync/networkjobs.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp +index fd63b9606..bb5786ea9 100644 +--- a/src/libsync/networkjobs.cpp ++++ b/src/libsync/networkjobs.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "networkjobs.h" + #include "account.h" diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild deleted file mode 100644 index 0efd5f09b271..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg - -DESCRIPTION="Desktop Syncing Client for Nextcloud" -HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc dolphin nautilus shibboleth test" - -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python ) - shibboleth? ( dev-qt/qtwebkit:5 )" - -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) - dolphin? ( kde-frameworks/extra-cmake-modules ) - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch ) - -S=${WORKDIR}/desktop-${PV/_/-} - -src_prepare() { - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DNO_SHIBBOLETH=$(usex !shibboleth) - -DUNIT_TESTING=$(usex test) - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi -} diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild deleted file mode 100644 index 0efd5f09b271..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg - -DESCRIPTION="Desktop Syncing Client for Nextcloud" -HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc dolphin nautilus shibboleth test" - -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python ) - shibboleth? ( dev-qt/qtwebkit:5 )" - -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) - dolphin? ( kde-frameworks/extra-cmake-modules ) - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch ) - -S=${WORKDIR}/desktop-${PV/_/-} - -src_prepare() { - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DNO_SHIBBOLETH=$(usex !shibboleth) - -DUNIT_TESTING=$(usex test) - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi -} diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild index 0efd5f09b271..655fcb79a2b3 100644 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild @@ -51,7 +51,9 @@ DEPEND="${COMMON_DEPEND} RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch ) +PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch + "${FILESDIR}"/${P}-qt515.patch + ) S=${WORKDIR}/desktop-${PV/_/-} -- cgit v1.2.3