From 8973f70e9a2ae4ea8a324e607ea1e8b96c7ff384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Jan 2023 18:09:32 +0000 Subject: gentoo auto-resync : 05:01:2023 - 18:09:32 --- net-misc/Manifest.gz | Bin 54387 -> 54383 bytes net-misc/nextcloud-client/Manifest | 3 +- ....4-drop-dependency-on-Qt-Quick-Controls-1.patch | 59 +++++++++++ .../nextcloud-client-3.6.4-r1.ebuild | 108 -------------------- .../nextcloud-client-3.6.4-r2.ebuild | 109 +++++++++++++++++++++ 5 files changed, 170 insertions(+), 109 deletions(-) create mode 100644 net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch delete mode 100644 net-misc/nextcloud-client/nextcloud-client-3.6.4-r1.ebuild create mode 100644 net-misc/nextcloud-client/nextcloud-client-3.6.4-r2.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index fa3f1c17904a..4ddb596bbae8 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 17a8a27363d6..f5544948fae8 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,5 +1,6 @@ +AUX nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch 1640 BLAKE2B de9db48474db68effda44643d102f68435eb907a450a1b674db8059f84c40bb47fd428fc08979ccddec3610a46d907d232da5bd3ad035c2628df6ef8ad9fc46b SHA512 40e40b93b71d9236b325527a63c96a52cc05b10032911faacc3e2c33bd9d990b911a4c783b99b7ba91d95ee54a6945132dd1b93ea7a5d4f041783eecd6accd89 DIST nextcloud-client-3.6.1.tar.gz 15346135 BLAKE2B 116a2632ad1c653bb1dbf184c6156ebc469ed8c0bfe209282e8239d4113c46b761f4049daa6833d23d5179c0b2a3f9dd94f506e63c401775da419c92104a069f SHA512 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583 DIST nextcloud-client-3.6.4.tar.gz 15451930 BLAKE2B 47b379513927d0f7fa20d41be67f75196ffbae6318d947d759f69d9561e27641d71e9a0accd197673f995d4aab90fa30dd1f1faa4dee446545f586ca28599cff SHA512 7a9378e78e1e678e72898d1cca2188ba9f5488f565c72db49d70e9d3d6d8124c8fae7856226fb3b47edcb37cacaadc8f0fbc5ff3b6914e4ebb777a4ebd633513 EBUILD nextcloud-client-3.6.1.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea -EBUILD nextcloud-client-3.6.4-r1.ebuild 2311 BLAKE2B 0a8c3c7372d9629548a7b7ba43682fc94dac672a291d41ddc18d6535e5cb71f3b1c073461057bf58cd89108e7d22d77cdeac3f0f2b67d2c58bf9dfbf5f00d973 SHA512 da994f642194413801d6e50cf3edc2e06c17d349ab4b8b9aafe5e8805aa0fb81d44705ef18f10b070859f3dda3a204a2e4d0da026ee61d7585867312af23c3bb +EBUILD nextcloud-client-3.6.4-r2.ebuild 2378 BLAKE2B c0f3ea846fa2e135089300100d6c15d2e24d0660e63f3470a8cb39d826c2a834a43bd2b8099b62207bd2e973b6e9ee63fe0716dcd77f770a7f303320f5708322 SHA512 4968021ade357f0f6cc561931d8090c5126388ec4ef857029e1285eee46becf11bdfa6afc21346c5f2b024c3fbda91e596b5b8307f638396eef23e944a74bc4b MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch new file mode 100644 index 000000000000..e1bb0a11e13f --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch @@ -0,0 +1,59 @@ +From 600ad8f6003daee635093ad713f3f90cb7cc7485 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Thu, 5 Jan 2023 11:58:08 +0100 +Subject: [PATCH] Drop dependency on Qt Quick Controls 1 + +Qt Quick Controls 1 where deprecated with Qt 5.11 [1]. Nextcloud still +depends on Quick Controls 1 by importing QtQuick.Dialogs. Removing +those imports will cause the QMl script to use the according API from +Quick Controls 2, which are, fortunately largely API-comptible. + +This helps distribution to deprecate and remove Quick Controls 1 [2]. + +1: https://doc.qt.io/qt-6/qtquickcontrols-changes-qt6.html#migrating-from-qt-quick-controls-1 +2: https://bugs.gentoo.org/889772 + +Signed-off-by: Florian Schmaus +--- a/src/gui/BasicComboBox.qml ++++ b/src/gui/BasicComboBox.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.15 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + import QtGraphicalEffects 1.0 +--- a/src/gui/PredefinedStatusButton.qml ++++ b/src/gui/PredefinedStatusButton.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.15 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + +--- a/src/gui/UserStatusSelector.qml ++++ b/src/gui/UserStatusSelector.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.6 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + import QtQuick.Window 2.15 +--- a/src/gui/UserStatusSelectorButton.qml ++++ b/src/gui/UserStatusSelectorButton.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.6 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + +-- +2.38.2 + diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.4-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.4-r1.ebuild deleted file mode 100644 index e2dbf57830dc..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-3.6.4-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake virtualx 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" -S="${WORKDIR}/desktop-${PV/_/-}" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc dolphin nautilus test webengine" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=dev-db/sqlite-3.34:3 - >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain:=[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtquickcontrols2:5 - dev-qt/qtsvg:5 - dev-qt/qtwebsockets:5 - dev-qt/qtwidgets:5 - net-libs/libcloudproviders - sys-libs/zlib - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) -" -RDEPEND=" - ${COMMON_DEPEND} - dev-qt/qtquickcontrols2:5 -" -DEPEND=" - ${COMMON_DEPEND} - dev-qt/qtconcurrent:5 - dev-qt/qtxml:5 - || ( gnome-base/librsvg media-gfx/inkscape ) - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) - test? ( - dev-qt/qttest:5 - dev-util/cmocka - ) -" -BDEPEND=" - dev-qt/linguist-tools:5 - dolphin? ( kde-frameworks/extra-cmake-modules ) -" - -src_prepare() { - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DBUILD_UPDATER=OFF - $(cmake_use_find_package doc Sphinx) - $(cmake_use_find_package doc PdfLatex) - $(cmake_use_find_package webengine Qt5WebEngine) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) - -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} - -src_compile() { - local compile_targets=(all) - if use doc; then - compile_targets+=(doc doc-man) - fi - cmake_src_compile ${compile_targets[@]} -} - -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-3.6.4-r2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.4-r2.ebuild new file mode 100644 index 000000000000..ab1e5c884f28 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.6.4-r2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake virtualx 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" +S="${WORKDIR}/desktop-${PV/_/-}" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc dolphin nautilus test webengine" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-db/sqlite-3.34:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain:=[qt5(+)] + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtquickcontrols2:5 + dev-qt/qtsvg:5 + dev-qt/qtwebsockets:5 + dev-qt/qtwidgets:5 + net-libs/libcloudproviders + sys-libs/zlib + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${R_DEPEND} + dev-qt/qtconcurrent:5 + dev-qt/qtxml:5 + || ( gnome-base/librsvg media-gfx/inkscape ) + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + test? ( + dev-qt/qttest:5 + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" + +PATCHES=( + # https://github.com/nextcloud/desktop/pull/5309 + "${FILESDIR}"/${PN}-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch +) + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_UPDATER=OFF + $(cmake_use_find_package doc Sphinx) + $(cmake_use_find_package doc PdfLatex) + $(cmake_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + +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 +} -- cgit v1.2.3