diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-10-01 20:54:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-10-01 20:54:53 +0100 |
commit | 391b5b359a346aff490103da7dddc85047f83830 (patch) | |
tree | 29eea460a0bd7e1ff21d43b9d6df9af4d8a175e1 /net-misc/nextcloud-client | |
parent | c719fdcee603a5a706a45d10cb598762d56a727d (diff) |
gentoo resync : 01.10.2021
Diffstat (limited to 'net-misc/nextcloud-client')
-rw-r--r-- | net-misc/nextcloud-client/Manifest | 8 | ||||
-rw-r--r-- | net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch | 54 | ||||
-rw-r--r-- | net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild | 92 | ||||
-rw-r--r-- | net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild | 94 | ||||
-rw-r--r-- | net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild (renamed from net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild) | 27 |
5 files changed, 71 insertions, 204 deletions
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index b96d2b9e215f..62141f8555c4 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,12 +1,10 @@ AUX nextcloud-client-3.2.3-inkscape.patch 3190 BLAKE2B 432a1d418e61c982ff6f4d7a43151c5bd8ffb7d231542abc3ee42f450fad2eeed4e1d3e641ee4ac246d43174d69de4de7384516dd9a22c26a1c878ab0aa06f7e SHA512 0a92815371923bce701edd362583e11977556f17866fedf13ea48ed26e409610b80eb7a6b6181702b59250fa3868319624bdad34911746490f5a8330ad94b4a2 AUX nextcloud-client-3.2.3-webengine.patch 15574 BLAKE2B 8cd752db888f87f075f3b69cf34e3e84fde99f3f2dec4891092d47c020b60efc49968bfee7ef8136b6e0454cc331b778fcbc2a94903b11c1cc3e587d153e3aa9 SHA512 b3ea743ab50ef8eda12a0bef8513d1563d3682c54e6af586ccf60cf7b4377e93913c4d6eb0ba1b65075203608bfa81f934dfc408b89c5bf3b84352524bc08091 +AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99 -DIST nextcloud-client-3.2.1.tar.gz 15234115 BLAKE2B 2fcbaab4e73db3cfbf7dea750a0e0782c6cb8bb03c867653a47d2f21cfe369da8e4eff8bf1f0ff548c62909e770132799a927e18f9c732a4d551b97ff6362572 SHA512 bf2b4e1c85e07ad32ed00efa4a56d6b4195b42f4d95c7cb32d8c43d2c5564ac1512155a9f51508d522366c5ce44104f1b076f1addef1147a77ace5a11bd500e6 -DIST nextcloud-client-3.2.2.tar.gz 15398900 BLAKE2B b91c814977486db57b1864f71d3763c64f676449a5547f21bb379154f66a38bc4db355bb16cc6a70781cb45d4a4704f55238dd570f123b450c512bc3e0ce5b3c SHA512 ce6adbb09ee8495448b7da0c5e9637b3c775d28b8ee1656864843264bdacffbc402c9f507ced3e3943896ae25ee73975054b8ffa1577bdd3d32dc453c3f94d74 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 EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3 -EBUILD nextcloud-client-3.2.1.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9 -EBUILD nextcloud-client-3.2.2.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9 EBUILD nextcloud-client-3.2.3-r1.ebuild 2175 BLAKE2B 9f3c68d6afd38a786b1808860b77b2f05c53361b7dbfae0a52bb0f46114c56f2f6c510b3d339179549af132b34478ae84e361313e47362ca53677dc0025b62ff SHA512 93364128839e839fb76752cb753301652dec39a6ff936dac43e90ca636180703889b1e48c79a0f9e814a9c094534e96d474583d2aee3222eabd3b3b4410a8797 -EBUILD nextcloud-client-3.2.3.ebuild 2034 BLAKE2B 6b5c122bd2c5d519ee1945a175298b723d5198043b00780d1cf937110a0c016014d34f8f66bb23bdeb4e5cb2aa8b82abe6a4a4397b2ccded916e34ab1217377f SHA512 6498817e25c0b7155afdf7a53fcfa0ca52cb7a3096645efdf72f8f35df7d5247db55677abd7524f78ea795813db23af7ae6d932c5adb5c6bc6c352eeb7fd25b2 +EBUILD nextcloud-client-3.3.4.ebuild 2166 BLAKE2B 81877061305f13dd5fb75bb56c39aaedc49b63624b35a536fd1ce711468c2608da0c1d4e64d26af729ccac65b44f8f2bd087bdd1b61403f938986940242c1c93 SHA512 9cc5ee0c40d68b797aa83cedd7c2347bf446d187eb3435d91ece998e22684b7dd25467d83656e3cc8e1d7a6f0c3661c30b5cde105b53bdba7574e4dc8decd937 MISC metadata.xml 605 BLAKE2B c24c20e11e5ddf2ce188c7c80aecacc9af7145aa325b150e9d9b753b11525683938409aa911d65d4e62a2f6177df369005aaba7c10768beba4bb66955126b547 SHA512 5fc64dfed80ed91c89402e22910dc72e8d3649be1bcd27b0a48ecd6a86f129b06d9d37fa7d4f7d54c083b3b04935a28ae982871e7c1cf28a88cbd9dbf9aebc17 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 000000000000..8e5510db04d5 --- /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@liwjatan.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@liwjatan.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.2.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild deleted file mode 100644 index 7e82191086ca..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=dev-db/sqlite-3.34:3 - 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/qtwebengine:5[widgets] - dev-qt/qtwebsockets:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - >=dev-libs/openssl-1.1.0:0= - nautilus? ( dev-python/nautilus-python )" - -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - dev-qt/qtconcurrent:5 - dev-qt/qtxml: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 - )" - -RDEPEND="${COMMON_DEPEND}" - -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_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=yes - -DBUILD_UPDATER=OFF - -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 -} diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild deleted file mode 100644 index 4bf713797b35..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=dev-db/sqlite-3.34:3 - 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/qtwebengine:5[widgets] - dev-qt/qtwebsockets:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - >=dev-libs/openssl-1.1.0:0= - nautilus? ( dev-python/nautilus-python )" - -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - dev-qt/qtconcurrent:5 - dev-qt/qtxml: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 - )" - -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-inkscape.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_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=yes - -DBUILD_UPDATER=OFF - -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 -} diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild index 7e82191086ca..79fbb809fed5 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild @@ -12,10 +12,11 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}. LICENSE="CC-BY-3.0 GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc dolphin nautilus test" +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 @@ -24,7 +25,6 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib @@ -32,13 +32,14 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) - >=dev-libs/openssl-1.1.0:0= - nautilus? ( dev-python/nautilus-python )" + 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 @@ -53,18 +54,14 @@ DEPEND="${COMMON_DEPEND} 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 - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake_src_prepare } @@ -72,10 +69,14 @@ 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=yes -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) ) |