From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AE2E213888F for ; Mon, 19 Oct 2015 15:29:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D7CBE0818; Mon, 19 Oct 2015 15:29:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEE04E0818 for ; Mon, 19 Oct 2015 15:29:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F9EF340756 for ; Mon, 19 Oct 2015 15:29:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF60E10F6 for ; Mon, 19 Oct 2015 15:29:23 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1445268555.e7040dc794ae9ab66387ceded07e99e3ebd75feb.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: lxqt-base/liblxqt/, lxqt-base/liblxqt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch lxqt-base/liblxqt/liblxqt-0.9.0.ebuild X-VCS-Directories: lxqt-base/liblxqt/ lxqt-base/liblxqt/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e7040dc794ae9ab66387ceded07e99e3ebd75feb X-VCS-Branch: master Date: Mon, 19 Oct 2015 15:29:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 898babeb-ac75-4208-a0f6-f5c7e4a08b59 X-Archives-Hash: 9e67aad27d47e6e72f779889169f9657 commit: e7040dc794ae9ab66387ceded07e99e3ebd75feb Author: Michael Palimaka gentoo org> AuthorDate: Mon Oct 19 15:28:58 2015 +0000 Commit: Michael Palimaka gentoo 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 +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 ]] && \