[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/

[Bernard Cafarelli]

commit:     4daec60d09eb5d41be67c1b4da2371396dad65d7
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 28 21:20:46 2021 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Sep 28 21:20:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4daec60d

net-misc/nextcloud-client: 3.3.4 bump

Backport upstream patch to depend on librsvg instead of inkscape to
generate PNG images

Package-Manager: Portage-3.0.24, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 net-misc/nextcloud-client/Manifest                 |  1 +
 .../nextcloud-client-3.3.4-inkscape_to_rsvg.patch  | 54 +++++++++++++
 .../nextcloud-client/nextcloud-client-3.3.4.ebuild | 93 ++++++++++++++++++++++
 3 files changed, 148 insertions(+)

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index a9ec507b716..d4ea815aecd 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,2 +1,3 @@
 DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
 DIST nextcloud-client-3.2.3.tar.gz 15381488 BLAKE2B 14ee239321d7c530dada9d4727fa7cc9801637827fc8dd065ea9b68c54f3559cdb56b0d0e0e37fc7aa5c668be51e3839bc33b20ea9ab73e4a1df4ba260b0ab9e SHA512 bbb247ce4945503a5b1af55ee200edaef000bb21220a9408657e057c98bd3f7bd646dedbedc57048e9f593f3a1d408ac37b4b01c390ecf85dca82868792e922d
+DIST nextcloud-client-3.3.4.tar.gz 14032214 BLAKE2B 2d5a4cb8ed2aff6166e13c5e7ea5450d9b9ba1f385eb3cb99588584d1ccaf114ecdd4ed2fa0bdfcba6e5582df8e4bcdee371ef0de8c023fde131f23828d30fbf SHA512 c4fe2d032161fea556610396c5b51d6745f41de76d17e21fdd93ed0163f2079d1abba997a3184842403041cc25a303c5844fbd2213717b27d11ff9612f364151

diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
new file mode 100644
index 00000000000..8e5510db04d
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
@@ -0,0 +1,54 @@
+From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001
+From: Heinz Wiesinger <pprkut@××××××××.org>
+Date: Thu, 26 Aug 2021 16:07:25 +0200
+Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape
+
+Signed-off-by: Heinz Wiesinger <pprkut@××××××××.org>
+---
+ src/gui/CMakeLists.txt | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 970d2fc165..efe1b1c349 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
+ endif()
+ 
+ # Generate png icons from svg
+-find_program(INKSCAPE
+-  NAMES inkscape inkscape.exe
++find_program(SVG_CONVERTER
++  NAMES inkscape inkscape.exe rsvg-convert
+   REQUIRED
+-  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
++  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR)
+ # REQUIRED keyword is only supported on CMake 3.18 and above
+-if (NOT INKSCAPE)
+-  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
++if (NOT SVG_CONVERTER)
++  message(FATAL_ERROR "Could not find a suitable svg converter. Set SVG_CONVERTER_DIR to the path of either the inkscape or rsvg-convert executable.")
+ endif()
+ 
+ function(generate_sized_png_from_svg icon_path size)
+@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size)
+   set(icon_output_name "${size}-${icon_name_wle}.png")
+   message(STATUS "Generate ${icon_output_name}")
+   execute_process(COMMAND
+-    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
++    "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
+     WORKING_DIRECTORY "${icon_name_dir}"
+     RESULT_VARIABLE
+-    INKSCAPE_SIDEBAR_ERROR
++    SVG_CONVERTER_SIDEBAR_ERROR
+     OUTPUT_QUIET
+     ERROR_QUIET)
+ 
+-  if (INKSCAPE_SIDEBAR_ERROR)
++  if (SVG_CONVERTER_SIDEBAR_ERROR)
+     message(FATAL_ERROR
+-      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
++      "${SVG_CONVERTER} could not generate icon: ${SVG_CONVERTER_SIDEBAR_ERROR}")
+   else()
+   endif()
+ endfunction()

diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild
new file mode 100644
index 00000000000..79fbb809fed
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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 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
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	gnome-base/librsvg
+	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
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-inkscape_to_rsvg.patch )
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
+		$(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)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake_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
+}