Merge pull request #8360 from Rmys/master

lxqt

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

@@ -0,0 +1,21 @@
+From cd7de12f2ebe5a2ad03c2086da4c3b5317a4506e Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 15 Dec 2019 09:32:55 +0800
+Subject: [PATCH] Fix building with Qt 5.14
+
+---
+ lxqt-config-input/touchpaddevice.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lxqt-config-input/touchpaddevice.cpp b/lxqt-config-input/touchpaddevice.cpp
+index 31adbe5f..41690c2c 100644
+--- a/lxqt-config-input/touchpaddevice.cpp
++++ b/lxqt-config-input/touchpaddevice.cpp
+@@ -21,6 +21,7 @@
+ #include <cmath>
+ #include <QDebug>
+ #include <QX11Info>
++#include <QUrl>
+ #include <libudev.h>
+ #include <LXQt/Settings>
+ #include <X11/Xatom.h>

desktop/lxqt/lxqt-config/pspec.xml

@@ -14,25 +14,28 @@
         <Archive sha1sum="8dff03769f0ffc2127755a362f2b638561b38582" type="tarxz">https://github.com/lxqt/lxqt-config/releases/download/0.14.1/lxqt-config-0.14.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>pkgconfig</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>glibc-devel</Dependency>
-            <Dependency>kwindowsystem-devel</Dependency>
             <Dependency>libXi-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency versionFrom="1.3.0">libqtxdg-devel</Dependency>
-            <Dependency versionFrom="0.14.1">liblxqt-devel</Dependency>
-            <Dependency>pkgconfig</Dependency>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-linguist</Dependency>
             <Dependency>qt5-qdbusviewer</Dependency>
-            <Dependency>qt5-x11extras-devel</Dependency>
             <Dependency>qt5-svg-devel</Dependency>
             <Dependency>libXcursor-devel</Dependency>
             <Dependency>libkscreen-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
             <Dependency>xorg-input-libinput-devel</Dependency>
+            <Dependency versionFrom="1.3.0">libqtxdg-devel</Dependency>
+            <Dependency versionFrom="0.14.1">liblxqt-devel</Dependency>
             <Dependency vesionFrom="0.6.0">lxqt-build-tools</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">qt5.14.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -45,7 +48,6 @@
             <Dependency>libxcb</Dependency>
             <Dependency>liblxqt</Dependency>
             <Dependency>qt5-svg</Dependency>
-            <Dependency versionFrom="1.3.0">libqtxdg</Dependency>
             <Dependency>qt5-base</Dependency>
             <Dependency>libXfixes</Dependency>
             <Dependency>libXcursor</Dependency>
@@ -53,6 +55,7 @@
             <Dependency>qt5-x11extras</Dependency>
             <Dependency>eudev</Dependency>
             <Dependency>libXi</Dependency>
+            <Dependency versionFrom="1.3.0">libqtxdg</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>