[gentoo-commits] repo/gentoo:master commit in: lxqt-base/liblxqt/, lxqt-base/liblxqt/files/

[Andreas Sturmlechner]

commit: 9dc3a09a2a42ed944c1a4297fb63ad698013f991
Author: Jimi Huotari  gentoo  org>
AuthorDate: Mon Dec 23 19:01:48 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 23 21:45:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc3a09a

lxqt-base/liblxqt: fix build with Qt 5.14

Closes: https://bugs.gentoo.org/703596
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14108
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/liblxqt-0.14.1-qt-5.14-build.patch   | 24 ++
 lxqt-base/liblxqt/liblxqt-0.14.1.ebuild|  2 ++
 2 files changed, 26 insertions(+)

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 000..54fd90676ea
--- /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 
+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 
+ #include 
+ #include 
++#include 
+ #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 5ad13018bb8..7e6e0123112 100644
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
@@ -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

[gentoo-commits] repo/gentoo:master commit in: lxqt-base/liblxqt/, lxqt-base/liblxqt/files/

[Michael Palimaka]

commit: e7040dc794ae9ab66387ceded07e99e3ebd75feb
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Oct 19 15:28:58 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 19 15:29:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7040dc7

lxqt-base/liblxqt: backport patch from upstream fixing build with Qt 5.5

Package-Manager: portage-2.2.20.1

 lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch | 22 ++
 lxqt-base/liblxqt/liblxqt-0.9.0.ebuild   |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch 
b/lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch
new file mode 100644
index 000..c356dd3
--- /dev/null
+++ b/lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch
@@ -0,0 +1,22 @@
+From 7303ea207de0771d6f450a31ec4a1ce69202869b Mon Sep 17 00:00:00 2001
+From: rezso 
+Date: Sun, 5 Jul 2015 18:46:13 +0200
+Subject: [PATCH] fix build with qt 5.5
+
+(lxqtnotification.h:43:5: error: 'Q_OBJECT' does not name a type)
+---
+ lxqtnotification.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lxqtnotification.h b/lxqtnotification.h
+index 4334a55..2d74504 100644
+--- a/lxqtnotification.h
 b/lxqtnotification.h
+@@ -25,6 +25,7 @@
+ #ifndef LXQTNOTIFICATION_H
+ #define LXQTNOTIFICATION_H
+ 
++#include 
+ #include 
+ #include "lxqtglobals.h"
+ 

diff --git a/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild 
b/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild
index 77deedc..e51251a 100644
--- a/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+
 pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
[[ $(gcc-version) < 4.8 ]] && \