commit: accd3ad95689e243369f6af89a9ed3b72a492dc9
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 21:48:28 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 22:39:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=accd3ad9
net-misc/owncloud-client: drop 2.10.0.6519, 2.10.1.7389
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
net-misc/owncloud-client/Manifest | 2 -
.../files/owncloud-client-2.10.1.7389-gcc12.patch | 93 ----------------------
.../owncloud-client-2.10.0.6519.ebuild | 67 ----------------
.../owncloud-client-2.10.1.7389.ebuild | 69 ----------------
4 files changed, 231 deletions(-)
diff --git a/net-misc/owncloud-client/Manifest
b/net-misc/owncloud-client/Manifest
index e135d858a8ec..dea42b6bbff6 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,3 +1 @@
-DIST ownCloud-2.10.0.6519.tar.xz 5791912 BLAKE2B
3cf02ef89a6af249ab8f9d1b0a4cc899fbb11f49bf47ffb0ce042442da984d8dbf49619cf3344cf1837f1f3437e70f6e6d302f4e4c67a7df5f547368be4252ba
SHA512
ab1e8aebefa049a73c436325b3b6e1d03e9a74f93ab6e090adbc71ccdd1cf56297898f004b12312ebba82158f5c2e299d9d0b13c14e291b855dcf267bac490f2
-DIST ownCloud-2.10.1.7389.tar.xz 5598044 BLAKE2B
8558a8a7b7bd4b8a0685b703f0882d6b5619c4902217d40feb4cf5587555b9a85363c7f61834e4c85a84789142fca8c73910fce66544f491ec5968818c816605
SHA512
2a0893d48786b88f8210966a2b6b48f5bdada82818d4115e68ecc6c0c926ba62bc74df03c4ab35eb271aef2f3a43b36b1a6a115585efe3739fd4a6164f9c45a1
DIST ownCloud-2.11.1.8438.tar.xz 5655380 BLAKE2B
da34adafabfc8c2b0bbfdff99a81b56f2d2639b5168b2165a847a6d5a4efe4e86578984c0f0c20564d0978aab18bb1a62330539bdd137f608a5cfc3ff8d84cf0
SHA512
fe38471f62e7233a7ba04f7fd2c7c7231957e6927c39d0bcf3f6f77fd6cbb1223618bbf6a8cc5fa15de10a35c7f07f2f5df0e49acbc2af5fe9333cda2eb41c92
diff --git
a/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
b/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
deleted file mode 100644
index 31981415f887..000000000000
--- a/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From c1e3bb8457d77619a1c31217716789e76fd06500 Mon Sep 17 00:00:00 2001
-From: Hannah von Reth <hannah.vonr...@owncloud.com>
-Date: Fri, 20 May 2022 11:19:59 +0200
-Subject: [PATCH] Fix build with gcc12
-
----
- src/common/asserts.h | 2 +-
- src/common/vfs.h | 16 ++++++++--------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/common/asserts.h b/src/common/asserts.h
-index 9f43c532a6d..5fa4b4da3e5 100644
---- a/src/common/asserts.h
-+++ b/src/common/asserts.h
-@@ -44,7 +44,7 @@
- } else {
\
- }
-
--inline OC_REQUIRED_RESULT bool __OC_ENSURE(bool condition, const char *cond,
const char *file, int line, const char *info)
-+OC_REQUIRED_RESULT inline bool __OC_ENSURE(bool condition, const char *cond,
const char *file, int line, const char *info)
- {
- if (Q_UNLIKELY(!condition)) {
- OC_ASSERT_MSG("ENSURE: \"%s\" in file %s, line %d %s", cond, file,
line, info);
-diff --git a/src/common/vfs.h b/src/common/vfs.h
-index 983c999106c..da04d7ed97d 100644
---- a/src/common/vfs.h
-+++ b/src/common/vfs.h
-@@ -162,17 +162,17 @@ class OCSYNC_EXPORT Vfs : public QObject
- virtual bool isHydrating() const = 0;
-
- /// Create a new dehydrated placeholder. Called from PropagateDownload.
-- virtual OC_REQUIRED_RESULT Result<void, QString> createPlaceholder(const
SyncFileItem &item) = 0;
-+ OC_REQUIRED_RESULT virtual Result<void, QString> createPlaceholder(const
SyncFileItem &item) = 0;
-
- /** Discovery hook: even unchanged files may need UPDATE_METADATA.
- *
- * For instance cfapi vfs wants local hydrated non-placeholder files to
- * become hydrated placeholder files.
- */
-- virtual OC_REQUIRED_RESULT bool needsMetadataUpdate(const SyncFileItem
&item) = 0;
-+ OC_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem
&item) = 0;
-
- /// Determine whether the file at the given absolute path is a dehydrated
placeholder.
-- virtual OC_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString
&filePath) = 0;
-+ OC_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString
&filePath) = 0;
-
- /** Similar to isDehydratedPlaceholder() but used from sync discovery.
- *
-@@ -181,7 +181,7 @@ class OCSYNC_EXPORT Vfs : public QObject
- *
- * Returning true means that type was fully determined.
- */
-- virtual OC_REQUIRED_RESULT bool statTypeVirtualFile(csync_file_stat_t
*stat, void *stat_data) = 0;
-+ OC_REQUIRED_RESULT virtual bool statTypeVirtualFile(csync_file_stat_t
*stat, void *stat_data) = 0;
-
- /** Sets the pin state for the item at a path.
- *
-@@ -192,7 +192,7 @@ class OCSYNC_EXPORT Vfs : public QObject
- *
- * relFilePath is relative to the sync folder. Can be "" for root folder.
- */
-- virtual OC_REQUIRED_RESULT bool setPinState(const QString &relFilePath,
PinState state) = 0;
-+ OC_REQUIRED_RESULT virtual bool setPinState(const QString &relFilePath,
PinState state) = 0;
-
- /** Returns the pin state of an item at a path.
- *
-@@ -203,7 +203,7 @@ class OCSYNC_EXPORT Vfs : public QObject
- *
- * Returns none on retrieval error.
- */
-- virtual OC_REQUIRED_RESULT Optional<PinState> pinState(const QString
&relFilePath) = 0;
-+ OC_REQUIRED_RESULT virtual Optional<PinState> pinState(const QString
&relFilePath) = 0;
-
- /** Returns availability status of an item at a path.
- *
-@@ -212,7 +212,7 @@ class OCSYNC_EXPORT Vfs : public QObject
- *
- * folderPath is relative to the sync folder. Can be "" for root folder.
- */
-- virtual OC_REQUIRED_RESULT AvailabilityResult availability(const QString
&folderPath) = 0;
-+ OC_REQUIRED_RESULT virtual AvailabilityResult availability(const QString
&folderPath) = 0;
-
- public slots:
- /** Update in-sync state based on SyncFileStatusTracker signal.
-@@ -240,7 +240,7 @@ public slots:
- * If the remote metadata changes, the local placeholder's metadata
should possibly
- * change as well.
- */
-- virtual OC_REQUIRED_RESULT Result<ConvertToPlaceholderResult, QString>
updateMetadata(const SyncFileItem &item, const QString &filePath, const QString
&replacesFile) = 0;
-+ OC_REQUIRED_RESULT virtual Result<ConvertToPlaceholderResult, QString>
updateMetadata(const SyncFileItem &item, const QString &filePath, const QString
&replacesFile) = 0;
-
- /** Setup the plugin for the folder.
- *
diff --git a/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
b/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
deleted file mode 100644
index ef87f857f8d3..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/";
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz";
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dolphin gnome-keyring nautilus test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[gnome-keyring?,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 )"
-
-DEPEND="${RDEPEND}
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules"
-
-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=(
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
deleted file mode 100644
index c9f1b379477d..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/";
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz";
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dolphin gnome-keyring nautilus test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[gnome-keyring?,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 )"
-
-DEPEND="${RDEPEND}
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc12.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_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
