From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42B321382C5 for ; Tue, 10 Apr 2018 20:09:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59103E0ACE; Tue, 10 Apr 2018 20:09:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B9C1E0ACE for ; Tue, 10 Apr 2018 20:09:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BE61335C09 for ; Tue, 10 Apr 2018 20:09:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9E0723F for ; Tue, 10 Apr 2018 20:09:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1523390967.abdd68c0fd6d25581387d76d14b6228f0582fa73.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/juffed/files/, app-editors/juffed/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch app-editors/juffed/juffed-0.10_p20160323-r1.ebuild X-VCS-Directories: app-editors/juffed/files/ app-editors/juffed/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: abdd68c0fd6d25581387d76d14b6228f0582fa73 X-VCS-Branch: master Date: Tue, 10 Apr 2018 20:09:40 +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: 28c1eac2-4ad8-49da-b73f-d956c74a3fad X-Archives-Hash: 3cdc5b57e331cd19465b1c0d63ba19ef commit: abdd68c0fd6d25581387d76d14b6228f0582fa73 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 10 19:45:40 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 10 20:09:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abdd68c0 app-editors/juffed: Fix build with Qt-5.11 Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../files/juffed-0.10_p20160323-qt-5.11.patch | 28 ++++++++++++++++++++++ app-editors/juffed/juffed-0.10_p20160323-r1.ebuild | 5 +++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch new file mode 100644 index 00000000000..4dfa7fae31f --- /dev/null +++ b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch @@ -0,0 +1,28 @@ +From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 10 Apr 2018 19:43:17 +0200 +Subject: [PATCH] Fix build with Qt 5.11 + +--- + plugins/keybindings/KeysPage.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp +index 6579e3e..e68b039 100644 +--- a/plugins/keybindings/KeysPage.cpp ++++ b/plugins/keybindings/KeysPage.cpp +@@ -1,9 +1,10 @@ + #include "KeysPage.h" + +-#include ++#include + #include + #include + #include ++#include + + #include "KeySettings.h" + #include "Log.h" +-- +2.17.0 + diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild index e8118beedc9..97e18f2d896 100644 --- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild +++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild @@ -29,7 +29,10 @@ DEPEND="${RDEPEND}" DOCS=( ChangeLog README ) -PATCHES=( "${FILESDIR}/${P}-qscintilla-2.10.patch" ) +PATCHES=( + "${FILESDIR}/${P}-qscintilla-2.10.patch" + "${FILESDIR}/${P}-qt-5.11.patch" +) src_prepare() { # Upstream version outdated/dysfunctional and CRLF terminated