From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 lxqt-base/lxqt-config/Manifest                      |  3 ++-
 .../files/lxqt-config-0.14.1-qt-5.14-build.patch    | 21 +++++++++++++++++++++
 lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild  |  8 +++++---
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch

(limited to 'lxqt-base/lxqt-config')

diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index bebed85c577b..06db3829f5b2 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,3 +1,4 @@
+AUX lxqt-config-0.14.1-qt-5.14-build.patch 648 BLAKE2B 181699115b64c6ae5d0d4269a932d14ba13842af2adcddcd0287fb1d2343512a2c0100d920fc2f6acef9797405ff6a51f2cecb3245bef025f2062ecbe4855cf5 SHA512 e4f02a01c6f857b2f9c9402baa8779e902e0df3ca92d364e55395f19691d8f4399e0b9337126609b4b2c6a342b389658eeb79a9cd69781f71432f9bffe0d3b53
 DIST lxqt-config-0.14.1.tar.xz 293304 BLAKE2B f090d7878815edc4f3f0078301a099ffc8ff57865516a9097db75faa1627af33c60d76b75cef8a7da5e9e790869e6768f54c3b17c59b038578f22d645c3c22fd SHA512 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f
-EBUILD lxqt-config-0.14.1-r1.ebuild 1480 BLAKE2B 709c59773725bf682c9333da413f8045833467c271d9bd783958795756848c1b5e233b50b86351a00e019df532f0ec21f9480f3cbf2dd2e26e02712c21366018 SHA512 4759aa82f6f5cc5ccd9755f825e47daf21b05f470fb5599d7be56602c0b23012a9474b0455b55c344772f87a6b538d19a536e3b6d0a7f222d6dcada33c561515
+EBUILD lxqt-config-0.14.1-r1.ebuild 1514 BLAKE2B a1ca1123daefbec66c8ea8a680d5851eb9fd9253da34bb2ac6ac65671d5aeb50f2867e202d3744706b5512c42fbdc0fdf33e8bdb8a0c98b820c29ba7482bf4bb SHA512 fdb90b9bf0d3955611e7ceaf09f8b4ab2ed6d31f1bcabba394e2564a1da6dfad1afc758f0b5115dcf017484b98b8c0672c52a52d35bad0e006e9958a345c3767
 MISC metadata.xml 450 BLAKE2B 6f59cf0984e8e6c625eef75e01275d3d9e0b09fdbc1fc82fffb8611b44654da27da256148350c632673352ebc397f07b4696efad6f1f0d35489468752a4293cb SHA512 9e74d2cdc46c1c7797ac91f141995fbab7e11f4f05bef094e2af89d3cfe7d47d209de3de5726eee2eb45926185803ff7c7f012aad994f1acbc43feca88e798fc
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch
new file mode 100644
index 000000000000..31b22cd6eaa5
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.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>
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
index 263309fa6e7b..33b97791a6a3 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="LXQt system configuration control center"
 HOMEPAGE="https://lxqt.org/"
@@ -20,6 +20,8 @@ LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
 SLOT="0"
 IUSE="+monitor +touchpad"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" )
+
 BDEPEND="
 	dev-qt/linguist-tools:5
 	>=dev-util/lxqt-build-tools-0.6.0
@@ -57,11 +59,11 @@ src_configure() {
 		-DWITH_MONITOR="$(usex monitor)"
 		-DWITH_TOUCHPAD="$(usex touchpad)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
 }
 
-- 
cgit v1.2.3