commit: 18b392688f9d9f834fc21fb0d6a8e080a8073461 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Tue Oct 22 10:28:25 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Oct 23 19:07:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b39268
net-misc/nextcloud-client: add 3.14.3, port to qt6 Thanks to asturm for valuable feedback. Closes: https://bugs.gentoo.org/926673 Closes: https://github.com/gentoo/gentoo/pull/39074 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-misc/nextcloud-client/Manifest | 1 + .../files/nextcloud-client-3.14.2-doc-fix.patch | 35 ++++++ .../nextcloud-client-3.14.3.ebuild | 120 +++++++++++++++++++++ 3 files changed, 156 insertions(+) diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 434f1f591550..867eaf6f774c 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,4 +1,5 @@ DIST nextcloud-client-3.11.1.tar.gz 13598448 BLAKE2B b1e9070c55972facd72c65b571128f55c041f2fa1d38f7d22ed0f3ebca2b4ad9faef56d5699a48a70f062d13385c39123185b50ebba3d035d4e5af1320ce1844 SHA512 fc8700f36e3a2e8f07d219f9e7065a97e46d162d8c4f9a576e322dc45470e8b95321a1e176c4739a4fa212a69ff2782049096b32dcfe656a9e9cbedb8c7ed50e DIST nextcloud-client-3.12.6.tar.gz 13647404 BLAKE2B 8414c0248596f5bde78074de72a4cc5331741b19c94d2bb40893afbe7821e1016809245c74ddb14daaf21f8c25c80db4e0e752282435734b36d5ea711c2bc81d SHA512 1ac3351f1371eebae46cdeb2aa6b2203dc0c3583abc8b690a6a1764ffd489dcd5b2b56d6f94fa45c212cbd17969f889a36ce3f186e2f99d159728daefb07ff32 DIST nextcloud-client-3.13.2.tar.gz 13782506 BLAKE2B 867ae6ac056bc818d544d22b3a08c8876c093ca75746217822e3111c9de1e8a6b90ba9e0954e0b8c952082ea39f6f732c8914e267b4b1f1d8af3d8ebf6dbd73e SHA512 4dff6394d26445c124a9c93494b71dfa74fe696c147f765e0cbe053f800ec53fe47ba59e2c8e74c704b58e5fce02d2b40bb96a8777bc7580198e89be5d998ae6 +DIST nextcloud-client-3.14.3.tar.gz 13959636 BLAKE2B 1186b04a5aaaa4cacce56966154d08d44867b6b191d50f7159b52509ba3306bbaf98869ed06a636ac8f1c840aaecea62aea72f19fe166f64000ff27cc906b681 SHA512 5ed7c550784175623220eb90fc0b5a4c99a1ead454d33ac15173358616154bcbc6e4740225f5490b3ddf8eae19d337f11ed522552a0378878803e1dfb3aa8cef DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.14.2-doc-fix.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.14.2-doc-fix.patch new file mode 100644 index 000000000000..d6e6fce85b83 --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-3.14.2-doc-fix.patch @@ -0,0 +1,35 @@ +From 463b4e63046a907581d5f4899aaddfa0afd9120a Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <[email protected]> +Date: Tue, 22 Oct 2024 12:18:31 +0200 +Subject: [PATCH] doc: delete section containing non-existing images + +Those images where deleted in 6d3335bd60ba ("Update instructions to +build on Windows.") and are no longer available. Hence, drop the +whole section referencing them. + +Fixes: 6d3335bd60ba1cb499985fc15e0b918fe8c404f4 +--- a/doc/building.rst ++++ b/doc/building.rst +@@ -215,19 +215,6 @@ System requirements + - Microsoft Visual Studio 2022 and tools to compile C++ + - `KDE Craft <https://community.kde.org/Craft>`_ + +-Setting up Microsoft Visual Studio +----------------------------------- +- +-1. Click on 'Modify' in the Visual Studio Installer: +- +- .. image:: ./images/building/visual-studio-installer.png +- :alt: Visual Studio Installer +- +-2. Select 'Desktop development with C++' +- +- .. image:: ./images/building/desktop-development-with-cpp.png +- :alt: Desktop development with C++ +- + Handling the dependencies + ------------------------- + We handle the dependencies using `KDE Craft <https://community.kde.org/Craft>`_ because it is easy to set it up and it makes the maintenance much more reliable in all platforms. +-- +2.45.2 + diff --git a/net-misc/nextcloud-client/nextcloud-client-3.14.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.14.3.ebuild new file mode 100644 index 000000000000..846df0a8ea38 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.14.3.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 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 ~ppc64 ~x86" +IUSE="doc dolphin nautilus test webengine" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-db/sqlite-3.34:3 + dev-libs/glib:2 + >=dev-libs/openssl-1.1.0:0= + >=dev-libs/qtkeychain-0.14.2:=[qt6(+)] + dev-qt/qt5compat:6 + >=dev-qt/qtbase-6.6.0:6[dbus,gui,network,sql,sqlite,widgets] + dev-qt/qtdeclarative:6[widgets] + dev-qt/qtsvg:6 + dev-qt/qtwebsockets:6 + kde-frameworks/karchive:6 + kde-frameworks/kguiaddons:6 + net-libs/libcloudproviders + sys-libs/zlib + dolphin? ( + kde-frameworks/kcoreaddons:6 + kde-frameworks/kio:6 + ) + nautilus? ( dev-python/nautilus-python ) + webengine? ( dev-qt/qtwebengine:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + dev-qt/qtbase:6[concurrent,xml] + || ( + gnome-base/librsvg + media-gfx/inkscape + ) + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + test? ( + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/qttools:6[linguist] + dolphin? ( >=kde-frameworks/extra-cmake-modules-5.106.0 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch + # https://github.com/nextcloud/desktop/pull/7383 + "${FILESDIR}"/${PN}-3.14.2-doc-fix.patch +) + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + # The image under images/building/path.png does no longer + # exist. This is already fixed upstream and can be dropped on the + # next bump + sed -i '/images\/building\/path.png/d' doc/building.rst || 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 Qt6WebEngine) + $(cmake_use_find_package webengine Qt6WebEngineWidgets) + -DBUILD_WITH_WEBENGINE=$(usex webengine) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + TEST_VERBOSE=1 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 ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." + fi +}
