Accepting request 1132570 from home:Vogtinator:branches:KDE:Extra
No Qt 6 variant yet, not that important yet anyway.
- Update to version 5.1.0:
* Support for building against Qt 6 and KF6
* Minimum versions of dependencies got raised:
CMake 3.16, Qt 5.15, KIO 5.96.0
* Minor bug fixes and optimizations
* Don't include the password in the generated VFS path
* Mounting admin: is blocked now
- Drop patch, now upstream:
* 0001-Initialize-m_lastChildrenRefresh-to-be-really-in-the.patch
OBS-URL: https://build.opensuse.org/request/show/1132570
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kio-fuse?expand=0&rev=17
This commit is contained in:
Christophe Marin
Git OBS Bridge
parent
5f8ca4dc2f
commit
79d1ed4c52
@ -1,28 +0,0 @@
|
||||
From 1a8862daee5c3ef502d7cf04e451180c15e8f3a3 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Thu, 3 Jun 2021 15:50:40 +0200
|
||||
Subject: [PATCH] Initialize m_lastChildrenRefresh to be really in the past
|
||||
|
||||
steady_clock's epoch is the system start and such a default constructed
|
||||
steady_clock::time_point might actually not be older than ATTR_TIMEOUT.
|
||||
By setting it to min() explicitly, it should be sufficiently behind.
|
||||
---
|
||||
kiofusenode.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kiofusenode.h b/kiofusenode.h
|
||||
index 357b094..28a920a 100644
|
||||
--- a/kiofusenode.h
|
||||
+++ b/kiofusenode.h
|
||||
@@ -76,7 +76,7 @@ public:
|
||||
// be emitted on finish.
|
||||
bool m_childrenRequested = false;
|
||||
// Stores the last time a node's children were refreshed via KIO::listDir.
|
||||
- std::chrono::steady_clock::time_point m_lastChildrenRefresh;
|
||||
+ std::chrono::steady_clock::time_point m_lastChildrenRefresh = decltype(m_lastChildrenRefresh)::min();
|
||||
// Returns true if a node is due for a readdir refresh, false otherwise.
|
||||
bool haveChildrenTimedOut() { return m_lastChildrenRefresh < g_timeoutEpoch || (std::chrono::steady_clock::now() - m_lastChildrenRefresh) >= ATTR_TIMEOUT; }
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:66679a8bf68fe60e19f31449f4110d4cf822915b3d245af3c0cd0056081466dd
|
||||
size 47596
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEIew/110ms56CC+b70nwsGvIdi60FAmBXVNwACgkQ0nwsGvId
|
||||
i63wfQ//QSKe+GUX+nR3ygq65oKoDgmx82+92BbB1/EZY3EhpsWnSGXWwhGdiyBK
|
||||
3lb9ZTs8qVt2vkcvaREyob1VIHdvkMRL7BzuX9ox9Xte8NhxlxFFICpXYyk2fh+u
|
||||
tJs82usVqyBE4O8o+xNymRVs7kuBRMjNnYmzhsUv9HLgSVKPb42l67bPJbHAC6JM
|
||||
1MRdZifEuH8ed9CrvBcPXMfWhQR4EHAqUvHt9J8cJxlQieX8aQhixGao5HH24s7F
|
||||
uWHaiU4NioJdM/eOdBaXIBJDvWq4duTDHjHSwQl+KF56xYWQGqLVNtWVVBCyE111
|
||||
GHnUM6ywD4Fsizi9FkwB0dmL2jH1SzWiCuaLn0Ejf6Vp4D9y1+bs9gAp7pT/w0IG
|
||||
dqGhY7wcyY2DUZMCljf85A1igYFUMrh2I4xdQL40ThEgnuj4Rd+YCrc4KiEDEqF2
|
||||
DwroQ4tjEhlYTXRIP+aL5DyTYi7JBYqC22lAF6D7IEFxnnVL+A97IfHkK3O9ZzDX
|
||||
0vc0FgB6H3+G6Ntsbg8QpQ8gwXDkqkiBB4G5u98rNSZyIMZ9Dda+qTHke5croj7h
|
||||
hWOsVUmlSyjEXYoIaCpXzHyjyIPHlk2WEG8L3QCDx9hfyTdzdYtrS6rzxp32+XRn
|
||||
GZSPra6rZvfVipPV0r1yqwOQ3PY76EB0DaApWv7MslTD9J8+RO8=
|
||||
=wPOw
|
||||
-----END PGP SIGNATURE-----
|
||||
3
kio-fuse-5.1.0.tar.xz
Normal file
3
kio-fuse-5.1.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7d104581227d5a19b424b33f4168d181556b1015d6df2218e01a88d64449e94b
|
||||
size 48820
|
||||
16
kio-fuse-5.1.0.tar.xz.sig
Normal file
16
kio-fuse-5.1.0.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEIew/110ms56CC+b70nwsGvIdi60FAmV0zX8ACgkQ0nwsGvId
|
||||
i60AThAArOWtjsU8C6dPgV0cQLRjC8Qumibbvm4m2vzxExtQzomTvt4n8O4t0n9u
|
||||
VdBNKV0aZoX0wn3bm7kyy5h/SUIL5bnLpaQfbu6aDO0giqPvZWlLANFRg4o+f0iz
|
||||
XLzXvTMMmlVHcyhQa2itdz2blHNxTnxiqjW5zSySzXStrx7KEeS2zMLviioQ8BQH
|
||||
br967Fp17Dll+s466w2+lDNI2L8Qw7cvRalOO+0JcT5TprU3hW/+w8dP0mT7fyjs
|
||||
NKMU/xF/Ae+lhA7FJ3u9cUzCIaqXNYM9rxlcJqbXGDrNto3adztMYLGIY7/wxAZT
|
||||
gTdQYiN1Y3HX1wKI6uZp/ivVt8+B4GYIyzTpdAvXVRSFQW7Di6ew/VRcQEAX1T17
|
||||
X6Fqycuh/ey9kFP6PvEJbl7iIoddeJzY3QZp3qyj0P/XL1lWqovDdnTwkqjhC4W2
|
||||
ryI6E3/2MAlEvkzX+Eomul3nYASg71xlchUnpM/i7OaA4EJZwdy7c5tKY33/dPru
|
||||
LQxLM7WOznt04iwwcFKSed9j4Xqk3HPcs99AL4jR5x0s9z8pz8kzbH8TG34WYYYw
|
||||
O98Jb6rL+P52k+ez6fGKwkNlbhMzd4G5HjYKRb/jgHTEDCKAuHZPEnUJCTj8/Rs3
|
||||
qR0yToeuznktmXivwCWOyi7uRWNSSE6InhlR6vW/99YeMIIaavQ=
|
||||
=2qJl
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 9 22:14:57 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.1.0:
|
||||
* Support for building against Qt 6 and KF6
|
||||
* Minimum versions of dependencies got raised:
|
||||
CMake 3.16, Qt 5.15, KIO 5.96.0
|
||||
* Minor bug fixes and optimizations
|
||||
* Don't include the password in the generated VFS path
|
||||
* Mounting admin: is blocked now
|
||||
- Drop patch, now upstream:
|
||||
* 0001-Initialize-m_lastChildrenRefresh-to-be-really-in-the.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 11 00:56:22 UTC 2023 - Simon Lees <sflees@suse.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kio-fuse
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,25 +16,23 @@
|
||||
#
|
||||
|
||||
|
||||
%bcond_without lang
|
||||
%bcond_without released
|
||||
Name: kio-fuse
|
||||
Version: 5.0.1
|
||||
Version: 5.1.0
|
||||
Release: 0
|
||||
Summary: Access KIO over the regular filesystem
|
||||
License: GPL-3.0-or-later
|
||||
Group: System/GUI/KDE
|
||||
URL: https://www.kde.org
|
||||
Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
|
||||
%if %{with lang}
|
||||
Source1: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz.sig
|
||||
Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
|
||||
%if %{with released}
|
||||
Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
|
||||
Source2: kio-fuse.keyring
|
||||
%endif
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-Initialize-m_lastChildrenRefresh-to-be-really-in-the.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: cmake(KF5KIO) >= 5.66.0
|
||||
BuildRequires: cmake(Qt5DBus) >= 5.12.0
|
||||
BuildRequires: cmake(KF5KIO) >= 5.96.0
|
||||
BuildRequires: cmake(Qt5DBus) >= 5.15.0
|
||||
BuildRequires: cmake(Qt5Test)
|
||||
BuildRequires: pkgconfig(fuse3)
|
||||
%if 0%{?suse_version} > 1599
|
||||
@ -78,8 +76,7 @@ echo -e '#!/bin/sh\numount $2' >> fusermount3
|
||||
chmod a+x fusermount3
|
||||
export PATH=$PWD:$PATH
|
||||
|
||||
export CTEST_OUTPUT_ON_FAILURE=1
|
||||
make %{?_smp_mflags} -C build VERBOSE=1 test
|
||||
%ctest
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user