gentoo resync : 25.08.2020

5 files changed, 10 insertions, 144 deletions

diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 5191684ca7f2..b15039b3b734 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,7 +1,5 @@
-AUX kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch 2628 BLAKE2B 96cdf43294b453f8b10a7aef762735070ba8f89e7a8626b2e614d91ca77e4d7f27b0ddb104b8be81ceb26505c9f8863a32e550a8c1fb59dd28826e860ae1518f SHA512 85cdb2b3aff8e65910ae81583ca22715f482f08e446ecafedf885a3522ca47cd8ef3ef118d4169c069e06ece2e9b97953dce6839e78b18cfe509a47df5b4029e
-AUX kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch 2753 BLAKE2B c3a34521a8314d5d4fa5a9b2e68d6fb9081cd2878eb91b06a9411bcaca77824c1d0d7a0232eb92f6e2a6790717ee8bbcdc4860f930c8a30015b96c62b3afcf60 SHA512 13e4f938e47c605aca526d2578ea83cbc00c4fe9cade5e8a63a56b35044915327eb5cf5878589d7d67aaced815d364fc4541a413e5a99276d9f031595a5a60fa
-DIST kdenlive-19.12.3.tar.xz 11393740 BLAKE2B a41d52a028204ad689b947aa0964afa5edb521f5560c2c6702df0a66d85ff9e3bbd31fcd2339b6586cdb2559d9041b6551bbbaf65a1cccde554f4bf2c1ac4492 SHA512 f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad
-DIST kdenlive-20.04.2.tar.xz 11289748 BLAKE2B 6979274f8f703416f09db2e1746bc9a2ec9cfaf813ea26d0834a90601147c2276d1b7708031a19178f2719efc57aa8987863bcf41340911b1bb17638d879d913 SHA512 f7bfc35121f5a27b01ab7c16b0911f90b758eb113bd55ca22783a5142d3df92493b7170c6bf31352aa44d4ca8d8a7fd12491d75f44a137551dfc531c4c1a5d10
-EBUILD kdenlive-19.12.3-r3.ebuild 2652 BLAKE2B 2372eacc2b027e5f91048c952d125458bf49434fcfbd12add35bda23f82509dc7a79318d4f0860c616ee4f2538c40e7ed070389b2274febd8f63424b337e9edc SHA512 191e8463e8c6f970677246fd73dcdcd2aed543e6496e89f8e2664565efbe0de85001e7fda0965abd2b98361b02a8fce17d967dd529a0807bb54a5f4c761b35b6
-EBUILD kdenlive-20.04.2.ebuild 2611 BLAKE2B e0c531be066eefb9cb767db32e03c9061f9bc2da67df1a71984b9e68fe9a038546cfbba94b8291037a4c1ea00f8508473740631586c7ec210b26901c6d771fa2 SHA512 9aaa14ff6764bf452edf7eed9a44358f33b35385b1a211f119f9f5b26d54d8bb248872ada26c95ff95cb983d7ceb983ce00dcbd3120421cb26504f3440d0fcc6
+DIST kdenlive-20.04.3.tar.xz 11291332 BLAKE2B b25b330a3920a90e9e27ae797f5c7f57148a6a4a33a70a9a574ac43f1107139bf0dda8baa31af477aac39a88895d42acbd03f734958bb0d46e81b034d795bf59 SHA512 5a1b37440b212bd7a613fe1de16d8c42771f5bd0dedd80a2bccbab84517adb1a34f7649069b6a686f84114967b42c70278df9447107bfff361ca1a93bb366689
+DIST kdenlive-20.08.0.tar.xz 11367912 BLAKE2B 3a3daa163c05764e8e34718937da7ff16af9eb06de3f26f2d415e37257a27fcfee63cbcf336a5e70f15fa553b77d6cd4e16f52e96054e40c14c84b8d4bbb5779 SHA512 46a87cd4ea264b52f6d8a8c87366a9979884cc133615654216641b22f59bfb232145e0c12bb7feaa01076b07c4c5d973c634bcef2c14111ecfa8962c53901d8d
+EBUILD kdenlive-20.04.3.ebuild 2608 BLAKE2B 84a43b4f7a5adb33af4f911c42da5008e5a0b814c6f55059f8b57d85a5f488dfad5856cd978e449df5fd0eb0283ea42266c8d0a4df905225bf50fed362747230 SHA512 e7e18e4212783fa89220fdd51ac5b5ea214e661aabb04a94dd0bd98a8e4a653d77779320b4bdd894ce6c76f82a355d402631bb614cba853555b56258bde30d1f
+EBUILD kdenlive-20.08.0.ebuild 2611 BLAKE2B d43a5b45ae844d0ee8805618144f9c0e6740384405366079598a7d1e8a906d27705b7f524059ee36fc52d767fa4762c6c1fbbd1f821f5cd457de5e6e8584bf73 SHA512 358d3ab2d16b98c0a461b3aaf9b2fdc5bb8fa12ce843f9f37fbaa5ae5071a3e3c373dc030dc4abcf61f102714af21824e7820ba13e9f8d22ae6d7f0947cfd967
 MISC metadata.xml 486 BLAKE2B fb7e3b5c16a68c4993cadc893d28438138d81e74ed899c0e56230e7284913af8237269483eefdebd77e6a4880023d6d5e1d200debc1e916761d7156fddc59c41 SHA512 b110a1cec041bcf91c7a9028ac31292ff41c0a70a0f1c5462918671d300c9642ae0e04b4360f03dba344d5c4c7e67f8c4fd95f169f38f30a3628433c5ec1379f
diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch b/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch
deleted file mode 100644
index 421452dc6488..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 78f8880a3d9c1e37548b5146d9f61f05ab7032ea Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Fri, 31 Jan 2020 13:26:25 +0100
-Subject: Fix crash on exit
-
----
- src/effects/effectlist/view/effectlistwidget.cpp             | 1 -
- src/timeline2/view/timelinetabs.cpp                          | 6 ++++++
- src/timeline2/view/timelinetabs.hpp                          | 2 +-
- src/transitions/transitionlist/view/transitionlistwidget.cpp | 1 -
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/effects/effectlist/view/effectlistwidget.cpp b/src/effects/effectlist/view/effectlistwidget.cpp
-index c734e15..66b9a94 100644
---- a/src/effects/effectlist/view/effectlistwidget.cpp
-+++ b/src/effects/effectlist/view/effectlistwidget.cpp
-@@ -60,7 +60,6 @@ void EffectListWidget::updateFavorite(const QModelIndex &index)
- 
- EffectListWidget::~EffectListWidget()
- {
--    delete m_proxy;
-     qDebug() << " - - -Deleting effect list widget";
- }
- 
-diff --git a/src/timeline2/view/timelinetabs.cpp b/src/timeline2/view/timelinetabs.cpp
-index 74bb10b..9a72729 100644
---- a/src/timeline2/view/timelinetabs.cpp
-+++ b/src/timeline2/view/timelinetabs.cpp
-@@ -57,6 +57,12 @@ TimelineTabs::TimelineTabs(QWidget *parent)
-     connect(pCore->monitorManager()->projectMonitor(), &Monitor::addEffect, m_mainTimeline->controller(), &TimelineController::addEffectToCurrentClip);
- }
- 
-+TimelineTabs::~TimelineTabs()
-+{
-+    // clear source
-+    m_mainTimeline->setSource(QUrl());
-+}
-+
- TimelineWidget *TimelineTabs::getMainTimeline() const
- {
-     return m_mainTimeline;
-diff --git a/src/timeline2/view/timelinetabs.hpp b/src/timeline2/view/timelinetabs.hpp
-index aba3e23..977af13 100644
---- a/src/timeline2/view/timelinetabs.hpp
-+++ b/src/timeline2/view/timelinetabs.hpp
-@@ -49,7 +49,7 @@ class TimelineTabs : public QTabWidget
- public:
-     /* Construct the tabs as well as the widget for the main timeline */
-     TimelineTabs(QWidget *parent);
--
-+    virtual ~TimelineTabs();
-     /* @brief Returns a pointer to the main timeline */
-     TimelineWidget *getMainTimeline() const;
- 
-diff --git a/src/transitions/transitionlist/view/transitionlistwidget.cpp b/src/transitions/transitionlist/view/transitionlistwidget.cpp
-index 309de55..afd122f 100644
---- a/src/transitions/transitionlist/view/transitionlistwidget.cpp
-+++ b/src/transitions/transitionlist/view/transitionlistwidget.cpp
-@@ -53,7 +53,6 @@ TransitionListWidget::TransitionListWidget(QWidget *parent)
- 
- TransitionListWidget::~TransitionListWidget()
- {
--    delete m_proxy;
-     qDebug() << " - - -Deleting transition list widget";
- }
- 
--- 
-cgit v1.1
-
diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch b/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch
deleted file mode 100644
index 3af886f68ddb..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 936307aceca3619f2b1d1e2f12d21ee4e8608cd6 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Thu, 5 Mar 2020 08:13:14 +0100
-Subject: [PATCH] Fix crash on close. Fixes #571
-
----
- src/core.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/core.cpp b/src/core.cpp
-index 7c590a3f2..a48e1602f 100644
---- a/src/core.cpp
-+++ b/src/core.cpp
-@@ -120,11 +120,11 @@ void Core::build(bool isAppImage, const QString &MltPath)
- 
- void Core::initGUI(const QUrl &Url, const QString &clipsToLoad)
- {
--    m_guiConstructed = true;
-     m_profile = KdenliveSettings::default_profile();
-     m_currentProfile = m_profile;
-     profileChanged();
-     m_mainWindow = new MainWindow();
-+    m_guiConstructed = true;
-     connect(this, &Core::showConfigDialog, m_mainWindow, &MainWindow::slotPreferences);
- 
-     // load default profile and ask user to select one if not found.
-@@ -658,13 +658,13 @@ std::shared_ptr<ProjectItemModel> Core::projectItemModel()
- 
- void Core::invalidateRange(QSize range)
- {
--    if (!m_mainWindow || m_mainWindow->getCurrentTimeline()->loading) return;
-+    if (!m_guiConstructed || m_mainWindow->getCurrentTimeline()->loading) return;
-     m_mainWindow->getCurrentTimeline()->controller()->invalidateZone(range.width(), range.height());
- }
- 
- void Core::invalidateItem(ObjectId itemId)
- {
--    if (!m_mainWindow || !m_mainWindow->getCurrentTimeline() || m_mainWindow->getCurrentTimeline()->loading) return;
-+    if (!m_guiConstructed || !m_mainWindow->getCurrentTimeline() || m_mainWindow->getCurrentTimeline()->loading) return;
-     switch (itemId.first) {
-     case ObjectType::TimelineClip:
-     case ObjectType::TimelineComposition:
-@@ -692,14 +692,14 @@ double Core::getClipSpeed(int id) const
- 
- void Core::updateItemKeyframes(ObjectId id)
- {
--    if (id.first == ObjectType::TimelineClip && m_mainWindow) {
-+    if (id.first == ObjectType::TimelineClip && m_guiConstructed) {
-         m_mainWindow->getCurrentTimeline()->controller()->updateClip(id.second, {TimelineModel::KeyframesRole});
-     }
- }
- 
- void Core::updateItemModel(ObjectId id, const QString &service)
- {
--    if (m_mainWindow && id.first == ObjectType::TimelineClip && !m_mainWindow->getCurrentTimeline()->loading && service.startsWith(QLatin1String("fade"))) {
-+    if (m_guiConstructed && id.first == ObjectType::TimelineClip && !m_mainWindow->getCurrentTimeline()->loading && service.startsWith(QLatin1String("fade"))) {
-         bool startFade = service == QLatin1String("fadein") || service == QLatin1String("fade_from_black");
-         m_mainWindow->getCurrentTimeline()->controller()->updateClip(id.second, {startFade ? TimelineModel::FadeInRole : TimelineModel::FadeOutRole});
-     }
--- 
-2.25.1
-
diff --git a/kde-apps/kdenlive/kdenlive-19.12.3-r3.ebuild b/kde-apps/kdenlive/kdenlive-20.04.3.ebuild
index 8b13e84160db..d4d1e73d637f 100644
--- a/kde-apps/kdenlive/kdenlive-19.12.3-r3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.04.3.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -29,6 +29,7 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
 	>=dev-qt/qtmultimedia-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
@@ -55,7 +56,7 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
+	>=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
 	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
@@ -68,8 +69,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test" # segfaults, bug 684132
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14-crash-on-close-{1,2}.patch ) # 20.04 branch
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package freesound Qt5WebKitWidgets)
diff --git a/kde-apps/kdenlive/kdenlive-20.04.2.ebuild b/kde-apps/kdenlive/kdenlive-20.08.0.ebuild
index 09675077f07b..a6391c225930 100644
--- a/kde-apps/kdenlive/kdenlive-20.04.2.ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.08.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org