* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2016-11-29 13:32 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2016-11-29 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 52119f2eb4ddc5113df09d07274e1919e37ac77a
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 13:31:21 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 13:31:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52119f2e
net-misc/nextcloud-client: desktop fixes
Fix dolphin integration, thanks Felix Tiede in bug #600116
Fix menu icon, bug #601150
Package-Manager: portage-2.3.2
.../files/nextcloud-client-2.2.4-dolphin.patch | 28 ++++++
.../nextcloud-client-2.2.4-r2.ebuild | 109 +++++++++++++++++++++
2 files changed, 137 insertions(+)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch
new file mode 100644
index 00000000..eea7fad
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch
@@ -0,0 +1,28 @@
+--- a/client/shell_integration/dolphin/CMakeLists.txt
++++ b/client/shell_integration/dolphin/CMakeLists.txt
+@@ -49,5 +49,6 @@ target_link_libraries(${OWNCLOUDDOLPHINOVERLAYPLUGIN} KF5::CoreAddons KF5::KIOCo
+ set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin)
+ add_library(${OWNCLOUDDOLPHINACTIONPLUGIN} MODULE ownclouddolphinactionplugin.cpp)
+ target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER})
+-install(FILES ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)
++configure_file(ownclouddolphinactionplugin.desktop.in ownclouddolphinactionplugin.desktop ESCAPE_QUOTES @ONLY)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)
+ install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION ${KDE_INSTALL_PLUGINDIR})
+--- a/client/shell_integration/dolphin/ownclouddolphinactionplugin.desktop
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Type=Service
+-Name=OwncloudAction
+-ServiceTypes=KFileItemAction/Plugin
+-MimeType=application/octet-stream;inode/directory;
+-X-KDE-Library=ownclouddolphinactionplugin
+--- /dev/null
++++ b/client/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in
+@@ -0,0 +1,6 @@
++[Desktop Entry]
++Type=Service
++Name=@APPLICATION_NAME@Action
++ServiceTypes=KFileItemAction/Plugin
++MimeType=application/octet-stream;inode/directory;
++X-KDE-Library=@APPLICATION_EXECUTABLE@dolphinactionplugin
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild
new file mode 100644
index 00000000..1357f90
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Nextcloud themed desktop client"
+HOMEPAGE="https://github.com/nextcloud/client_theming"
+SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
+ https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+ dev-libs/qtkeychain[qt5]
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtsql:5
+ dev-qt/qtwebkit:5[printsupport]
+ sys-fs/inotify-tools
+ virtual/libiconv
+ dolphin? (
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/kio:5
+ )
+ nautilus? ( dev-python/nautilus-python )
+ samba? ( >=net-fs/samba-3.5 )
+ sftp? ( >=net-libs/libssh-0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !net-misc/ocsync
+ !net-misc/owncloud-client
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/linguist-tools:5
+ doc? (
+ dev-python/sphinx
+ dev-texlive/texlive-latexextra
+ virtual/latex-base
+ )
+ dolphin? ( kde-frameworks/extra-cmake-modules )
+ test? (
+ dev-util/cmocka
+ dev-qt/qttest:5
+ )
+"
+
+S=${WORKDIR}/client_theming-${PV}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-dolphin.patch
+)
+src_unpack() {
+ default
+
+ rmdir "${S}"/client || die
+ mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
+ || die
+}
+
+src_prepare() {
+ CMAKE_USE_DIR="${S}"/client
+ # Keep tests in ${T}
+ sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
+ # Fix icon name
+ sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
+ -i client/mirall.desktop.in || die
+
+ if ! use nautilus; then
+ pushd client/shell_integration > /dev/null || die
+ cmake_comment_add_subdirectory nautilus
+ popd > /dev/null || die
+ fi
+
+ default
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DWITH_ICONV=ON
+ -DWITH_DOC=$(usex doc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+ -DBUILD_WITH_QT4=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+ -DUNIT_TESTING=$(usex test)
+ -DOEM_THEME_DIR="${S}"/nextcloudtheme
+ )
+
+ 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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2017-07-18 16:42 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2017-07-18 16:42 UTC (permalink / raw
To: gentoo-commits
commit: ebefa0508058597cf13d94d6dafe1929a4f1b84e
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 16:42:28 2017 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 16:42:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebefa050
net-misc/nextcloud-client: drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-misc/nextcloud-client/Manifest | 2 -
.../files/nextcloud-client-2.2.4-dolphin.patch | 28 ------
.../nextcloud-client-2.2.4-r2.ebuild | 107 ---------------------
.../nextcloud-client/nextcloud-client-2.3.1.ebuild | 104 --------------------
4 files changed, 241 deletions(-)
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 982cb70c987..15197637558 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,4 +1,2 @@
-DIST nextcloud-client-2.2.4.tar.gz 642472 SHA256 55a16505c8551cb8e6af5d2f570b6d4384f33a75a79810864e1d4555d53dedf9 SHA512 646e624335cc11ac862b1b58ceb36aa8264f2db6ed586ae473b7522a5fdab7e30f196c1680f8dcf70af3b204374488e3bd589bb41669f9abcd9509d2293afc3f WHIRLPOOL 1bf627732492726fbb8394c2c88dcef667b8079a8923c906a58bd2039b14b27e76224ceb8d08654806d7f55f966b949c338ec759746acb90e023adc608d659da
DIST nextcloud-client-2.3.1.tar.gz 654810 SHA256 5fc6f9f981d68110982ab006cdf9d68caa0c59015e57f4491b9a705fb6c83dd6 SHA512 f8210c8cc08e0bfb80e63b18af305c2a8e2309f673caca5bc748c130d960d444ab2db3fad3e43dbfffbe072748c85e15a50d0ebe1fd491dec7553ac8d9552cfe WHIRLPOOL 5a38a708647758ddb54d7d47dd30a71e59b03c3c45e6cfd9ac218c013da9dfc56d07b247982056f58e083d82c138576679525d994665717c739cc9f5cdd0238b
-DIST owncloudclient-2.2.4.tar.xz 12216896 SHA256 f313534f7cdae686beeaa6670d9e3586a627ce78b67cab6e42a448a675d9e7d3 SHA512 5bc5273c90ab63c411e58d1fe13636f6b5977c28470efe53296a71541aaa63af99001cb630adaee99b9b81a8b56fe0f66c337319464ab950dd6eac4cdd53f951 WHIRLPOOL 18aa5076049f9cdfbafa58454937b7fc4c38a5405b6e1375d762d88bbfae92b813cd2ec88a4e4108012137c94908894821575d3f6d2bf694e35d734f2b8fbd37
DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch
deleted file mode 100644
index eea7fad024a..00000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-2.2.4-dolphin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/client/shell_integration/dolphin/CMakeLists.txt
-+++ b/client/shell_integration/dolphin/CMakeLists.txt
-@@ -49,5 +49,6 @@ target_link_libraries(${OWNCLOUDDOLPHINOVERLAYPLUGIN} KF5::CoreAddons KF5::KIOCo
- set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin)
- add_library(${OWNCLOUDDOLPHINACTIONPLUGIN} MODULE ownclouddolphinactionplugin.cpp)
- target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER})
--install(FILES ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)
-+configure_file(ownclouddolphinactionplugin.desktop.in ownclouddolphinactionplugin.desktop ESCAPE_QUOTES @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)
- install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION ${KDE_INSTALL_PLUGINDIR})
---- a/client/shell_integration/dolphin/ownclouddolphinactionplugin.desktop
-+++ /dev/null
-@@ -1,6 +0,0 @@
--[Desktop Entry]
--Type=Service
--Name=OwncloudAction
--ServiceTypes=KFileItemAction/Plugin
--MimeType=application/octet-stream;inode/directory;
--X-KDE-Library=ownclouddolphinactionplugin
---- /dev/null
-+++ b/client/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in
-@@ -0,0 +1,6 @@
-+[Desktop Entry]
-+Type=Service
-+Name=@APPLICATION_NAME@Action
-+ServiceTypes=KFileItemAction/Plugin
-+MimeType=application/octet-stream;inode/directory;
-+X-KDE-Library=@APPLICATION_EXECUTABLE@dolphinactionplugin
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild
deleted file mode 100644
index 132a757972c..00000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Nextcloud themed desktop client"
-HOMEPAGE="https://github.com/nextcloud/client_theming"
-SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
- https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[qt5]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit:5
- sys-fs/inotify-tools
- virtual/libiconv
- dolphin? (
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- )
- nautilus? ( dev-python/nautilus-python )
- samba? ( >=net-fs/samba-3.5 )
- sftp? ( >=net-libs/libssh-0.5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !net-misc/ocsync
- !net-misc/owncloud-client
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- doc? (
- dev-python/sphinx
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )
-"
-
-S=${WORKDIR}/client_theming-${PV}
-
-PATCHES=(
- "${FILESDIR}"/${P}-dolphin.patch
-)
-src_unpack() {
- default
-
- rmdir "${S}"/client || die
- mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
- || die
-}
-
-src_prepare() {
- CMAKE_USE_DIR="${S}"/client
- # Keep tests in ${T}
- sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
- # Fix icon name
- sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
- -i client/mirall.desktop.in || die
-
- if ! use nautilus; then
- pushd client/shell_integration > /dev/null || die
- cmake_comment_add_subdirectory nautilus
- popd > /dev/null || die
- fi
-
- default
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DWITH_ICONV=ON
- -DWITH_DOC=$(usex doc)
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
- -DBUILD_WITH_QT4=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
- -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
- -DUNIT_TESTING=$(usex test)
- -DOEM_THEME_DIR="${S}"/nextcloudtheme
- )
-
- 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
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.1.ebuild
deleted file mode 100644
index b23cc84d14a..00000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Nextcloud themed desktop client"
-HOMEPAGE="https://github.com/nextcloud/client_theming"
-SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
- https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[qt5]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit:5
- sys-fs/inotify-tools
- virtual/libiconv
- dolphin? (
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- )
- nautilus? ( dev-python/nautilus-python )
- samba? ( >=net-fs/samba-3.5 )
- sftp? ( >=net-libs/libssh-0.5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !net-misc/ocsync
- !net-misc/owncloud-client
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- doc? (
- dev-python/sphinx
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )
-"
-
-S=${WORKDIR}/client_theming-${PV}
-
-src_unpack() {
- default
-
- rmdir "${S}"/client || die
- mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
- || die
-}
-
-src_prepare() {
- CMAKE_USE_DIR="${S}"/client
- # Keep tests in ${T}
- sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
- # Fix icon name
- sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
- -i client/mirall.desktop.in || die
-
- if ! use nautilus; then
- pushd client/shell_integration > /dev/null || die
- cmake_comment_add_subdirectory nautilus
- popd > /dev/null || die
- fi
-
- default
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DWITH_ICONV=ON
- -DWITH_DOC=$(usex doc)
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
- -DBUILD_WITH_QT4=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
- -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
- -DUNIT_TESTING=$(usex test)
- -DOEM_THEME_DIR="${S}"/nextcloudtheme
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2018-08-20 18:13 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2018-08-20 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 51a05d718ba4cf1bd765422967bdc86d50453233
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 20 16:31:52 2018 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 18:13:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a05d71
net-misc/nextcloud-client: 2.5.0_beta1 bump
Masked beta version to test upstream changes and openssl-1.1 dependency
Package-Manager: Portage-2.3.47, Repoman-2.3.10
net-misc/nextcloud-client/Manifest | 1 +
.../nextcloud-client-2.5.0_beta1-fix_cmake.patch | 24 ++++++
.../nextcloud-client-2.5.0_beta1.ebuild | 94 ++++++++++++++++++++++
3 files changed, 119 insertions(+)
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 641c6718514..1614fe6f864 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,2 +1,3 @@
DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
+DIST nextcloud-client-2.5.0_beta1.tar.gz 18930446 BLAKE2B cb6630950e26013c96151a6f8fc236a9e25313fa6479e00de754fe9c45762c62042b039f18d11febfed4cac4e36c9d7bc2fdb25a522d1a6c153343eca03d46f7 SHA512 0d6a7b24965b4cdae41aacb06804ea5463309f219d39cefbf970ba57697035b4113d1f185166b51ab296745d26e43591896fa1c8fb7430a9d624f7547fafaea4
DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
new file mode 100644
index 00000000000..e160d514088
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
@@ -0,0 +1,24 @@
+From 2b825a1748b2ecd624a38976d1bd6601bdb198c9 Mon Sep 17 00:00:00 2001
+From: Ronny Kunze <Shinji.Ikari_de@gmx.de>
+Date: Sat, 4 Aug 2018 16:53:06 +0200
+Subject: [PATCH] rearange CMake find_package OpenSSL
+
+the command seems to be malformed . The keyword VERSION is not valid .
+And the version should follow direct after the packagename.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8b8330f2..f1d07eea2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
+ endif()
+ find_package(Sphinx)
+ find_package(PdfLatex)
+- find_package(OpenSSL REQUIRED VERSION 1.1)
++ find_package(OpenSSL 1.1 REQUIRED )
+
+ find_package(ZLIB REQUIRED)
+ find_package(GLib2)
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
new file mode 100644
index 00000000000..388cf73e769
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/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}
+ !net-misc/ocsync
+ !net-misc/owncloud-client
+"
+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/_/-}
+
+PATCHES=( "${FILESDIR}"/${P}-fix_cmake.patch )
+
+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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2019-03-20 15:50 Miroslav Šulc
0 siblings, 0 replies; 11+ messages in thread
From: Miroslav Šulc @ 2019-03-20 15:50 UTC (permalink / raw
To: gentoo-commits
commit: fdcebd31c8f52a9cfca09c92042fe6da0ce7f1af
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 15:49:45 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 15:50:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdcebd31
net-misc/nextcloud-client-2.5.1-r1: removed (bug #680056)
Bug: https://bugs.gentoo.org/680056
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
net-misc/nextcloud-client/Manifest | 1 -
...nextcloud-client-2.5.1-missing_qt_include.patch | 23 ------
.../nextcloud-client-2.5.1-r1.ebuild | 93 ----------------------
3 files changed, 117 deletions(-)
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 38afb3c09a3..abc81fad6f7 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,2 +1 @@
-DIST nextcloud-client-2.5.1.tar.gz 18916053 BLAKE2B 98daa5abde8aa82e2d30be7c340f808c4cb7a1986bbb7e9e5208174b268ddacfaf08e91b54d6bce5039fd19f6729716285e2a45f913c0d0eb473bf753031678f SHA512 04301f4b6283c4003ec4fed7926e11e2a627903a1b20e0b7cb4bb24b522e133d41001f48c633cad4fe3b100496d3a7826893b78074c2e3985a4c9c90122e3108
DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
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 a5d6f03581b..00000000000
--- 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 <okr@huemer-it.com>
-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 <QProgressBar>
- #include <QLoggingCategory>
- #include <QLocale>
-+#include <QWebEngineCertificateError>
-
- #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 28db8da0742..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2019-12-13 12:43 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2019-12-13 12:43 UTC (permalink / raw
To: gentoo-commits
commit: c1caf7b967dcf9118ee2dddb971f78ba4c3de37b
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 12:43:01 2019 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 12:43:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1caf7b9
net-misc/nextcloud-client: fix test compilation
Closes: https://bugs.gentoo.org/700262
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../nextcloud-client-2.6.1-include_tests.patch | 22 ++++++++++++++++++++++
.../nextcloud-client/nextcloud-client-2.6.1.ebuild | 2 ++
2 files changed, 24 insertions(+)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch
new file mode 100644
index 00000000000..da8423022b7
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch
@@ -0,0 +1,22 @@
+From f9c6449c050cad673cf37971d9815a35e6ffb5dd Mon Sep 17 00:00:00 2001
+From: tuxmaster5000 <837503+tuxmaster5000@users.noreply.github.com>
+Date: Fri, 12 Oct 2018 15:56:26 +0200
+Subject: [PATCH] Fix include file
+
+---
+ test/testnextcloudpropagator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp
+index 6ad1a6b37..dc2e476ad 100644
+--- a/test/testnextcloudpropagator.cpp
++++ b/test/testnextcloudpropagator.cpp
+@@ -8,7 +8,7 @@
+ #include <QDebug>
+
+ #include "propagatedownload.h"
+-#include "nextcloudpropagator_p.h"
++#include "owncloudpropagator_p.h"
+
+ using namespace OCC;
+ namespace OCC {
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
index 9b0d12160a7..ba40a56dc34 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}"/${P}-include_tests.patch )
+
S=${WORKDIR}/desktop-${PV/_/-}
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2020-06-10 11:58 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2020-06-10 11:58 UTC (permalink / raw
To: gentoo-commits
commit: c93ee5f0930ed887880957b051cc611cab5a1779
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 11:53:46 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 11:58:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93ee5f0
net-misc/nextcloud-client: fix compilation failure with Qt 5.15
Closes: https://bugs.gentoo.org/727474
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../files/nextcloud-client-2.6.4-qt515.patch | 22 ++++++++++++++++++++++
.../nextcloud-client/nextcloud-client-2.6.4.ebuild | 4 +++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
new file mode 100644
index 00000000000..5c59cf46bf3
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
@@ -0,0 +1,22 @@
+From 0fe7a657386b107ae498e7749ff4c20116b9752a Mon Sep 17 00:00:00 2001
+From: Michael Schuster <michael@schuster.ms>
+Date: Sun, 7 Jun 2020 02:43:45 +0200
+Subject: [PATCH] Fix Qt 5.15.0 build error (missing include)
+
+Signed-off-by: Michael Schuster <michael@schuster.ms>
+---
+ src/libsync/networkjobs.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
+index fd63b9606..bb5786ea9 100644
+--- a/src/libsync/networkjobs.cpp
++++ b/src/libsync/networkjobs.cpp
+@@ -31,6 +31,7 @@
+ #include <QJsonDocument>
+ #include <QJsonObject>
+ #include <QPainter>
++#include <QPainterPath>
+
+ #include "networkjobs.h"
+ #include "account.h"
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
index 0efd5f09b27..655fcb79a2b 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
@@ -51,7 +51,9 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch
+ "${FILESDIR}"/${P}-qt515.patch
+ )
S=${WORKDIR}/desktop-${PV/_/-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2020-09-02 20:56 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2020-09-02 20:56 UTC (permalink / raw
To: gentoo-commits
commit: a69ef334f691d2ec0fdd0a4fc92c816680c4bc70
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 20:53:20 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 20:56:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69ef334
net-misc/nextcloud-client: drop old
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
net-misc/nextcloud-client/Manifest | 2 -
.../files/nextcloud-client-2.6.4-qt515.patch | 22 ------
.../nextcloud-client/nextcloud-client-2.5.2.ebuild | 91 ----------------------
.../nextcloud-client/nextcloud-client-2.6.4.ebuild | 91 ----------------------
4 files changed, 206 deletions(-)
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 37ed90a4acb..e7b73d5b526 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,5 +1,3 @@
-DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
-DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1
DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6
DIST nextcloud-client-3.0.1.tar.gz 19059671 BLAKE2B c85f9d1627a75745c5a450b1c59799716c17dad3ba5ce277a62bebbbb80f243236cb4d529ff8ce4af9371c7ab1948b5a86dfaa3fbeb9de8681c9df0f397044f7 SHA512 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
deleted file mode 100644
index 5c59cf46bf3..00000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0fe7a657386b107ae498e7749ff4c20116b9752a Mon Sep 17 00:00:00 2001
-From: Michael Schuster <michael@schuster.ms>
-Date: Sun, 7 Jun 2020 02:43:45 +0200
-Subject: [PATCH] Fix Qt 5.15.0 build error (missing include)
-
-Signed-off-by: Michael Schuster <michael@schuster.ms>
----
- src/libsync/networkjobs.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
-index fd63b9606..bb5786ea9 100644
---- a/src/libsync/networkjobs.cpp
-+++ b/src/libsync/networkjobs.cpp
-@@ -31,6 +31,7 @@
- #include <QJsonDocument>
- #include <QJsonObject>
- #include <QPainter>
-+#include <QPainterPath>
-
- #include "networkjobs.h"
- #include "account.h"
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
deleted file mode 100644
index 64e9dfd92b7..00000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
+++ /dev/null
@@ -1,91 +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
- )"
-
-RESTRICT="!test? ( test )"
-
-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.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
deleted file mode 100644
index c8d32ee60c1..00000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils 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 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
- )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch
- "${FILESDIR}"/${P}-qt515.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() {
- xdg_pkg_postinst
- if ! use doc ; then
- elog "Documentation and man pages not installed"
- elog "Enable doc USE-flag to generate them"
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2021-07-07 19:16 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2021-07-07 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 9e05aaacaa41045d2f7b08efe61899a0087e699b
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 7 19:16:04 2021 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Jul 7 19:16:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e05aaac
net-misc/nextcloud-client: make qtwebengine optional
This large dependency is not needed for most current authentications
Also updated many build options (doc, dolphin and nautilus integration)
Closes: https://bugs.gentoo.org/800863
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../files/nextcloud-client-3.2.3-webengine.patch | 419 +++++++++++++++++++++
net-misc/nextcloud-client/metadata.xml | 1 +
.../nextcloud-client-3.2.3-r1.ebuild | 94 +++++
3 files changed, 514 insertions(+)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
new file mode 100644
index 00000000000..8152528f30c
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
@@ -0,0 +1,419 @@
+diff -Naur desktop-3.2.3.orig/src/CMakeLists.txt desktop-3.2.3/src/CMakeLists.txt
+--- desktop-3.2.3.orig/src/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200
+@@ -4,7 +4,13 @@
+
+ set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
+
+-find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
++find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
++find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine)
++
++if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
++ add_compile_definitions(WITH_WEBENGINE=1)
++endif()
++
+ get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
+ message(STATUS "Using Qt ${Qt5Core_VERSION} (${QT_QMAKE_EXECUTABLE})")
+
+diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt
+--- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200
+@@ -128,12 +128,17 @@
+ wizard/owncloudwizardcommon.cpp
+ wizard/owncloudwizard.cpp
+ wizard/owncloudwizardresultpage.cpp
+- wizard/webviewpage.cpp
+- wizard/webview.cpp
+ wizard/slideshow.cpp
+ wizard/welcomepage.cpp
+ wizard/linklabel.cpp
+-)
++ )
++
++if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
++ list(APPEND client_SRCS
++ wizard/webviewpage.cpp
++ wizard/webview.cpp
++ )
++endif()
+
+ IF(BUILD_UPDATER)
+ set(updater_SRCS
+@@ -339,9 +344,12 @@
+ Qt5::Qml
+ Qt5::Quick
+ Qt5::QuickControls2
+- Qt5::WebEngineWidgets
+ ${synclib_NAME}
+-)
++ )
++
++if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
++ target_link_libraries(nextcloudCore PUBLIC Qt5::WebEngineWidgets)
++endif()
+
+ set_target_properties(nextcloudCore
+ PROPERTIES
+diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp desktop-3.2.3/src/gui/creds/webflowcredentials.cpp
+--- desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/creds/webflowcredentials.cpp 2021-07-07 20:26:40.618839464 +0200
+@@ -16,7 +16,9 @@
+ #include "account.h"
+ #include "configfile.h"
+ #include "theme.h"
++#ifdef WITH_WEBENGINE
+ #include "wizard/webview.h"
++#endif // WITH_WEBENGINE
+ #include "webflowcredentialsdialog.h"
+
+ using namespace QKeychain;
+@@ -144,8 +146,12 @@
+ // Do a DetermineAuthTypeJob to make sure that the server is still using Flow2
+ auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
+ connect(job, &DetermineAuthTypeJob::authType, [this](DetermineAuthTypeJob::AuthType type) {
+- // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
++ // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
++#ifdef WITH_WEBENGINE
+ bool useFlow2 = (type != DetermineAuthTypeJob::WebViewFlow);
++#else // WITH_WEBENGINE
++ bool useFlow2 = true;
++#endif // WITH_WEBENGINE
+
+ _askDialog = new WebFlowCredentialsDialog(_account, useFlow2);
+
+diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp
+--- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp 2021-07-07 20:26:40.618839464 +0200
+@@ -8,16 +8,20 @@
+ #include "owncloudgui.h"
+ #include "headerbanner.h"
+ #include "wizard/owncloudwizardcommon.h"
++#ifdef WITH_WEBENGINE
+ #include "wizard/webview.h"
++#endif // WITH_WEBENGINE
+ #include "wizard/flow2authwidget.h"
+
+ namespace OCC {
+
+ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent)
+- : QDialog(parent),
+- _useFlow2(useFlow2),
+- _flow2AuthWidget(nullptr),
+- _webView(nullptr)
++ : QDialog(parent)
++ , _useFlow2(useFlow2)
++ , _flow2AuthWidget(nullptr)
++#ifdef WITH_WEBENGINE
++ , _webView(nullptr)
++#endif // WITH_WEBENGINE
+ {
+ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+@@ -49,10 +53,12 @@
+
+ _flow2AuthWidget->startAuth(account);
+ } else {
++#ifdef WITH_WEBENGINE
+ _webView = new WebView();
+ _containerLayout->addWidget(_webView);
+
+ connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched);
++#endif // WITH_WEBENGINE
+ }
+
+ auto app = static_cast<Application *>(qApp);
+@@ -73,12 +79,14 @@
+ void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) {
+ Q_UNUSED(e)
+
++#ifdef WITH_WEBENGINE
+ if (_webView) {
+ // Force calling WebView::~WebView() earlier so that _profile and _page are
+ // deleted in the correct order.
+ _webView->deleteLater();
+ _webView = nullptr;
+ }
++#endif // WITH_WEBENGINE
+
+ if (_flow2AuthWidget) {
+ _flow2AuthWidget->resetAuth();
+@@ -89,9 +97,14 @@
+ emit onClose();
+ }
+
+-void WebFlowCredentialsDialog::setUrl(const QUrl &url) {
++void WebFlowCredentialsDialog::setUrl(const QUrl &url)
++{
++#ifdef WITH_WEBENGINE
+ if (_webView)
+ _webView->setUrl(url);
++#else // WITH_WEBENGINE
++ Q_UNUSED(url);
++#endif // WITH_WEBENGINE
+ }
+
+ void WebFlowCredentialsDialog::setInfo(const QString &msg) {
+diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h
+--- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h 2021-07-07 20:26:40.618839464 +0200
+@@ -13,7 +13,9 @@
+ namespace OCC {
+
+ class HeaderBanner;
++#ifdef WITH_WEBENGINE
+ class WebView;
++#endif // WITH_WEBENGINE
+ class Flow2AuthWidget;
+
+ class WebFlowCredentialsDialog : public QDialog
+@@ -50,7 +52,9 @@
+ bool _useFlow2;
+
+ Flow2AuthWidget *_flow2AuthWidget;
++#ifdef WITH_WEBENGINE
+ WebView *_webView;
++#endif // WITH_WEBENGINE
+
+ QLabel *_errorLabel;
+ QLabel *_infoLabel;
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp 2021-07-07 20:26:40.619839465 +0200
+@@ -119,21 +119,6 @@
+ _ui.leUrl->setPalette(leUrlPalette);
+ }
+
+-#ifdef WITH_PROVIDERS
+-void OwncloudSetupPage::slotLogin()
+-{
+- _ocWizard->setRegistration(false);
+-}
+-void OwncloudSetupPage::slotGotoProviderList()
+-{
+- _ocWizard->setRegistration(true);
+- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
+- _authTypeKnown = true;
+- _checking = false;
+- emit completeChanged();
+-}
+-#endif
+-
+ // slot hit from textChanged of the url entry field.
+ void OwncloudSetupPage::slotUrlChanged(const QString &url)
+ {
+@@ -228,8 +213,10 @@
+ return WizardCommon::Page_OAuthCreds;
+ case DetermineAuthTypeJob::LoginFlowV2:
+ return WizardCommon::Page_Flow2AuthCreds;
++#ifdef WITH_WEBENGINE
+ case DetermineAuthTypeJob::WebViewFlow:
+ return WizardCommon::Page_WebView;
++#endif // WITH_WEBENGINE
+ }
+ return WizardCommon::Page_HttpCreds;
+ }
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h 2021-07-07 20:26:40.617839462 +0200
+@@ -67,10 +67,6 @@
+ protected slots:
+ void slotUrlChanged(const QString &);
+ void slotUrlEditFinished();
+-#ifdef WITH_PROVIDERS
+- void slotLogin();
+- void slotGotoProviderList();
+-#endif
+
+ void setupCustomization();
+
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h 2021-07-07 20:26:40.619839465 +0200
+@@ -46,7 +46,9 @@
+ Page_HttpCreds,
+ Page_OAuthCreds,
+ Page_Flow2AuthCreds,
++#ifdef WITH_WEBENGINE
+ Page_WebView,
++#endif // WITH_WEBENGINE
+ Page_AdvancedSetup,
+ Page_Result
+ };
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp 2021-07-07 20:26:40.619839465 +0200
+@@ -54,7 +54,11 @@
+ , _flow2CredsPage(new Flow2AuthCredsPage)
+ , _advancedSetupPage(new OwncloudAdvancedSetupPage(this))
+ , _resultPage(new OwncloudWizardResultPage)
++#ifdef WITH_WEBENGINE
+ , _webViewPage(new WebViewPage(this))
++#else // WITH_WEBENGINE
++ , _webViewPage(nullptr)
++#endif // WITH_WEBENGINE
+ {
+ setObjectName("owncloudWizard");
+
+@@ -66,7 +70,9 @@
+ setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
+ setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
+ setPage(WizardCommon::Page_Result, _resultPage);
++#ifdef WITH_WEBENGINE
+ setPage(WizardCommon::Page_WebView, _webViewPage);
++#endif // WITH_WEBENGINE
+
+ connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
+
+@@ -78,7 +84,9 @@
+ connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+ connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+ connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
++#ifdef WITH_WEBENGINE
+ connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
++#endif // WITH_WEBENGINE
+ connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
+ this, &OwncloudWizard::createLocalAndRemoteFolders);
+ connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
+@@ -230,9 +238,11 @@
+ _flow2CredsPage->setConnected();
+ break;
+
++#ifdef WITH_WEBENGINE
+ case WizardCommon::Page_WebView:
+ _webViewPage->setConnected();
+ break;
++#endif // WITH_WEBENGINE
+
+ case WizardCommon::Page_AdvancedSetup:
+ _advancedSetupPage->directoriesCreated();
+@@ -256,8 +266,10 @@
+ _credentialsPage = _browserCredsPage;
+ } else if (type == DetermineAuthTypeJob::LoginFlowV2) {
+ _credentialsPage = _flow2CredsPage;
++#ifdef WITH_WEBENGINE
+ } else if (type == DetermineAuthTypeJob::WebViewFlow) {
+ _credentialsPage = _webViewPage;
++#endif // WITH_WEBENGINE
+ } else { // try Basic auth even for "Unknown"
+ _credentialsPage = _httpCredsPage;
+ }
+@@ -281,7 +293,11 @@
+ button(QWizard::NextButton)->setHidden(true);
+ // Need to set it from here, otherwise it has no effect
+ _welcomePage->setLoginButtonDefault();
+- } else if (id == WizardCommon::Page_WebView || id == WizardCommon::Page_Flow2AuthCreds) {
++ } else if (
++#ifdef WITH_WEBENGINE
++ id == WizardCommon::Page_WebView ||
++#endif // WITH_WEBENGINE
++ id == WizardCommon::Page_Flow2AuthCreds) {
+ setButtonLayout({ QWizard::Stretch, QWizard::BackButton });
+ } else if (id == WizardCommon::Page_AdvancedSetup) {
+ setButtonLayout({ QWizard::Stretch, QWizard::CustomButton1, QWizard::BackButton, QWizard::NextButton });
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h desktop-3.2.3/src/gui/wizard/owncloudwizard.h
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudwizard.h 2021-07-07 20:26:40.619839465 +0200
+@@ -128,7 +128,7 @@
+ OwncloudAdvancedSetupPage *_advancedSetupPage;
+ OwncloudWizardResultPage *_resultPage;
+ AbstractCredentialsWizardPage *_credentialsPage = nullptr;
+- WebViewPage *_webViewPage;
++ WebViewPage *_webViewPage = nullptr;
+
+ QStringList _setupLog;
+
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp desktop-3.2.3/src/gui/wizard/welcomepage.cpp
+--- desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/welcomepage.cpp 2021-07-07 20:26:40.620839467 +0200
+@@ -13,6 +13,7 @@
+ */
+
+ #include "welcomepage.h"
++#include "guiutility.h"
+ #include "theme.h"
+ #include "wizard/owncloudwizard.h"
+ #include "wizard/slideshow.h"
+@@ -94,11 +95,18 @@
+
+ void WelcomePage::setupCreateAccountButton()
+ {
++#ifdef WITH_WEBENGINE
+ connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
+ _ocWizard->setRegistration(true);
+ _nextPage = WizardCommon::Page_WebView;
+ _ocWizard->next();
+ });
++#else // WITH_WEBENGINE
++ connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
++ _ocWizard->setRegistration(true);
++ Utility::openBrowser(QStringLiteral("https://nextcloud.com/register"));
++ });
++#endif // WITH_WEBENGINE
+ }
+
+ void WelcomePage::setupHostYourOwnServerLabel()
+diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.cpp desktop-3.2.3/src/libsync/networkjobs.cpp
+--- desktop-3.2.3.orig/src/libsync/networkjobs.cpp 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/libsync/networkjobs.cpp 2021-07-07 20:26:40.619839465 +0200
+@@ -30,6 +30,7 @@
+ #include <QCoreApplication>
+ #include <QJsonDocument>
+ #include <QJsonObject>
++#include <qloggingcategory.h>
+ #ifndef TOKEN_AUTH_ONLY
+ #include <QPainter>
+ #include <QPainterPath>
+@@ -958,7 +959,11 @@
+ auto flow = gs.toObject().value("desktoplogin");
+ if (flow != QJsonValue::Undefined) {
+ if (flow.toInt() == 1) {
++#ifdef WITH_WEBENGINE
+ _resultOldFlow = WebViewFlow;
++#else // WITH_WEBENGINE
++ qCWarning(lcDetermineAuthTypeJob) << "Server does only support flow1, but this client was compiled without support for flow1";
++#endif // WITH_WEBENGINE
+ }
+ }
+ }
+@@ -985,20 +990,24 @@
+
+ auto result = _resultPropfind;
+
++#ifdef WITH_WEBENGINE
+ // WebViewFlow > OAuth > Basic
+ if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
+ result = WebViewFlow;
+ }
++#endif // WITH_WEBENGINE
+
+ // LoginFlowV2 > WebViewFlow > OAuth > Basic
+ if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
+ result = LoginFlowV2;
+ }
+
++#ifdef WITH_WEBENGINE
+ // If we determined that we need the webview flow (GS for example) then we switch to that
+ if (_resultOldFlow == WebViewFlow) {
+ result = WebViewFlow;
+ }
++#endif // WITH_WEBENGINE
+
+ // If we determined that a simple get gave us an authentication required error
+ // then the server enforces basic auth and we got no choice but to use this
+diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.h desktop-3.2.3/src/libsync/networkjobs.h
+--- desktop-3.2.3.orig/src/libsync/networkjobs.h 2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/libsync/networkjobs.h 2021-07-07 20:26:40.619839465 +0200
+@@ -444,9 +444,11 @@
+ public:
+ enum AuthType {
+ NoAuthType, // used only before we got a chance to probe the server
++#ifdef WITH_WEBENGINE
++ WebViewFlow,
++#endif // WITH_WEBENGINE
+ Basic, // also the catch-all fallback for backwards compatibility reasons
+ OAuth,
+- WebViewFlow,
+ LoginFlowV2
+ };
+ Q_ENUM(AuthType)
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index ea54627aff8..588dc46f7e6 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
+ <flag name="webengine">Enable old Flow1 login using <pkg>dev-qt/qtwebengine</pkg></flag>
</use>
<upstream>
<remote-id type="github">nextcloud/desktop</remote-id>
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild
new file mode 100644
index 00000000000..f5a364e114c
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild
@@ -0,0 +1,94 @@
+# 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
+ 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
+ "${FILESDIR}"/${P}-webengine.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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2021-09-28 21:21 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2021-09-28 21:21 UTC (permalink / raw
To: gentoo-commits
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@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.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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2023-02-08 4:22 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-02-08 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 992d3f3d35158fa1deaf87e928a030bcd1be6905
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 04:22:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 04:22:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=992d3f3d
net-misc/nextcloud-client: don't redefine _FORTIFY_SOURCE
Fixes build on hardened. We already set F_S w/ level 2 as minimum even on non-
hardened.
Closes: https://bugs.gentoo.org/890072
Signed-off-by: Sam James <sam <AT> gentoo.org>
...d-client-3.6.6-no-redefine-fortify-source.patch | 31 ++++++++++++++++++++++
.../nextcloud-client/nextcloud-client-3.6.6.ebuild | 4 +++
2 files changed, 35 insertions(+)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch
new file mode 100644
index 000000000000..2c3d23c1ff35
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch
@@ -0,0 +1,31 @@
+Gentoo's toolchain always sets F_S (level 2 at minimum) by default.
+
+https://bugs.gentoo.org/890072
+--- a/cmake/modules/DefineCompilerFlags.cmake
++++ b/cmake/modules/DefineCompilerFlags.cmake
+@@ -47,12 +47,6 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+
+ if (CMAKE_BUILD_TYPE)
+ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+- if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND (NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]"))
+- check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
+- if (WITH_FORTIFY_SOURCE)
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+- endif (WITH_FORTIFY_SOURCE)
+- endif()
+ endif()
+ endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -31,10 +31,6 @@ if(NOT MSVC)
+ endif()
+
+ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+- if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND ((NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]") AND (NOT ${CMAKE_CXX_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]")))
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+- endif()
+
+ if (CMAKE_CXX_COMPILER MATCHES "Clang")
+ # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
index 8496954d4804..943bb9b77797 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
@@ -61,6 +61,10 @@ BDEPEND="
dolphin? ( kde-frameworks/extra-cmake-modules )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+)
+
src_prepare() {
# Keep tests in ${T}
sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
@ 2024-07-16 20:27 Bernard Cafarelli
0 siblings, 0 replies; 11+ messages in thread
From: Bernard Cafarelli @ 2024-07-16 20:27 UTC (permalink / raw
To: gentoo-commits
commit: b0c1e8c85956eeb654ebdaddfd399ab0f24cf17b
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 20:25:43 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 20:27:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c1e8c8
net-misc/nextcloud-client: fix build if kio:6 is installed
Closes: https://bugs.gentoo.org/930943
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../nextcloud-client-3.13.2-fix_build_kf6.patch | 38 ++++++++++++++++++++++
.../nextcloud-client-3.13.2.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
new file mode 100644
index 000000000000..3898dcbcef3c
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
@@ -0,0 +1,38 @@
+From b2974a504f67e4af9c376927d1d0fd3c99de3255 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 1 Apr 2024 20:00:25 +0200
+Subject: [PATCH] Fix build with KF6
+
+Set QT_NO_CREATE_VERSIONLESS_FUNCTIONS, otherwise Qt5 and Qt6 conflict
+
+Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
+---
+ CMakeLists.txt | 1 +
+ src/gui/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 687733588813..07d3266cb9dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ endif()
+
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED 17)
++set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON)
+
+ include(FeatureSummary)
+
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 6e4acf203d19..37f459db4384 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -58,7 +58,7 @@ set(client_UI_SRCS
+ if(QUICK_COMPILER)
+ qtquick_compiler_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
+ else()
+- qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
++ qt5_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
+ endif()
+
+ set(client_SRCS
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
index 7abc2102345e..151c9bcdf637 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
@@ -67,6 +67,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+ "${FILESDIR}"/${PN}-3.13.2-fix_build_kf6.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-07-16 20:27 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-13 12:43 [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2024-07-16 20:27 Bernard Cafarelli
2023-02-08 4:22 Sam James
2021-09-28 21:21 Bernard Cafarelli
2021-07-07 19:16 Bernard Cafarelli
2020-09-02 20:56 Bernard Cafarelli
2020-06-10 11:58 Bernard Cafarelli
2019-03-20 15:50 Miroslav Šulc
2018-08-20 18:13 Bernard Cafarelli
2017-07-18 16:42 Bernard Cafarelli
2016-11-29 13:32 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox