[gentoo-commits] repo/gentoo:master commit in: net-misc/owncloud-client/files/, net-misc/owncloud-client/
commit: e43c26c2c1fcb27bb345e6eae13e02b8efba28e5
Author: Bernard Cafarelli gentoo org>
AuthorDate: Thu Jul 21 20:40:19 2022 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Jul 21 20:51:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e43c26c2
net-misc/owncloud-client: fix compilation with gcc 12
Closes: https://bugs.gentoo.org/843398
Signed-off-by: Bernard Cafarelli gentoo.org>
.../files/owncloud-client-2.10.1.7389-gcc12.patch | 93 ++
.../owncloud-client-2.10.1.7389.ebuild | 2 +
2 files changed, 95 insertions(+)
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
new file mode 100644
index ..31981415f887
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
@@ -0,0 +1,93 @@
+From c1e3bb8457d77619a1c31217716789e76fd06500 Mon Sep 17 00:00:00 2001
+From: Hannah von Reth
+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 createPlaceholder(const
SyncFileItem ) = 0;
++OC_REQUIRED_RESULT virtual Result createPlaceholder(const
SyncFileItem ) = 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
) = 0;
++OC_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem
) = 0;
+
+ /// Determine whether the file at the given absolute path is a dehydrated
placeholder.
+-virtual OC_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString
) = 0;
++OC_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString
) = 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 ,
PinState state) = 0;
++OC_REQUIRED_RESULT virtual bool setPinState(const QString ,
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(const QString
) = 0;
++OC_REQUIRED_RESULT virtual Optional pinState(const QString
) = 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
) = 0;
++OC_REQUIRED_RESULT virtual AvailabilityResult availability(const QString
) = 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
updateMetadata(const
[gentoo-commits] repo/gentoo:master commit in: net-misc/owncloud-client/files/, net-misc/owncloud-client/
commit: a79c7b477d94a23a6fba2962eecc4d73900c343d
Author: Bernard Cafarelli gentoo org>
AuthorDate: Wed Feb 3 19:00:47 2021 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Wed Feb 3 19:03:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79c7b47
net-misc/owncloud-client: drop old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernard Cafarelli gentoo.org>
net-misc/owncloud-client/Manifest | 1 -
.../files/owncloud-client-2.6.3.14058-qt515.patch | 11 ---
.../owncloud-client-2.6.3.14058.ebuild | 85 --
3 files changed, 97 deletions(-)
diff --git a/net-misc/owncloud-client/Manifest
b/net-misc/owncloud-client/Manifest
index cd546488431..105a380bedc 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,3 +1,2 @@
DIST ownCloud-2.7.4.2934.tar.xz 14151708 BLAKE2B
ad6f3d827a2fdcead6fdc2514696e8fbdb75b2d365c9a09602b95b24c669695e3693167f5da305e27e6fb2266f106b50c578def1d1518730926a10f640defbd9
SHA512
7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6
DIST ownCloud-2.7.5.3180.tar.xz 14154036 BLAKE2B
ebee57568b917c1c7dec8f41f172caf53d0bfe4eae5e24ec5c9adbf656bf667769b0ed341a13a899ff6a04cd779d92b145736dce5a4e72055d306b2f08e0a902
SHA512
9e788341c45753eb2d2c62d252cf453259474689fd7d498147e0f4548a9038bd44bdca1539f9617d383853f8f9ca2f24c575667fb96e2a1a4ceec30195d257c2
-DIST owncloudclient-2.6.3.14058.tar.xz 21246672 BLAKE2B
15b75c2162d22c22827a057242d783e739837f618c2f65be3edce6b2678aaa13505fd14c4e4088374c240537a999d9aff7758ccb93993e0cbdebb886f735311c
SHA512
e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3
diff --git
a/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
b/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
deleted file mode 100644
index 57dd20938fc..000
--- a/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp
owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp
owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp
2020-06-12 14:35:04.0 +0200
-+++ owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp 2020-06-13
11:18:28.822842347 +0200
-@@ -31,6 +31,7 @@
- #include
- #ifndef TOKEN_AUTH_ONLY
- #include
-+#include
- #endif
-
- #include "networkjobs.h"
diff --git a/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
b/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
deleted file mode 100644
index d7df80536b7..000
--- a/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
+++ /dev/null
@@ -1,85 +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="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/;
-SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz;
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=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 )"
-
-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}/${P/-}
-
-PATCHES=( "${FILESDIR}"/${P}-qt515.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)
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/owncloud-client/files/, net-misc/owncloud-client/
commit: fdbacd407eb7482df2e52d2232b97daae639d8bc
Author: Bernard Cafarelli gentoo org>
AuthorDate: Sat Jun 13 09:22:42 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sat Jun 13 09:30:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbacd40
net-misc/owncloud-client: 2.6.3 bump
Also fixes compilation with qt 5.15
Closes: https://bugs.gentoo.org/726172
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli gentoo.org>
net-misc/owncloud-client/Manifest | 1 +
.../files/owncloud-client-2.6.3.14058-qt515.patch | 11 +++
.../owncloud-client-2.6.3.14058.ebuild | 85 ++
3 files changed, 97 insertions(+)
diff --git a/net-misc/owncloud-client/Manifest
b/net-misc/owncloud-client/Manifest
index 61d9950b6d1..998b413cbb0 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,2 +1,3 @@
DIST owncloudclient-2.6.0.13018.tar.xz 17311396 BLAKE2B
b0c76b2fea51ca9e71f918ada2b99ce20b9b62494c41608e804c4ca0c8aafe59897fea31d28bed1ec61feefca4b4b6e783c6fa777ea56524e7c18d1a460ab954
SHA512
b8eb9dc6f9c061a74fee3f31926a3fb7f5093277955fe327d1169c84f929d1e1ad8da472a7098c1c10399f395c6bfc3b2684cf4c85cddc5e45b733abfb8e4046
DIST owncloudclient-2.6.1.13407.tar.xz 17317284 BLAKE2B
b88bfc987aca036b6269e094cee5b91a3516db7b899df4cfde4961ba6eb3bb24329de103b154f0a21e5778997659cfb9b53be2f88affe03251aa9c747276d517
SHA512
40e0b607ac6cd5437682cd40e125404472c5ad63520e1dde19729760c0b7612451b3a34ede74e988d8fd09a6fae7d17a3dd6c5b0cfa6563dab7245e5f67c52bf
+DIST owncloudclient-2.6.3.14058.tar.xz 21246672 BLAKE2B
15b75c2162d22c22827a057242d783e739837f618c2f65be3edce6b2678aaa13505fd14c4e4088374c240537a999d9aff7758ccb93993e0cbdebb886f735311c
SHA512
e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3
diff --git
a/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
b/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
new file mode 100644
index 000..57dd20938fc
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
@@ -0,0 +1,11 @@
+diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp
owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp
+--- owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp
2020-06-12 14:35:04.0 +0200
owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp 2020-06-13
11:18:28.822842347 +0200
+@@ -31,6 +31,7 @@
+ #include
+ #ifndef TOKEN_AUTH_ONLY
+ #include
++#include
+ #endif
+
+ #include "networkjobs.h"
diff --git a/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
b/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
new file mode 100644
index 000..d7df80536b7
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/;
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz;
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin gnome-keyring nautilus test"
+
+COMMON_DEPEND=">=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 )"
+
+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}/${P/-}
+
+PATCHES=( "${FILESDIR}"/${P}-qt515.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
