The package rpms/ktorrent.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ktorrent.git/commit/?id=72e21d389....
Change:
+%ifarch %{qt5_qtwebengine_arches}
Thanks.
Full change:
============
commit 72e21d389a26d09d6f0c78bdbd13510aadbcd19a
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Jul 2 09:46:56 2020 -0500
webengine not available on all archs
diff --git a/ktorrent.spec b/ktorrent.spec
index 913df8c..db6f1fe 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -64,7 +64,9 @@ BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(KF5Syndication)
BuildRequires: cmake(LibKWorkspace)
+%ifarch %{qt5_qtwebengine_arches}
BuildRequires: cmake(Qt5WebEngineWidgets)
+%endif
BuildRequires: cmake(KF5Torrent) >= 2.%{minmic}
BuildRequires: kf5-libktorrent-devel >= 2.%{minmic}
commit d674bbbb92ec6e69e842dd8e839ed6deabe3947a
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Jul 2 07:49:30 2020 -0500
BR: Qt5WebEngineWidgets
diff --git a/ktorrent.spec b/ktorrent.spec
index 64ccb24..913df8c 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -4,7 +4,7 @@
Name: ktorrent
Version: 5.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A BitTorrent program
License: GPLv2+
@@ -60,11 +60,12 @@ BuildRequires: cmake(KF5ItemViews)
BuildRequires: cmake(KF5Kross)
BuildRequires: cmake(KF5Plotting)
BuildRequires: cmake(KF5TextWidgets)
-BuildRequires: cmake(KF5WebKit)
BuildRequires: cmake(KF5Syndication)
BuildRequires: cmake(LibKWorkspace)
+BuildRequires: cmake(Qt5WebEngineWidgets)
+
BuildRequires: cmake(KF5Torrent) >= 2.%{minmic}
BuildRequires: kf5-libktorrent-devel >= 2.%{minmic}
@@ -141,6 +142,9 @@ desktop-file-validate
%{buildroot}%{_kf5_datadir}/applications/org.kde.ktorrent.
%changelog
+* Thu Jul 02 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.2.0-2
+- BR: Qt5WebEngineWidgets
+
* Wed Jul 01 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.2.0-1
- 5.2.0
commit eb4ab084982a27e49ec92e54cc86db92317dc38d
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jul 1 08:55:47 2020 -0500
5.2.0
diff --git a/.gitignore b/.gitignore
index 9f7a24e..dbacb41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/ktorrent-5.1.1.tar.xz
/ktorrent-5.1.2.tar.xz
+/ktorrent-5.2.0.tar.xz
diff --git a/ktorrent.spec b/ktorrent.spec
index cc76033..64ccb24 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -3,8 +3,8 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
Name: ktorrent
-Version: 5.1.2
-Release: 2%{?dist}
+Version: 5.2.0
+Release: 1%{?dist}
Summary: A BitTorrent program
License: GPLv2+
@@ -141,6 +141,9 @@ desktop-file-validate
%{buildroot}%{_kf5_datadir}/applications/org.kde.ktorrent.
%changelog
+* Wed Jul 01 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.2.0-1
+- 5.2.0
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index a1ecb9d..991b1e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ktorrent-5.1.2.tar.xz) =
b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621
+SHA512 (ktorrent-5.2.0.tar.xz) =
141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387
commit 5d45650caf32a0fc1d082211c1df97021674de58
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 29 07:59:08 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ktorrent.spec b/ktorrent.spec
index 9e25694..cc76033 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -4,7 +4,7 @@
Name: ktorrent
Version: 5.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A BitTorrent program
License: GPLv2+
@@ -141,6 +141,9 @@ desktop-file-validate
%{buildroot}%{_kf5_datadir}/applications/org.kde.ktorrent.
%changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Wed Sep 11 2019 Rex Dieter <rdieter(a)fedoraproject.org> 5.1.2-1
- 5.1.2
commit 10201c44dfe7ceac40e51792520b3ac77257cbd3
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Sep 11 09:37:37 2019 -0500
5.1.2
diff --git a/.gitignore b/.gitignore
index 76b7046..9f7a24e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/ktorrent-5.1.1.tar.xz
+/ktorrent-5.1.2.tar.xz
diff --git a/0002-Fix-memory-corruption-in-ScanFolder-plugin.patch
b/0002-Fix-memory-corruption-in-ScanFolder-plugin.patch
deleted file mode 100644
index 10602c6..0000000
--- a/0002-Fix-memory-corruption-in-ScanFolder-plugin.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 2d73d5f25a1a364a2115fb1d3262377f7fdf99cd Mon Sep 17 00:00:00 2001
-From: Valeriy Malov <jazzvoid(a)gmail.com>
-Date: Wed, 5 Sep 2018 20:43:51 +0300
-Subject: [PATCH 2/4] Fix memory corruption in ScanFolder plugin
-
-Summary:
-Reasoning behind this patch is kinda dubious because I don't fully understand what
happens, but it shouldn't make the matters worse either
-
-Seems like deletion of KDirWatch objects from scan_folder in ~ScanThread(), after said
QThread has been stopped, causes memory corruption.
-
-Preemptively deleting scan_folder contents before we stop the thread resolves this.
-
-also mark booleans shared across main thread and KDirWatch callbacks as atomic
-
-Test Plan:
-Without this patch unloading ScanFolder plugin sometimes crashes ktorrent, including
unloading on exit
-Doesn't happen anymore with this patch
-
-Reviewers: stikonas
-
-Reviewed By: stikonas
-
-Differential Revision:
https://phabricator.kde.org/D15265
----
- plugins/scanfolder/scanthread.cpp | 5 +++++
- plugins/scanfolder/scanthread.h | 5 +++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/scanfolder/scanthread.cpp b/plugins/scanfolder/scanthread.cpp
-index 0e62768c..d7b13e0a 100644
---- a/plugins/scanfolder/scanthread.cpp
-+++ b/plugins/scanfolder/scanthread.cpp
-@@ -156,6 +156,11 @@ namespace kt
- void ScanThread::stop()
- {
- stop_requested = true;
-+
-+ // XXX seems like deleting KDirWatch object(s) created in scan_folders
-+ // in destructor of this QThread after it has been stopped
-+ // causes memory corruption, so we delete them early
-+ scan_folders.clear();
- exit();
- wait();
- }
-diff --git a/plugins/scanfolder/scanthread.h b/plugins/scanfolder/scanthread.h
-index d13ca089..fb214a4e 100644
---- a/plugins/scanfolder/scanthread.h
-+++ b/plugins/scanfolder/scanthread.h
-@@ -29,6 +29,7 @@
- #include <util/ptrmap.h>
- #include "scanfolder.h"
-
-+#include <atomic>
-
- class QDir;
-
-@@ -88,8 +89,8 @@ namespace kt
- private:
- QMutex mutex;
- QStringList folders;
-- bool stop_requested;
-- bool recursive;
-+ std::atomic<bool> stop_requested;
-+ std::atomic<bool> recursive;
- bt::PtrMap<QString, ScanFolder> scan_folders;
- };
-
---
-2.17.2
-
diff --git a/ktorrent.spec b/ktorrent.spec
index 319d85f..9e25694 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -3,8 +3,8 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
Name: ktorrent
-Version: 5.1.1
-Release: 6%{?dist}
+Version: 5.1.2
+Release: 1%{?dist}
Summary: A BitTorrent program
License: GPLv2+
@@ -20,7 +20,6 @@ URL:
https://www.kde.org/applications/internet/ktorrent/
Source0:
http://download.kde.org/%{stable}/ktorrent/%{version}/%{name}-%{version}....
## upstream patches
-Patch2: 0002-Fix-memory-corruption-in-ScanFolder-plugin.patch
## upstreamable patches
@@ -142,6 +141,9 @@ desktop-file-validate
%{buildroot}%{_kf5_datadir}/applications/org.kde.ktorrent.
%changelog
+* Wed Sep 11 2019 Rex Dieter <rdieter(a)fedoraproject.org> 5.1.2-1
+- 5.1.2
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.1-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index c4e62ca..a1ecb9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ktorrent-5.1.1.tar.xz) =
bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
+SHA512 (ktorrent-5.1.2.tar.xz) =
b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621