From 206a4da2f52e840ea152d0fab06426b6112c998f Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 6 Apr 2020 17:22:53 +0300 Subject: [PATCH] lxqt --- desktop/lxqt/lxqt-config/files/qt5.14.patch | 21 +++++++++++++++++++++ desktop/lxqt/lxqt-config/pspec.xml | 17 ++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 desktop/lxqt/lxqt-config/files/qt5.14.patch diff --git a/desktop/lxqt/lxqt-config/files/qt5.14.patch b/desktop/lxqt/lxqt-config/files/qt5.14.patch new file mode 100644 index 0000000000..31b22cd6ea --- /dev/null +++ b/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 +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 + #include + #include ++#include + #include + #include + #include diff --git a/desktop/lxqt/lxqt-config/pspec.xml b/desktop/lxqt/lxqt-config/pspec.xml index 0b4af4b50d..94be0323ed 100644 --- a/desktop/lxqt/lxqt-config/pspec.xml +++ b/desktop/lxqt/lxqt-config/pspec.xml @@ -14,25 +14,28 @@ https://github.com/lxqt/lxqt-config/releases/download/0.14.1/lxqt-config-0.14.1.tar.xz cmake + libgcc + pkgconfig zlib-devel glibc-devel - kwindowsystem-devel libXi-devel libX11-devel - libgcc - libqtxdg-devel - liblxqt-devel - pkgconfig qt5-base-devel qt5-linguist qt5-qdbusviewer - qt5-x11extras-devel qt5-svg-devel libXcursor-devel libkscreen-devel + qt5-x11extras-devel + kwindowsystem-devel xorg-input-libinput-devel + libqtxdg-devel + liblxqt-devel lxqt-build-tools + + qt5.14.patch + @@ -45,7 +48,6 @@ libxcb liblxqt qt5-svg - libqtxdg qt5-base libXfixes libXcursor @@ -53,6 +55,7 @@ qt5-x11extras eudev libXi + libqtxdg /usr/bin