From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- net-misc/nextcloud-client/Manifest | 8 +- ...nextcloud-client-2.5.1-missing_qt_include.patch | 23 +++++ .../nextcloud-client/nextcloud-client-2.3.3.ebuild | 109 --------------------- .../nextcloud-client/nextcloud-client-2.5.0.ebuild | 93 ------------------ .../nextcloud-client-2.5.1-r1.ebuild | 93 ++++++++++++++++++ .../nextcloud-client/nextcloud-client-2.5.1.ebuild | 93 ------------------ 6 files changed, 118 insertions(+), 301 deletions(-) create mode 100644 net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.5.0.ebuild create mode 100644 net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild (limited to 'net-misc/nextcloud-client') diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 8fd78310da12..f2eed2b7dcac 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,8 +1,4 @@ -DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde -DIST nextcloud-client-2.5.0.tar.gz 18914632 BLAKE2B b6a8e353a7894dac599b5ecfb7bed0f373ef6ce602a929b9daf709a91513b34ff92f9af0ba57acd3294561f30d37623280b043c779b52872bad2829e66315e10 SHA512 85591e3d5011a514472f179e48815134e12751849be9fa3457f631cdb262764801e8aecc774e0cff4d1dc4a4c34e3238a6ac1442e93ae847417d25560917ce99 +AUX nextcloud-client-2.5.1-missing_qt_include.patch 714 BLAKE2B 293838a7c40d19dabe68f566d8051b406ac4de3c6bf0de1da39fefba0c8539e10ce324df6b48ccf6d803c76021d03613d7eaa89d18f4f2382f61a19601b619eb SHA512 654f31d8545bc306a76105bbaaf7f13b0d95ba0e33c72b0c04c41f61d5bb8ce97c4ac6d8e04515397f7422a857102ad4ed5a6eb50054d36202c9c84c3ffa1157 DIST nextcloud-client-2.5.1.tar.gz 18916053 BLAKE2B 98daa5abde8aa82e2d30be7c340f808c4cb7a1986bbb7e9e5208174b268ddacfaf08e91b54d6bce5039fd19f6729716285e2a45f913c0d0eb473bf753031678f SHA512 04301f4b6283c4003ec4fed7926e11e2a627903a1b20e0b7cb4bb24b522e133d41001f48c633cad4fe3b100496d3a7826893b78074c2e3985a4c9c90122e3108 -DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2 -EBUILD nextcloud-client-2.3.3.ebuild 2453 BLAKE2B e953f8c60f10101c891e46c98ba4c6c2f3ec09a17c40cdfe66687b31dcc0e17a9c3da8c4c8d6e7f27c1c0786f756dd98df2b979d671fa8d649d18eb1861fc7e2 SHA512 42614380bd5945afc39fb3b653c1d03e7afcd61f7bdb3715983198bb8dc7e75a029150189bf800ab39d9a0d9775aa3b05439269b6a0a987f9c02443167dc447f -EBUILD nextcloud-client-2.5.0.ebuild 2053 BLAKE2B 82c72834a72183622c3ca4dae4b17a2722bd07a2dc8fb3728004e6e7b7dc236dd6d1cec4a13ace4d7718295cdb22c91f2ae2adbe89b849cd225b9032df4aa4ca SHA512 4d4ea0debd560b93b3eb3f613e5e9f4fa65b520dacacece181f6c85da0912e394d3424100b2aaf07ebcb9fb4ffc9f7980256b8b4b079cbd4c625ca6e701410f4 -EBUILD nextcloud-client-2.5.1.ebuild 2053 BLAKE2B 82c72834a72183622c3ca4dae4b17a2722bd07a2dc8fb3728004e6e7b7dc236dd6d1cec4a13ace4d7718295cdb22c91f2ae2adbe89b849cd225b9032df4aa4ca SHA512 4d4ea0debd560b93b3eb3f613e5e9f4fa65b520dacacece181f6c85da0912e394d3424100b2aaf07ebcb9fb4ffc9f7980256b8b4b079cbd4c625ca6e701410f4 +EBUILD nextcloud-client-2.5.1-r1.ebuild 2065 BLAKE2B 925f57b30f22ad41a3ad291f3be4dff34cd050bf96b170d136434a013886410c02c4f3a53072d292208a77ece73ef70c7bb40f0c327300abbfc8a77a159758a1 SHA512 82a896b06f3e6d9f54ed2b0aadb62791a501ce1585c895159fa408b4c0bb46671ef9691558410b19460100d86642df77a190d5691dfd06e7f0addb75c3062d2b MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch new file mode 100644 index 000000000000..a5d6f03581b0 --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch @@ -0,0 +1,23 @@ +From 129588442041c32b0d98f2361a69e0e350592f70 Mon Sep 17 00:00:00 2001 +From: Oskar Kruschitz +Date: Thu, 13 Dec 2018 16:13:01 +0100 +Subject: [PATCH] Added missing Include + +Fixing an error during Build with Qt5.12: +error: member access into incomplete type 'const QWebEngineCertificateError' +--- + src/gui/wizard/webview.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp +index 15c1f314e..73e671b8f 100644 +--- a/src/gui/wizard/webview.cpp ++++ b/src/gui/wizard/webview.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include "common/utility.h" + diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild deleted file mode 100644 index 84b9e7850f91..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils - -DESCRIPTION="Nextcloud themed desktop client" -HOMEPAGE="https://github.com/nextcloud/client_theming" -SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz - https://github.com/nextcloud/client_theming/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/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/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - virtual/libiconv - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python ) - shibboleth? ( dev-qt/qtwebkit:5 ) -" -RDEPEND="${COMMON_DEPEND} - !net-misc/ocsync - !net-misc/owncloud-client -" -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 - ) -" - -S=${WORKDIR}/client_theming-${PV} - -src_unpack() { - default - - rmdir "${S}"/client || die - mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \ - || die -} - -src_prepare() { - CMAKE_USE_DIR="${S}"/client - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die - # Fix icon name - sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \ - -i client/mirall.desktop.in || die - - if ! use nautilus; then - pushd client/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} - -DWITH_ICONV=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DBUILD_WITH_QT4=OFF - -DNO_SHIBBOLETH=$(usex !shibboleth) - -DUNIT_TESTING=$(usex test) - -DOEM_THEME_DIR="${S}"/nextcloudtheme - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.0.ebuild deleted file mode 100644 index 29daa11a9dbe..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.5.0.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils - -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} - !net-misc/ocsync - !net-misc/owncloud-client -" -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 - ) -" - -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() { - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild new file mode 100644 index 000000000000..28db8da07422 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils gnome2-utils + +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 + )" + +PATCHES=( + "${FILESDIR}"/${P}-missing_qt_include.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() { + if ! use doc ; then + elog "Documentation and man pages not installed" + elog "Enable doc USE-flag to generate them" + fi + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild deleted file mode 100644 index 29daa11a9dbe..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils - -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} - !net-misc/ocsync - !net-misc/owncloud-client -" -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 - ) -" - -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() { - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3