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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     e7040dc794ae9ab66387ceded07e99e3ebd75feb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 15:28:58 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 15:29:15 2015 +0000
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 0000000..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 <rezso@rezso.net>
+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 <QObject>
+ #include <QStringList>
+ #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 ]] && \