3 files changed, 2 insertions, 49 deletions
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 932ee9efd0ad..d0238e3a8be5 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,8 +1,7 @@
 AUX kdenlive-19.08.3-qt-5.14-1.patch 7106 BLAKE2B c2c3e00603ec83fd98af7a4350f08e422e4e6e5f086119d30637608d10229f2cecde5789af060596bd51991c1f28bd88aafad945c1278266800fcf0282cc1194 SHA512 9076bd07c418be6376d83e223010bb0e64e159a0fb8aef9e58479811158ca851fedd9cd30c42086bfa13edb230dbcf61ad9bd1be4e6570c76d0abab92a685d9a
 AUX kdenlive-19.08.3-qt-5.14-2.patch 1038 BLAKE2B 2e45cbd32a81fd70eb6794ad4aeaf87f9f5dddce820237b00a4aceaea9a02c212cdd7727c414788c23baeebd52231e8fdbbb80a79b85ae89bbc93e0606bcf816 SHA512 0abd4615c6eaff86836220cb39b2785a40436324c701a253a4d1cc8f6aad37a7d11a3c75338f34a1f50cab68a869230af5c74d6d00e8827f77b4016cc877986e
-AUX kdenlive-19.12.1-qt-5.14-new-project-crash.patch 1967 BLAKE2B 553c2e0ea181da2c058feb7007c9450047bf49e6baa8232c780b6bafdc199c60630163c16be14090c9633acc7cf67f205079c222b4c8b753a5d5919f2c121b65 SHA512 2ec593f769cff4619d96a336e4d1ce6f12a39eb5b57584302f9b3ed67b7da189622fc44c74bd10f351b1fdf0c71df08a3c32ea7a47c376618dce545ecdb0c046
 DIST kdenlive-19.08.3.tar.xz 12418064 BLAKE2B bf0765e28f374a21371a9bf3fbc6059d6ac81118d79b0978fd10a3c4959f1343d06773ae278cb6e9a3890c1c1daff79f0a709cebd186b1bc586318e5384ca5da SHA512 187651de7542b86f9332c3eb79e2a27b664f0b4ead19fbb6035963b7be41a2a53b65de37e8c18c50aa794145cfaa2ebaf1b9f721d379c014da9c5f9475048738
-DIST kdenlive-19.12.1.tar.xz 11415280 BLAKE2B 24851efecd12daf18cc0d2767591ed114a2cfd1f190bc41985a17cce24c5d7a4df35d2eeb38a549ed4158c65a30454817cce16b84e6db972e4451bf1e12a82c4 SHA512 2255dc5e75d75fcde800a9c25e3a3d30ed4022eaa749e9275b3a2ac8604861cb9b3e5f20eeb895e7b16fa3740538c008211e25c54357d40d1de0ed37d17001d3
+DIST kdenlive-19.12.2.tar.xz 11441780 BLAKE2B c91d456a2b2ce61962cfd2d02d87d73410b763649084c541bbe24bb0585f5e38f0c262a1baf08322f6d35eb0838f8651b7a5cc1da3de72212341d26803c8020b SHA512 c6773d09aa9af2284ff93ee0bb163dd553b15891c0262350975902b076d5465ad664181e009023aac179dea84b837bc4c7dcd5b4b3914e9f99c624e89e962ba4
 EBUILD kdenlive-19.08.3.ebuild 2602 BLAKE2B ea19aa28bf618a45c937223a494eb038766a64364146cc741798a16f96bc865981e74e27dead848a9414c3cdfa53b3c0d81dd991a2c168fd46041bb014673bc9 SHA512 679b492f6a3480a72e902c8f59533e8b507d415695c92943ade61470c12029afbb10ac18021444731910cd90332e3d245fc57516874bc8bf39770d2f5fb7f904
-EBUILD kdenlive-19.12.1-r1.ebuild 2594 BLAKE2B e90517253c0d5a37a49e87ed66bbb57ddedd2214b3fa4249b0b792324c1b9452ce6197471ab7d05d2da421249f179575f69051abcd9db68e92d18b6d3c33a2cf SHA512 6e92e3a6174479f18e4d98a73b2f547dc5aa8cc3c37727b29edfd45893b1251d4091eb336f55d6c2140040d7469cf4cdd482d38d3aaacc2a145c697a87a7863d
+EBUILD kdenlive-19.12.2.ebuild 2516 BLAKE2B 915879a5fcc889b1b579946bbff976cdd48e9f97890afccb781d3829f8273a1ea18e6aa6156060f260d6f433584ddfbe1748c39563eda7aa78d5b3ac5cc78cf1 SHA512 43bf287318543d4464b6c88860e4b23484ced00f131d7c9e414db4e588e547460be90f79c6c483159347312b0cd2ce65626a77bcc56e87d413d3be92f1018313
 MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb
diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch b/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch
deleted file mode 100644
index aa4d4914b441..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b20a7307368932b35ec0d7cdebb68a710cbbf8ba Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Wed, 15 Jan 2020 11:30:20 +0100
-Subject: Fix crash on new project with Qt 5.14 Related to #494
-
----
- src/timeline2/view/timelinewidget.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/timeline2/view/timelinewidget.cpp b/src/timeline2/view/timelinewidget.cpp
-index 452e4d7..f8bf6ed 100644
---- a/src/timeline2/view/timelinewidget.cpp
-+++ b/src/timeline2/view/timelinewidget.cpp
-@@ -65,6 +65,7 @@ TimelineWidget::TimelineWidget(QWidget *parent)
-     // Build transition model for context menu
-     m_transitionModel = TransitionTreeModel::construct(true, this);
-     m_transitionProxyModel = std::make_unique<TransitionFilter>(this);
-+    m_sortModel = std::make_unique<QSortFilterProxyModel>(this);
-     static_cast<TransitionFilter *>(m_transitionProxyModel.get())->setFilterType(true, TransitionType::Favorites);
-     m_transitionProxyModel->setSourceModel(m_transitionModel.get());
-     m_transitionProxyModel->setSortRole(AssetTreeModel::NameRole);
-@@ -89,6 +90,8 @@ TimelineWidget::TimelineWidget(QWidget *parent)
- 
- TimelineWidget::~TimelineWidget()
- {
-+    rootContext()->setContextProperty("multitrack", 0);
-+    rootContext()->setContextProperty("timeline", 0);
-     delete m_proxy;
- }
- 
-@@ -113,11 +116,9 @@ const QStringList TimelineWidget::sortedItems(const QStringList &items, bool isT
- 
- void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, MonitorProxy *proxy)
- {
--    m_sortModel = std::make_unique<QSortFilterProxyModel>(this);
-     m_sortModel->setSourceModel(model.get());
-     m_sortModel->setSortRole(TimelineItemModel::SortRole);
-     m_sortModel->sort(0, Qt::DescendingOrder);
--
-     m_proxy->setModel(model);
-     rootContext()->setContextProperty("multitrack", m_sortModel.get());
-     rootContext()->setContextProperty("controller", model.get());
--- 
-cgit v1.1
diff --git a/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild b/kde-apps/kdenlive/kdenlive-19.12.2.ebuild
index 8fa5e2c222b8..0df5c81ab67a 100644
--- a/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.12.2.ebuild
@@ -66,8 +66,6 @@ RDEPEND="${DEPEND}
 	virtual/ffmpeg[encode,sdl,X]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14-new-project-crash.patch ) # bug #703524
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package freesound Qt5WebKitWidgets)