[neon/kde/plasma-workspace/Neon/unstable] debian/patches: add patch from https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/4893 to fix dict widget loading

Jonathan Riddell null at kde.org
Thu Nov 14 12:58:17 GMT 2024


Git commit c108744f1537db6bcc0ac0160f9ca3944390383c by Jonathan Riddell.
Committed on 14/11/2024 at 12:58.
Pushed by jriddell into branch 'Neon/unstable'.

add patch from https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/4893 to fix dict widget loading

A  +90   -0    debian/patches/qtwebengine-initialise.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/plasma-workspace/-/commit/c108744f1537db6bcc0ac0160f9ca3944390383c

diff --git a/debian/patches/qtwebengine-initialise.diff b/debian/patches/qtwebengine-initialise.diff
new file mode 100644
index 0000000..dad9bb7
--- /dev/null
+++ b/debian/patches/qtwebengine-initialise.diff
@@ -0,0 +1,90 @@
+commit fc1411357b2f4611f677e3a7ff2fd31e06f32f82
+Author: Aleix Pol <aleixpol at kde.org>
+Date:   Tue Nov 5 14:49:28 2024 +0100
+
+    Have Plasma call QtWebEngineQuick::initialize()
+    
+    Plasmoids might bring qtwebengine and it needs to be called before
+    QCoreApplication is initialised.
+    
+    This adds a dependency to QtWebEngine on plasma-workspace.
+    
+    BUG: 495758
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 25e6e1ed95..ee18a423f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ include(ECMGenerateQmlTypes)
+ include(ECMDeprecationSettings)
+ include(ECMQmlModule)
+ 
+-find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Svg Widgets Quick QuickWidgets Concurrent Network Core5Compat DBus ShaderTools Positioning)
++find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Svg Widgets Quick QuickWidgets Concurrent Network Core5Compat DBus ShaderTools Positioning WebEngineQuick)
+ find_package(QCoro6 REQUIRED COMPONENTS Core)
+ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
+                     Auth Parts Runner Notifications NotifyConfig NewStuff Wallet IdleTime
+diff --git a/plasma-windowed/CMakeLists.txt b/plasma-windowed/CMakeLists.txt
+index 0c8657cfbd..4dfd8b89f7 100644
+--- a/plasma-windowed/CMakeLists.txt
++++ b/plasma-windowed/CMakeLists.txt
+@@ -15,6 +15,7 @@ target_link_libraries(
+     Qt::Widgets
+     Qt::Quick
+     Qt::Qml
++    Qt::WebEngineQuick
+     KF6::I18n
+     KF6::IconThemes
+     KF6::XmlGui
+diff --git a/plasma-windowed/main.cpp b/plasma-windowed/main.cpp
+index ad993cf22c..546d569c9d 100644
+--- a/plasma-windowed/main.cpp
++++ b/plasma-windowed/main.cpp
+@@ -10,6 +10,7 @@
+ #include <QApplication>
+ #include <QQmlDebuggingEnabler>
+ #include <QSurfaceFormat>
++#include <QtWebEngineQuick>
+ #include <qcommandlineoption.h>
+ #include <qcommandlineparser.h>
+ 
+@@ -30,6 +31,7 @@ int main(int argc, char **argv)
+     }
+ #endif
+ 
++    QtWebEngineQuick::initialize();
+     QQuickWindow::setDefaultAlphaBuffer(true);
+ 
+     auto format = QSurfaceFormat::defaultFormat();
+diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
+index 6f3b7cfd73..a6542af4c8 100644
+--- a/shell/CMakeLists.txt
++++ b/shell/CMakeLists.txt
+@@ -111,6 +111,7 @@ target_link_libraries(plasmashell
+  Qt::Quick
+  Qt::DBus
+  Qt::WaylandClient
++ Qt::WebEngineQuick
+  Wayland::Client
+ )
+ target_link_libraries(plasmashell KF6::ConfigQml)
+diff --git a/shell/main.cpp b/shell/main.cpp
+index 2c47a558f2..c4bb860181 100644
+--- a/shell/main.cpp
++++ b/shell/main.cpp
+@@ -28,6 +28,7 @@
+ #include <QQuickWindow>
+ #include <QSessionManager>
+ #include <QSurfaceFormat>
++#include <QtWebEngineQuick>
+ 
+ #include <KAboutData>
+ #include <KCrash>
+@@ -52,6 +53,7 @@ int main(int argc, char *argv[])
+     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+ 
+     QQuickWindow::setDefaultAlphaBuffer(true);
++    QtWebEngineQuick::initialize();
+ 
+     // this works around a bug of Qt and the plasmashell protocol
+     // consider disabling when layer-shell lands
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8dc577c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+qtwebengine-initialise.diff


More information about the Neon-commits mailing list