[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/, kde-apps/kdenlive/files/
commit: d346cec73292bb618a4e649fad6ef64cdc8ae803
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 26 16:58:35 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 26 16:58:35 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d346cec7
kde-apps/kdenlive: Port to dev-qt/qtwebengine
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/kdenlive-20.08.3-webengine.patch | 213 +
kde-apps/kdenlive/kdenlive-20.08.49..ebuild| 8 +-
kde-apps/kdenlive/kdenlive-.ebuild | 8 +-
kde-apps/kdenlive/metadata.xml | 2 +-
4 files changed, 224 insertions(+), 7 deletions(-)
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 00..01b4a3
--- /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
+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
+---
+ 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
++#include
+
+ 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 t
[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/, kde-apps/kdenlive/files/
commit: 8e05ed77bf163919b3655467bafce134f131051a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 10 00:08:31 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 10 00:08:31 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e05ed77
kde-apps/kdenlive: Drop obsolete patch
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kdenlive/files/kdenlive-19.12.0-qt-5.14.patch | 39 --
kde-apps/kdenlive/kdenlive-19.12.0.ebuild | 2 --
2 files changed, 41 deletions(-)
diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch
b/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch
deleted file mode 100644
index 59dc7ffef5..00
--- a/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 699bba9e555aece12b17656152ada929e9fd787d Mon Sep 17 00:00:00 2001
-From: Antonio Rojas
-Date: Fri, 6 Dec 2019 15:42:10 +0100
-Subject: Fix build with Qt 5.14 RC
-
-Add missing includes that are no longer pulled transitively
-
-Differential Revision: https://phabricator.kde.org/D25784
- src/audiomixer/mixerwidget.cpp | 1 +
- src/doc/kdenlivedoc.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/audiomixer/mixerwidget.cpp b/src/audiomixer/mixerwidget.cpp
-index 08ff50b..d8d6b38 100644
a/src/audiomixer/mixerwidget.cpp
-+++ b/src/audiomixer/mixerwidget.cpp
-@@ -41,6 +41,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
-
-diff --git a/src/doc/kdenlivedoc.h b/src/doc/kdenlivedoc.h
-index 7b56308..64cd7b4 100644
a/src/doc/kdenlivedoc.h
-+++ b/src/doc/kdenlivedoc.h
-@@ -25,6 +25,7 @@
- #ifndef KDENLIVEDOC_H
- #define KDENLIVEDOC_H
-
-+#include
- #include
- #include
- #include
---
-cgit v1.1
diff --git a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
index 383bc18ca2..ebe92f742c 100644
--- a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
@@ -66,8 +66,6 @@ RDEPEND="${DEPEND}
virtual/ffmpeg[encode,sdl,X]
"
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch ) # release/19.12 branch
-
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package freesound Qt5WebKitWidgets)
[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/, kde-apps/kdenlive/files/
commit: 31768721ec10e12b216c0f76870c440114c53094
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Dec 6 20:40:05 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 7 11:42:39 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31768721
kde-apps/kdenlive: Fix build with Qt 5.14.0 RC
Upstream commit 699bba9e555aece12b17656152ada929e9fd787d
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/kdenlive-19.08.3-qt-5.14-2.patch | 32 --
.../kdenlive/files/kdenlive-19.12.0-qt-5.14.patch | 39 ++
kde-apps/kdenlive/kdenlive-19.12.0.ebuild | 2 ++
3 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
deleted file mode 100644
index 13d2fd39d4..00
--- a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From caf88fd638f67b505aa28521b6abda430f03e7c8 Mon Sep 17 00:00:00 2001
-From: Heiko Becker
-Date: Thu, 31 Oct 2019 20:33:54 +0100
-Subject: [PATCH] Fix build with Qt 5.14
-
-std::hash is already specialized in Qt 5.14 [1], so we need
-to avoid redifining it with this version.
-
-[1] 4469e36d7203a55a4e158a50f0e9effc3f2fa3c2 in qtbase.git
- src/definitions.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/definitions.h b/src/definitions.h
-index a55ec8df7..d2f67815b 100644
a/src/definitions.h
-+++ b/src/definitions.h
-@@ -252,10 +252,12 @@ QDebug operator<<(QDebug qd, const ItemInfo &info);
-
- // we provide hash function for qstring and QPersistentModelIndex
- namespace std {
-+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
- template <> struct hash
- {
- std::size_t operator()(const QString &k) const { return qHash(k); }
- };
-+#endif
- template <> struct hash
- {
- std::size_t operator()(const QPersistentModelIndex &k) const { return
qHash(k); }
---
-2.17.1
diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch
b/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch
new file mode 100644
index 00..59dc7ffef5
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-19.12.0-qt-5.14.patch
@@ -0,0 +1,39 @@
+From 699bba9e555aece12b17656152ada929e9fd787d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas
+Date: Fri, 6 Dec 2019 15:42:10 +0100
+Subject: Fix build with Qt 5.14 RC
+
+Add missing includes that are no longer pulled transitively
+
+Differential Revision: https://phabricator.kde.org/D25784
+---
+ src/audiomixer/mixerwidget.cpp | 1 +
+ src/doc/kdenlivedoc.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/audiomixer/mixerwidget.cpp b/src/audiomixer/mixerwidget.cpp
+index 08ff50b..d8d6b38 100644
+--- a/src/audiomixer/mixerwidget.cpp
b/src/audiomixer/mixerwidget.cpp
+@@ -41,6 +41,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+diff --git a/src/doc/kdenlivedoc.h b/src/doc/kdenlivedoc.h
+index 7b56308..64cd7b4 100644
+--- a/src/doc/kdenlivedoc.h
b/src/doc/kdenlivedoc.h
+@@ -25,6 +25,7 @@
+ #ifndef KDENLIVEDOC_H
+ #define KDENLIVEDOC_H
+
++#include
+ #include
+ #include
+ #include
+--
+cgit v1.1
diff --git a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
index ebe92f742c..383bc18ca2 100644
--- a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
@@ -66,6 +66,8 @@ RDEPEND="${DEPEND}
virtual/ffmpeg[encode,sdl,X]
"
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch ) # release/19.12 branch
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package freesound Qt5WebKitWidgets)
[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/, kde-apps/kdenlive/files/
commit: ee25b360533cc9adfb31bce37bddd9e8dc6cbc4b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Apr 13 22:15:07 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 13 22:15:07 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee25b360
kde-apps/kdenlive: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../kdenlive/files/kdenlive-18.04.0-qt-5.11.patch | 41 ++
kde-apps/kdenlive/kdenlive-18.04.0.ebuild | 2 ++
2 files changed, 43 insertions(+)
diff --git a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch
b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch
new file mode 100644
index 00..143745737c
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch
@@ -0,0 +1,41 @@
+From c205adc1f55e2864180b3b0e1fe133c9056e9130 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Fri, 13 Apr 2018 23:56:26 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ renderer/CMakeLists.txt | 3 +--
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt
+index 27f5f4367..693478abb 100644
+--- a/renderer/CMakeLists.txt
b/renderer/CMakeLists.txt
+@@ -9,9 +9,8 @@ set(kdenlive_render_SRCS
+ add_executable(kdenlive_render ${kdenlive_render_SRCS})
+ ecm_mark_nongui_executable(kdenlive_render)
+
+-qt5_use_modules(kdenlive_render Widgets Concurrent DBus)
+-
+ target_link_libraries(kdenlive_render
++ Qt5::Widgets Qt5::Concurrent Qt5::DBus
+ ${QT_LIBRARIES}
+ ${Qt5_LIBRARIES}
+ )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1b3cbdea9..2ba81bb48 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -299,7 +299,7 @@ if (KF5Crash_FOUND)
+ target_link_libraries(kdenlive KF5::Crash)
+ endif()
+
+-qt5_use_modules( kdenlive Script Widgets Concurrent Qml Quick)
++target_link_libraries(kdenlive Qt5::Script Qt5::Widgets Qt5::Concurrent
Qt5::Qml Qt5::Quick)
+
+ if (Qt5WebKitWidgets_FOUND)
+ message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org
credentials to download files")
+--
+2.17.0
+
diff --git a/kde-apps/kdenlive/kdenlive-18.04.0.ebuild
b/kde-apps/kdenlive/kdenlive-18.04.0.ebuild
index ba7f9f054d..01dbc29295 100644
--- a/kde-apps/kdenlive/kdenlive-18.04.0.ebuild
+++ b/kde-apps/kdenlive/kdenlive-18.04.0.ebuild
@@ -56,6 +56,8 @@ DEPEND="${RDEPEND}
sys-devel/gettext
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
