summaryrefslogtreecommitdiff
path: root/lxqt-base/liblxqt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
commit21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
treee1810a4b135afce04b34862ef0fab2bfaeb8aeca /lxqt-base/liblxqt
parent7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
gentoo resync : 15.01.2020
Diffstat (limited to 'lxqt-base/liblxqt')
-rw-r--r--lxqt-base/liblxqt/Manifest3
-rw-r--r--lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch24
-rw-r--r--lxqt-base/liblxqt/liblxqt-0.14.1.ebuild4
3 files changed, 29 insertions, 2 deletions
diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index 44516e9720a1..fd29a15f21b0 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -1,3 +1,4 @@
+AUX liblxqt-0.14.1-qt-5.14-build.patch 599 BLAKE2B cd09cdd37c3c4ba497ef7264eccd12b8df4385c797fb658255f39c885b259776f70dd15759fda04808f42e58baca8d3471860c6976970f6f7c41457c1a9a66d0 SHA512 09929870c04aeab8d70bff04367da429d43f1258d35f1bb367795e8827d43d3b450ad90843d70199cb4e42d9bdfc67a66cf33fa67a21c6387ed181c1fee512f6
DIST liblxqt-0.14.1.tar.xz 81704 BLAKE2B 9aa190fce337068d02962af90c1847acd51a63c44019c9ccdc729dea00d52cd65826e50850e913306f5e6f0a20d1e25b4f90cd09ebb9012c2c3337aaeaa3665f SHA512 28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba
-EBUILD liblxqt-0.14.1.ebuild 856 BLAKE2B 443c2851059a5861a131b217c664a85d34b4749a237c4a1c9251504cd280c6bbdb44dc1bc4ff37341c8058de431e4beaeb3eb0868f050d9c35d33a51d0ea06b5 SHA512 0ee36cebdbe59e041c1a2431646e216c8a94ed3bbfaf97d089eb70f91bfee90a8e0e64b1f420d556e3c075b6066e6d52077bd38fee60ed201a1e9711b6e00280
+EBUILD liblxqt-0.14.1.ebuild 915 BLAKE2B 45cd6c4c9fa6f428e468077611559e4c3341c3a6493aa28ecea7dc8143c982567592dd0e38c32540c78f3041c79ef918b5da9b4d50908586e614a09fee433600 SHA512 b4b7458acc89be48f3c9c2d7036b7ad73d17189db90b90cfead1eeb2c8725384c9665b5e489b78ded74c745c2eb9af5aa82b4b8ec7bb794b6cee8ea1bbfe6e37
MISC metadata.xml 313 BLAKE2B 6eee2dbe392f7cd8b5f033d718e5ef3c4d07b788a09d99d97f06ff7571153366bf9367bec44b18d8c096c9afbd8be76776623b0fcc78bc2507422e78ab197405 SHA512 e3a460c17c69d21bb39bc75a79f36154afdd3b38abe18bac568afb28b5739ffc2ffe5d33607037ae32b7d6925512eebf560562b3e157dcf1e882d3bd9deaff54
diff --git a/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch b/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch
new file mode 100644
index 000000000000..54fd90676ea3
--- /dev/null
+++ b/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch
@@ -0,0 +1,24 @@
+From 534c6f6b5240daa81a2b6206a8ec028a69ee5c2d Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Mon, 23 Dec 2019 21:20:16 +0200
+Subject: [PATCH] Fix build with Qt 5.14.
+
+---
+ lxqtpowermanager.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lxqtpowermanager.cpp b/lxqtpowermanager.cpp
+index aef5ca2..b0926f9 100644
+--- a/lxqtpowermanager.cpp
++++ b/lxqtpowermanager.cpp
+@@ -32,6 +32,7 @@
+ #include <QApplication>
+ #include <QDesktopWidget>
+ #include <QtDebug>
++#include <QFile>
+ #include "lxqttranslator.h"
+ #include "lxqtglobals.h"
+ #include "lxqtsettings.h"
+--
+2.24.1
+
diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
index 5ad13018bb8f..eec7e2b2de7b 100644
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Common base library for the LXQt desktop environment"
HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,8 @@ fi
LICENSE="LGPL-2.1+ BSD"
SLOT="0/$(ver_cut 1-2)"
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" ) # Bug 703596
+
BDEPEND="
dev-qt/linguist-tools:5
>=dev-util/lxqt-build-tools-0.6.0