gentoo resync : 25.11.2020

5 files changed, 226 insertions, 102 deletions

diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 05e867fa844f..cc83d1652244 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,4 @@
-DIST kdenlive-20.04.3.tar.xz 11291332 BLAKE2B b25b330a3920a90e9e27ae797f5c7f57148a6a4a33a70a9a574ac43f1107139bf0dda8baa31af477aac39a88895d42acbd03f734958bb0d46e81b034d795bf59 SHA512 5a1b37440b212bd7a613fe1de16d8c42771f5bd0dedd80a2bccbab84517adb1a34f7649069b6a686f84114967b42c70278df9447107bfff361ca1a93bb366689
-DIST kdenlive-20.08.1.tar.xz 11367852 BLAKE2B c1e85299f10d93660163852ecbca912030efa6bfc5c5780a3122b90edec27d44ad47e01e47196eadbefe5b555653bb03defa4784b15239294049bb2d59cc3117 SHA512 540c13df8eb73f53d022895f4d4a67fd7523829b48628fd8b596af07962099dff8214f37aeb80339503afd4b0f11ab959b6af89b08e4d8a85f012fa1502e4246
-EBUILD kdenlive-20.04.3.ebuild 2608 BLAKE2B 84a43b4f7a5adb33af4f911c42da5008e5a0b814c6f55059f8b57d85a5f488dfad5856cd978e449df5fd0eb0283ea42266c8d0a4df905225bf50fed362747230 SHA512 e7e18e4212783fa89220fdd51ac5b5ea214e661aabb04a94dd0bd98a8e4a653d77779320b4bdd894ce6c76f82a355d402631bb614cba853555b56258bde30d1f
-EBUILD kdenlive-20.08.1.ebuild 2611 BLAKE2B d43a5b45ae844d0ee8805618144f9c0e6740384405366079598a7d1e8a906d27705b7f524059ee36fc52d767fa4762c6c1fbbd1f821f5cd457de5e6e8584bf73 SHA512 358d3ab2d16b98c0a461b3aaf9b2fdc5bb8fa12ce843f9f37fbaa5ae5071a3e3c373dc030dc4abcf61f102714af21824e7820ba13e9f8d22ae6d7f0947cfd967
-MISC metadata.xml 486 BLAKE2B fb7e3b5c16a68c4993cadc893d28438138d81e74ed899c0e56230e7284913af8237269483eefdebd77e6a4880023d6d5e1d200debc1e916761d7156fddc59c41 SHA512 b110a1cec041bcf91c7a9028ac31292ff41c0a70a0f1c5462918671d300c9642ae0e04b4360f03dba344d5c4c7e67f8c4fd95f169f38f30a3628433c5ec1379f
+AUX kdenlive-20.08.3-webengine.patch 8643 BLAKE2B 705fe02d7fdfe29fc6cd414a358bcf4962a853fd8d7191771d9c2fd925025923116378e4fccd98e87cc4bce3cde2cbcb8b7c54c72d22c003d09a473c0d8703cc SHA512 03306e28e26535dae030e9ac29f90507045ad6c718567337be7bea3e3eb6348a4bacd43f6d1546850459714cbcdfb08f956c67d48d1ecdd396e55f6edb41e5a1
+DIST kdenlive-20.08.3.tar.xz 11383252 BLAKE2B aa8075758ec4b967c8eeabbab611278130df7235f10186b5bc4142a06805fb2cae94806059edf62f9af86a3640cee734863316e7651f3c67d020da32ab0d63ff SHA512 ed3ccffbe7c56d54e3c490d818a504bc4a3d65fd81c4d816a549d2a7d436b5320497145d122f352066def23c43aed523e2d31eb2a2f50378fb0122a89a23c424
+EBUILD kdenlive-20.08.3.ebuild 2685 BLAKE2B 444add9a5f84cf6630dd068b423e666cec48f60d1d6bd584039c255153b07a3010d0c5a6b572bef93e3380a61e107505bcbe4b4630dd7aeb9960408ebecd28c5 SHA512 f43fac8851377bbf644522016b916d3990618094926a0462a392db6fdb340dbeafe7b2e799892ffe488c6c512f2955c9d246ce554272df0bb7b11808640e3bd5
+MISC metadata.xml 489 BLAKE2B 51ddd82047dffa39b9fcd279857844864ae16144b31a5768384726729019541c9033f6cf2b358331f039954878cb409b4eda3dde8356ca2d3a345667cd6afe04 SHA512 855156534b3863f573fb9ccdffd144d11be83bb77c0b4e0f968a175730611bbc6b16f2a85e172076561aa02b498c975830187006a24a3095af33b6685835409f
diff --git a/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch b/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch
new file mode 100644
index 000000000000..0ffff1b4a384
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch
@@ -0,0 +1,213 @@
+From 51feccf3cc0939d42c3ff237eb17f9a6091f1dd8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 23 Oct 2020 15:32:39 +0200
+Subject: [PATCH] Port to QtWebEngineWidgets
+
+Fixes https://invent.kde.org/multimedia/kdenlive/-/issues/775
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                   |  2 +-
+ src/CMakeLists.txt               | 12 ++++++------
+ src/qt-oauth-lib/logindialog.cpp |  4 ++--
+ src/qt-oauth-lib/logindialog.h   |  3 +--
+ src/qt-oauth-lib/oauth2.h        |  4 ++--
+ src/ui/logindialog_ui.ui         |  6 +++---
+ src/utils/resourcewidget.cpp     | 14 +++++++-------
+ 7 files changed, 22 insertions(+), 23 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d434f1e31..a3f838433 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(WIN32)
+     set(MLT_PREFIX "..")
+ else()
+     set(MLT_PREFIX ${MLT_ROOT_DIR})
+-    find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
++    find_package(Qt5 OPTIONAL_COMPONENTS WebEngineWidgets QUIET)
+ endif()
+ 
+ if(KF5FileMetaData_FOUND)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 551178133..8356d4e47 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -65,7 +65,7 @@ add_subdirectory(transitions)
+ add_subdirectory(utils)
+ add_subdirectory(widgets)
+ add_subdirectory(xml)
+-if(Qt5WebKitWidgets_FOUND)
++if(Qt5WebEngineWidgets_FOUND)
+     add_subdirectory(qt-oauth-lib)
+ endif()
+ ## top_SRCS
+@@ -178,12 +178,12 @@ if(KF5_PURPOSE)
+     target_link_libraries(kdenliveLib KF5::Purpose KF5::PurposeWidgets)
+ endif()
+ 
+-if(Qt5WebKitWidgets_FOUND)
+-    message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files")
+-    target_compile_definitions(kdenliveLib PRIVATE -DQT5_USE_WEBKIT)
+-    target_link_libraries(kdenliveLib Qt5::WebKitWidgets)
++if(Qt5WebEngineWidgets_FOUND)
++    message(STATUS "Found Qt5 WebEngineWidgets. You can use your Freesound.org credentials to download files")
++    target_compile_definitions(kdenliveLib PRIVATE -DQT5_USE_WEBENGINE)
++    target_link_libraries(kdenliveLib Qt5::WebEngineWidgets)
+ else()
+-    message(STATUS "Qt5 WebKitWidgets not found. You cannot use your Freesound.org credentials, only preview files can be downloaded from the Online Resources Widget")
++    message(STATUS "Qt5 WebEngineWidgets not found. You cannot use your Freesound.org credentials, only preview files can be downloaded from the Online Resources Widget")
+ endif()
+ 
+ if(Q_WS_X11)
+diff --git a/src/qt-oauth-lib/logindialog.cpp b/src/qt-oauth-lib/logindialog.cpp
+index a41aa420b..111978831 100644
+--- a/src/qt-oauth-lib/logindialog.cpp
++++ b/src/qt-oauth-lib/logindialog.cpp
+@@ -38,7 +38,7 @@
+ #include "ui_logindialog_ui.h"
+ 
+ #include "kdenlive_debug.h"
+-#include <QWebView>
++#include <QWebEngineView>
+ 
+ LoginDialog::LoginDialog(QWidget *parent)
+     : QDialog(parent)
+@@ -54,7 +54,7 @@ LoginDialog::LoginDialog(QWidget *parent)
+         i18n("Enter your freesound account details to download the highest quality version of this file. Or use the High Quality "
+              "preview file instead (no freesound account required)."));
+     // m_ui->textBrowser
+-    connect(m_ui->webView, &QWebView::urlChanged, this, &LoginDialog::urlChanged);
++    connect(m_ui->webView, &QWebEngineView::urlChanged, this, &LoginDialog::urlChanged);
+ }
+ 
+ LoginDialog::~LoginDialog()
+diff --git a/src/qt-oauth-lib/logindialog.h b/src/qt-oauth-lib/logindialog.h
+index 963b38ec5..c34383bf2 100644
+--- a/src/qt-oauth-lib/logindialog.h
++++ b/src/qt-oauth-lib/logindialog.h
+@@ -47,11 +47,10 @@ class LoginDialog;
+ 
+ /**
+   \brief This is the dialog that is used to login to freesound
+- \details It contains a QWebView object to display the freesound web page. I did try using a QTextBrowser
++ \details It contains a QWebEngineView object to display the freesound web page. I did try using a QTextBrowser
+  for this purpose but it responds to the URL that is used to connect with
+  "No document for
+  https://www.freesound.org/apiv2/oauth2/authorize/?client_id=3duhagdr874c&redirect_uri=https://www.freesound.org/home/app_permissions/permission_granted/&response_type=code"
+- The use of QWebView adds a dependency on the KF5WebKit to kdenlive. Need install libkf5webkit5-dev package on ubuntu
+  */
+ class LoginDialog : public QDialog
+ {
+diff --git a/src/qt-oauth-lib/oauth2.h b/src/qt-oauth-lib/oauth2.h
+index f28724455..03993a214 100644
+--- a/src/qt-oauth-lib/oauth2.h
++++ b/src/qt-oauth-lib/oauth2.h
+@@ -45,7 +45,7 @@
+ const QLatin1String OAuth2_strClientSecret("441d88374716e7a3503997151e4780566f007313"); // obtained when ttguy registered the kdenlive application with freesound
+ #endif
+ 
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ 
+ class LoginDialog;
+ 
+@@ -135,6 +135,6 @@ private:
+     void buildLoginDialog();
+ };
+ 
+-#endif // QT5_USE_WEBKIT
++#endif // QT5_USE_WEBENGINE
+ 
+ #endif // OAUTH2_H
+diff --git a/src/ui/logindialog_ui.ui b/src/ui/logindialog_ui.ui
+index 20827d686..e98a68ed2 100644
+--- a/src/ui/logindialog_ui.ui
++++ b/src/ui/logindialog_ui.ui
+@@ -15,7 +15,7 @@
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="1" column="0">
+-    <widget class="QWebView" name="webView">
++    <widget class="QWebEngineView" name="webView">
+      <property name="url">
+       <url>
+        <string>about:blank</string>
+@@ -51,9 +51,9 @@
+  </widget>
+  <customwidgets>
+   <customwidget>
+-   <class>QWebView</class>
++   <class>QWebEngineView</class>
+    <extends>QWidget</extends>
+-   <header>QtWebKitWidgets/QWebView</header>
++   <header>QtWebEngineWidgets/QWebEngineView</header>
+   </customwidget>
+  </customwidgets>
+  <resources/>
+diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
+index 79bb48898..d0eaa225b 100644
+--- a/src/utils/resourcewidget.cpp
++++ b/src/utils/resourcewidget.cpp
+@@ -49,7 +49,7 @@
+ #include <QPixmap>
+ #include <klocalizedstring.h>
+ 
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ #include "qt-oauth-lib/oauth2.h"
+ #endif
+ 
+@@ -103,7 +103,7 @@ ResourceWidget::ResourceWidget(QString folder, QWidget *parent)
+     search_text->setFocus();
+     connect(search_text, SIGNAL(returnPressed()), this, SLOT(slotStartSearch()));
+ 
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+     m_pOAuth2 = new OAuth2(this);
+     connect(m_pOAuth2, &OAuth2::accessTokenReceived, this, &ResourceWidget::slotAccessTokenReceived);
+     connect(m_pOAuth2, &OAuth2::accessDenied, this, &ResourceWidget::slotFreesoundAccessDenied);
+@@ -375,7 +375,7 @@ void ResourceWidget::slotSaveItem(const QString &originalUrl)
+         path.append(m_currentService->getDefaultDownloadName(item));
+ 
+         if (m_currentService->serviceType == AbstractService::FREESOUND) {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+             sFileExt = m_currentService->getExtension(search_results->currentItem());
+ #else
+             sFileExt = QStringLiteral("*.") + m_currentInfo.HQpreview.section(QLatin1Char('.'), -1);
+@@ -402,7 +402,7 @@ void ResourceWidget::slotSaveItem(const QString &originalUrl)
+     }
+     slotSetDescription(QString());
+     button_import->setEnabled(false); // disable buttons while download runs. enabled in slotGotFile
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+     if (m_currentService->serviceType == AbstractService::FREESOUND) { // open a dialog to authenticate with free sound and download the file
+         m_pOAuth2->obtainAccessToken();                                // when  job finished   ResourceWidget::slotAccessTokenReceived will be called
+     } else {                                                           // not freesound - do file download via a KIO file copy job
+@@ -841,7 +841,7 @@ void ResourceWidget::DownloadRequestFinished(QNetworkReply *reply)
+                 m_desc.append(m_saveLocation);
+                 updateLayout();
+             } else {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+                 m_pOAuth2->ForgetAccessToken();
+ #endif
+                 m_desc.append(QStringLiteral("<br>") + i18n("Error Saving File"));
+@@ -850,11 +850,11 @@ void ResourceWidget::DownloadRequestFinished(QNetworkReply *reply)
+         } else {
+ 
+             if (reply->error() == QNetworkReply::AuthenticationRequiredError) {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+                 m_pOAuth2->obtainNewAccessToken();
+ #endif
+             } else {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+                 m_pOAuth2->ForgetAccessToken();
+ #endif
+                 m_desc.append(QStringLiteral("<br>") + i18n("Error Downloading File. Error code: %1", reply->error()) + QStringLiteral("<br>"));
+-- 
+2.29.1
+
diff --git a/kde-apps/kdenlive/kdenlive-20.08.1.ebuild b/kde-apps/kdenlive/kdenlive-20.08.1.ebuild
deleted file mode 100644
index a6391c225930..000000000000
--- a/kde-apps/kdenlive/kdenlive-20.08.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://kdenlive.org/en/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="freesound gles2-only semantic-desktop share v4l"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	dev-cpp/rttr
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=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
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=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 )
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	media-video/ffmpeg[encode,sdl,X]
-"
-
-RESTRICT+=" test" # segfaults, bug 684132
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package freesound Qt5WebKitWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package v4l LibV4L2)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	# Gentoo bug 603168
-	if ! has_version "media-libs/mlt[fftw]" ; then
-		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
-	fi
-}
diff --git a/kde-apps/kdenlive/kdenlive-20.04.3.ebuild b/kde-apps/kdenlive/kdenlive-20.08.3.ebuild
index d4d1e73d637f..8db9f9c0d767 100644
--- a/kde-apps/kdenlive/kdenlive-20.04.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.08.3.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdenlive.org/en/"
 LICENSE="GPL-2"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="freesound gles2-only semantic-desktop share v4l"
+IUSE="gles2-only semantic-desktop share v4l webengine"
 
 BDEPEND="
 	sys-devel/gettext
@@ -56,11 +56,11 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
-	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	>=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive(+),melt(+),qt5,sdl,xml]
 	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	v4l? ( media-libs/libv4l )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
@@ -69,12 +69,14 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test" # segfaults, bug 684132
 
+PATCHES=( "${FILESDIR}/${PN}-20.08.3-webengine.patch" ) # pending upstream
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package freesound Qt5WebKitWidgets)
 		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 		$(cmake_use_find_package share KF5Purpose)
 		$(cmake_use_find_package v4l LibV4L2)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kdenlive/metadata.xml b/kde-apps/kdenlive/metadata.xml
index 350073ec742f..c656c56e78df 100644
--- a/kde-apps/kdenlive/metadata.xml
+++ b/kde-apps/kdenlive/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="freesound">Enable freesound.org credentials support via <pkg>dev-qt/qtwebkit</pkg> to download files</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+		<flag name="webengine">Enable freesound.org credentials support via <pkg>dev-qt/qtwebengine</pkg> to download files</flag>
 	</use>
 </pkgmetadata>