gentoo auto-resync : 06:07:2024 - 08:06:15

3 files changed, 2 insertions, 34 deletions

diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index b2272c8f00b1..749a7e66fb6d 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,6 +1,5 @@
-AUX kdenlive-24.05.1-timeline-freeze.patch 1111 BLAKE2B d4ea9168eec0f113f9f0339d95201e867ea7eb9579315ec3917906410f38e24af8d5412c74be02071417a35f1b2f7800a5fe747dfe78c37e6a830f6b73fb19ee SHA512 47eaa6a884738c5a706b7ef367869094a0285461b3556eb15f94a917a5954fb0ece2ace5c43a5addb9b00eaea4b3e67e46df2a6947b04863fd9161734549237d
 DIST kdenlive-23.08.5.tar.xz 12728000 BLAKE2B f2232bd5b3fbb36183018346f65eb2f590ea560a9aa10a198274709f34b0ff178922df9ab5b00d9577fc1a864b03ebd232f6e1a45bba7c9862ef9b60937d72a7 SHA512 1fbd11e1f6a42c668b9d22d74179b25fdd6e66dd903a5779f16ecad324850beaa5492859d9edb566ac94b162499ffdf4eb30be28adb1027d50de54369c96f2ac
-DIST kdenlive-24.05.1.tar.xz 12908936 BLAKE2B 74979a6f974f41520c808ba7ce6130b999e28b8987bd9e77346401fe85b3a5ca75bab4e302f66bf27be278509d05448eb716c4866d0b9d86c06aed70599db483 SHA512 79f7f357ee83e7e00e1e795d67acd91406a6e2fb66e572f3381745faf6b59a29e43e3ff107b40db4fbd6dfc8e6da99b94a6cff8872c72ccb27118f071177e42a
+DIST kdenlive-24.05.2.tar.xz 12910996 BLAKE2B 45baa60b2cf5f83c46a3fc6dc4a2c3b39d19f25a14646440e91df33fa523d31f5346cc00b795327aa93d5e965c5e567897fe43431dde349208161eedf755772a SHA512 8ad98b77e7f8e5759039f4f4b702f1295be8ea6386a98696c5c9d28c10b904b62ddcf8d7154f8ad3e561eb7a2322a5138ec2c9df4b127c4a633d9b52693c50b2
 EBUILD kdenlive-23.08.5.ebuild 2344 BLAKE2B 77b1c8ecd91a28ffd014632f2ba99c49e0fa749275eb4430fa74902cd00c6c1fdb306ff8380459265eec5f2768f741cdee1986918a474ed39b8e4771837982b1 SHA512 ca6e50bb7c53ad1685c2e3e38a4d3031d3a265577f62f16f2aec06962351ef04b0ac9e5129e26347c84a32f0254dbb6510fb3e7bf9683de930f86d1d30f821f5
-EBUILD kdenlive-24.05.1-r1.ebuild 2220 BLAKE2B 0d9c1a5659534100854b7cc7f4b47c33f7f001d1af1690fded3e0a05e1d11c814490d9842eba64e9fc5dea12721271f8442eca1150fc9c3705e48bc59668566a SHA512 d92ed2e4af81e1b5dfd80811f30f7f8fee00a09e47546c36bab37ea4958251535f13bd2bc13e1007012e650eacc66ef8314e23b50014ecb9a1fe75363d1cd84c
+EBUILD kdenlive-24.05.2.ebuild 2149 BLAKE2B a15e6fd8fc62067bd60017b6a95e4d2c58865c49002f038ff7e848c8fbe10071437398ae6f33f330d9a5c4721527ab18a310dc6c54cc4c6228e824cfac5ecef8 SHA512 1a2997fbd48c78cec5058203f9cd0ae694e8cd3b8c6e92d0820558eb241e6e92aedfd89f791a3fa2d7bbc35effc7726741265932afcf03f1c847232d1ee4a27a
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/kdenlive/files/kdenlive-24.05.1-timeline-freeze.patch b/kde-apps/kdenlive/files/kdenlive-24.05.1-timeline-freeze.patch
deleted file mode 100644
index fd896dd19dd9..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-24.05.1-timeline-freeze.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8be0e826471332bb739344ebe1859298c46e9e0f Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Tue, 18 Jun 2024 10:50:24 +0200
-Subject: [PATCH] Fix timeline duration not correctly updated, resulting in
- audio/video freeze in timeline after 5 min Related to #1885
-
----
- src/timeline2/model/timelinemodel.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/timeline2/model/timelinemodel.cpp b/src/timeline2/model/timelinemodel.cpp
-index 0bb8cb89ae..342324c77f 100644
---- a/src/timeline2/model/timelinemodel.cpp
-+++ b/src/timeline2/model/timelinemodel.cpp
-@@ -5111,9 +5111,9 @@ void TimelineModel::updateDuration()
-     }
-     if (duration != current) {
-         // update black track length
--        m_blackClip->block();
-+        m_blackClip->lock();
-         m_blackClip->set("out", duration + TimelineModel::seekDuration);
--        m_blackClip->unblock();
-+        m_blackClip->unlock();
-         Q_EMIT durationUpdated(m_uuid);
-         if (m_masterStack) {
-             Q_EMIT m_masterStack->dataChanged(QModelIndex(), QModelIndex(), {});
--- 
-GitLab
-
diff --git a/kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild b/kde-apps/kdenlive/kdenlive-24.05.2.ebuild
index eacf3a5e85cd..8371172a35a7 100644
--- a/kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild
+++ b/kde-apps/kdenlive/kdenlive-24.05.2.ebuild
@@ -62,8 +62,6 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}/${P}-timeline-freeze.patch" ) # KDE-bug 488689
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package v4l LibV4L2)