Merge pull request #8359 from Rmys/master

lxqt

desktop/lxqt/lxqt-globalkeys/files/qt5.14.patch

@@ -0,0 +1,22 @@
+From c9ec69850428e599fba282c32e51868b815e3019 Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 15 Dec 2019 09:33:12 +0800
+Subject: [PATCH] Fix building with Qt 5.14
+
+---
+ daemon/core.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/core.cpp b/daemon/core.cpp
+index 1be64ec..53bdf7b 100644
+--- a/daemon/core.cpp
++++ b/daemon/core.cpp
+@@ -33,6 +33,7 @@
+ #include <QTimer>
+ #include <QDBusConnectionInterface>
+ #include <QDBusServiceWatcher>
++#include <QFile>
+ 
+ #include <cstddef>
+ #include <cstdlib>
+ 

desktop/lxqt/lxqt-globalkeys/pspec.xml

@@ -14,15 +14,18 @@
         <Archive sha1sum="e90b0b15f9cc3b178e7fd004c158b385fd644990" type="tarxz">https://github.com/lxqt/lxqt-globalkeys/releases/download/0.14.3/lxqt-globalkeys-0.14.3.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
-            <Dependency>kwindowsystem-devel</Dependency>
-            <Dependency>libX11-devel</Dependency>
             <Dependency>libgcc</Dependency>
-            <Dependency versionFrom="0.14.0">liblxqt-devel</Dependency>
+            <Dependency>qt5-linguist</Dependency>
+            <Dependency>libX11-devel</Dependency>
             <Dependency>libqtxdg-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
-            <Dependency>qt5-linguist</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
+            <Dependency versionFrom="0.14.0">liblxqt-devel</Dependency>
             <Dependency versionFrom="0.6.0">lxqt-build-tools</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">qt5.14.patch</Patch>
+        </Patches>
     </Source>
     <Package>
         <Name>lxqt-globalkeys</Name>