From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- net-misc/nextcloud-client/Manifest | 5 +- ...nextcloud-client-2.5.1-missing_qt_include.patch | 23 ------ .../nextcloud-client-2.5.1-r1.ebuild | 93 ---------------------- .../nextcloud-client/nextcloud-client-2.5.2.ebuild | 89 +++++++++++++++++++++ 4 files changed, 91 insertions(+), 119 deletions(-) delete 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.5.1-r1.ebuild create mode 100644 net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild (limited to 'net-misc/nextcloud-client') diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index f2eed2b7dcac..08e1d04b72df 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,4 +1,3 @@ -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 -EBUILD nextcloud-client-2.5.1-r1.ebuild 2065 BLAKE2B 925f57b30f22ad41a3ad291f3be4dff34cd050bf96b170d136434a013886410c02c4f3a53072d292208a77ece73ef70c7bb40f0c327300abbfc8a77a159758a1 SHA512 82a896b06f3e6d9f54ed2b0aadb62791a501ce1585c895159fa408b4c0bb46671ef9691558410b19460100d86642df77a190d5691dfd06e7f0addb75c3062d2b +DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae +EBUILD nextcloud-client-2.5.2.ebuild 2006 BLAKE2B 2e5da149dd376fef452c36eb7279ce4a0e7832219d5edc25f823bc691b2d5c37c838b148c2affef9854532625292a99282cfdfe073cc6e6ea3e0f9d67a7a6bfc SHA512 cdc60ee671e822eef98ec463382afe43997a0f220f7bde50cb0a20940131c4262384ccc767db2e5dcb86c7ba86eed1b7f80508764530569a122a648a9c0f83a7 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 deleted file mode 100644 index a5d6f03581b0..000000000000 --- a/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch +++ /dev/null @@ -1,23 +0,0 @@ -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.5.1-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild deleted file mode 100644 index 28db8da07422..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild new file mode 100644 index 000000000000..fed415b280bb --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild @@ -0,0 +1,89 @@ +# 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 + )" + +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