Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/, net-misc/nextcloud-client/
Date: Thu, 12 May 2022 14:11:30
Message-Id: 1652364680.5750c4973292c8e8869fd697f1b20f433ad0da72.flow@gentoo
1 commit: 5750c4973292c8e8869fd697f1b20f433ad0da72
2 Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 12 14:10:05 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Thu May 12 14:11:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5750c497
7
8 net-misc/nextcloud-client: drop 3.3.6, 3.4.2
9
10 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
11
12 net-misc/nextcloud-client/Manifest | 2 -
13 .../nextcloud-client-3.3.4-inkscape_to_rsvg.patch | 54 ------------
14 .../nextcloud-client/nextcloud-client-3.3.6.ebuild | 94 ---------------------
15 .../nextcloud-client/nextcloud-client-3.4.2.ebuild | 96 ----------------------
16 4 files changed, 246 deletions(-)
17
18 diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
19 index 0e8992aba926..21ddc8f945dd 100644
20 --- a/net-misc/nextcloud-client/Manifest
21 +++ b/net-misc/nextcloud-client/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
24 -DIST nextcloud-client-3.4.2.tar.gz 14329069 BLAKE2B 5a23e9a7535aff3591d73d2b17abf71cb6302b9acfa41a1de051d42d9acb4cf4d76ed1dff3c73ec989a066c51d4fe9e94d6e71718f9fc0533d0c0e2bb0949060 SHA512 9788fd658c9e7c3b26eb3c41934ee75222aba0afd38e1fd71f8f04472bf4971e5cc7c12469f0b3f909f4dc1e5aa1a063ae1324f6a8b6052cdf9b3c8c1cc8c909
25 DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71
26 DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a632349999ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4
27 DIST nextcloud-client-3.5.0.tar.gz 15359946 BLAKE2B 144f50fb1ce3f1cad205fd2bf5c161c54602d75642518e4db2bad1e384b28bf3baf3ba7a22eafe7530aae9aa1bced4c2025c33dc1566ba48db64224ae00537e9 SHA512 9c20cc2878832fb9fbe690fb0a2b9f960ea58480bb14c89d8e713d9847a27fad920ce4b507fb8b7b5ac211f4a0e1c775e3b985d57acd9191e87f45e01a86f85c
28
29 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
30 deleted file mode 100644
31 index 8e5510db04d5..000000000000
32 --- a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
33 +++ /dev/null
34 @@ -1,54 +0,0 @@
35 -From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001
36 -From: Heinz Wiesinger <pprkut@××××××××.org>
37 -Date: Thu, 26 Aug 2021 16:07:25 +0200
38 -Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape
39 -
40 -Signed-off-by: Heinz Wiesinger <pprkut@××××××××.org>
41 ----
42 - src/gui/CMakeLists.txt | 18 +++++++++---------
43 - 1 file changed, 9 insertions(+), 9 deletions(-)
44 -
45 -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
46 -index 970d2fc165..efe1b1c349 100644
47 ---- a/src/gui/CMakeLists.txt
48 -+++ b/src/gui/CMakeLists.txt
49 -@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
50 - endif()
51 -
52 - # Generate png icons from svg
53 --find_program(INKSCAPE
54 -- NAMES inkscape inkscape.exe
55 -+find_program(SVG_CONVERTER
56 -+ NAMES inkscape inkscape.exe rsvg-convert
57 - REQUIRED
58 -- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
59 -+ HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR)
60 - # REQUIRED keyword is only supported on CMake 3.18 and above
61 --if (NOT INKSCAPE)
62 -- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
63 -+if (NOT SVG_CONVERTER)
64 -+ 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.")
65 - endif()
66 -
67 - function(generate_sized_png_from_svg icon_path size)
68 -@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size)
69 - set(icon_output_name "${size}-${icon_name_wle}.png")
70 - message(STATUS "Generate ${icon_output_name}")
71 - execute_process(COMMAND
72 -- "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
73 -+ "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
74 - WORKING_DIRECTORY "${icon_name_dir}"
75 - RESULT_VARIABLE
76 -- INKSCAPE_SIDEBAR_ERROR
77 -+ SVG_CONVERTER_SIDEBAR_ERROR
78 - OUTPUT_QUIET
79 - ERROR_QUIET)
80 -
81 -- if (INKSCAPE_SIDEBAR_ERROR)
82 -+ if (SVG_CONVERTER_SIDEBAR_ERROR)
83 - message(FATAL_ERROR
84 -- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
85 -+ "${SVG_CONVERTER} could not generate icon: ${SVG_CONVERTER_SIDEBAR_ERROR}")
86 - else()
87 - endif()
88 - endfunction()
89
90 diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
91 deleted file mode 100644
92 index 311dd37b9f30..000000000000
93 --- a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
94 +++ /dev/null
95 @@ -1,94 +0,0 @@
96 -# Copyright 1999-2021 Gentoo Authors
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=7
100 -
101 -inherit cmake xdg
102 -
103 -DESCRIPTION="Desktop Syncing Client for Nextcloud"
104 -HOMEPAGE="https://github.com/nextcloud/desktop"
105 -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
106 -
107 -LICENSE="CC-BY-3.0 GPL-2"
108 -SLOT="0"
109 -KEYWORDS="amd64 ~arm64 x86"
110 -IUSE="doc dolphin nautilus test webengine"
111 -RESTRICT="!test? ( test )"
112 -
113 -COMMON_DEPEND=">=dev-db/sqlite-3.34:3
114 - >=dev-libs/openssl-1.1.0:0=
115 - dev-libs/qtkeychain[qt5(+)]
116 - dev-qt/qtcore:5
117 - dev-qt/qtdbus:5
118 - dev-qt/qtdeclarative:5
119 - dev-qt/qtgui:5
120 - dev-qt/qtnetwork:5[ssl]
121 - dev-qt/qtquickcontrols2:5
122 - dev-qt/qtsvg:5
123 - dev-qt/qtwebsockets:5
124 - dev-qt/qtwidgets:5
125 - sys-libs/zlib
126 - dolphin? (
127 - kde-frameworks/kcoreaddons:5
128 - kde-frameworks/kio:5
129 - )
130 - nautilus? ( dev-python/nautilus-python )
131 - webengine? ( dev-qt/qtwebengine:5[widgets] )"
132 -
133 -DEPEND="${COMMON_DEPEND}
134 - dev-qt/linguist-tools:5
135 - dev-qt/qtconcurrent:5
136 - dev-qt/qtxml:5
137 - gnome-base/librsvg
138 - doc? (
139 - dev-python/sphinx
140 - dev-tex/latexmk
141 - dev-texlive/texlive-latexextra
142 - virtual/latex-base
143 - )
144 - dolphin? ( kde-frameworks/extra-cmake-modules )
145 - test? (
146 - dev-util/cmocka
147 - dev-qt/qttest:5
148 - )"
149 -
150 -RDEPEND="${COMMON_DEPEND}"
151 -
152 -PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch )
153 -
154 -S="${WORKDIR}/desktop-${PV/_/-}"
155 -
156 -src_prepare() {
157 - # We do not package libcloudproviders
158 - sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
159 -
160 - # Keep tests in ${T}
161 - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
162 -
163 - cmake_src_prepare
164 -}
165 -
166 -src_configure() {
167 - local mycmakeargs=(
168 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
169 - -DBUILD_UPDATER=OFF
170 - $(cmake_use_find_package doc Sphinx)
171 - $(cmake_use_find_package doc PdfLatex)
172 - $(cmake_use_find_package webengine Qt5WebEngine)
173 - $(cmake_use_find_package webengine Qt5WebEngineWidgets)
174 - -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
175 - -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
176 - -DUNIT_TESTING=$(usex test)
177 - )
178 -
179 - cmake_src_configure
180 -}
181 -
182 -pkg_postinst() {
183 - xdg_pkg_postinst
184 -
185 - if ! use doc ; then
186 - elog "Documentation and man pages not installed"
187 - elog "Enable doc USE-flag to generate them"
188 - fi
189 -}
190
191 diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild
192 deleted file mode 100644
193 index df314cf64b74..000000000000
194 --- a/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild
195 +++ /dev/null
196 @@ -1,96 +0,0 @@
197 -# Copyright 1999-2022 Gentoo Authors
198 -# Distributed under the terms of the GNU General Public License v2
199 -
200 -EAPI=8
201 -
202 -inherit cmake virtualx xdg
203 -
204 -DESCRIPTION="Desktop Syncing Client for Nextcloud"
205 -HOMEPAGE="https://github.com/nextcloud/desktop"
206 -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
207 -
208 -LICENSE="CC-BY-3.0 GPL-2"
209 -SLOT="0"
210 -KEYWORDS="~amd64 ~arm64 ~x86"
211 -IUSE="doc dolphin nautilus test webengine"
212 -RESTRICT="!test? ( test )"
213 -
214 -COMMON_DEPEND=">=dev-db/sqlite-3.34:3
215 - >=dev-libs/openssl-1.1.0:0=
216 - dev-libs/qtkeychain:=[qt5(+)]
217 - dev-qt/qtcore:5
218 - dev-qt/qtdbus:5
219 - dev-qt/qtdeclarative:5
220 - dev-qt/qtgui:5
221 - dev-qt/qtnetwork:5[ssl]
222 - dev-qt/qtquickcontrols2:5
223 - dev-qt/qtsvg:5
224 - dev-qt/qtwebsockets:5
225 - dev-qt/qtwidgets:5
226 - sys-libs/zlib
227 - dolphin? (
228 - kde-frameworks/kcoreaddons:5
229 - kde-frameworks/kio:5
230 - )
231 - nautilus? ( dev-python/nautilus-python )
232 - webengine? ( dev-qt/qtwebengine:5[widgets] )"
233 -
234 -DEPEND="${COMMON_DEPEND}
235 - dev-qt/linguist-tools:5
236 - dev-qt/qtconcurrent:5
237 - dev-qt/qtxml:5
238 - gnome-base/librsvg
239 - doc? (
240 - dev-python/sphinx
241 - dev-tex/latexmk
242 - dev-texlive/texlive-latexextra
243 - virtual/latex-base
244 - )
245 - dolphin? ( kde-frameworks/extra-cmake-modules )
246 - test? (
247 - dev-util/cmocka
248 - dev-qt/qttest:5
249 - )"
250 -
251 -RDEPEND="${COMMON_DEPEND}"
252 -
253 -S="${WORKDIR}/desktop-${PV/_/-}"
254 -
255 -src_prepare() {
256 - # We do not package libcloudproviders
257 - sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
258 -
259 - # Keep tests in ${T}
260 - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
261 -
262 - cmake_src_prepare
263 -}
264 -
265 -src_configure() {
266 - local mycmakeargs=(
267 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
268 - -DBUILD_UPDATER=OFF
269 - $(cmake_use_find_package doc Sphinx)
270 - $(cmake_use_find_package doc PdfLatex)
271 - $(cmake_use_find_package webengine Qt5WebEngine)
272 - $(cmake_use_find_package webengine Qt5WebEngineWidgets)
273 - -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
274 - -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
275 - -DBUILD_TESTING=$(usex test)
276 - )
277 -
278 - cmake_src_configure
279 -}
280 -
281 -src_test() {
282 - virtx cmake_src_test
283 -}
284 -
285 -pkg_postinst() {
286 - xdg_pkg_postinst
287 -
288 - if ! use doc ; then
289 - elog "Documentation and man pages not installed"
290 - elog "Enable doc USE-flag to generate them"
291 - fi
292 -}