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 09F12139085 for ; Sun, 29 Jan 2017 14:13:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71DAB1427E; Sun, 29 Jan 2017 14:13:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F35A1427E for ; Sun, 29 Jan 2017 14:13:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FAB23413C3 for ; Sun, 29 Jan 2017 14:13:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A32B939DB for ; Sun, 29 Jan 2017 14:13:22 +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: <1485699194.2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/konsole/files/konsole-16.12.1-ecm531.patch kde-apps/konsole/konsole-16.12.1.ebuild X-VCS-Directories: kde-apps/konsole/files/ kde-apps/konsole/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020 X-VCS-Branch: master Date: Sun, 29 Jan 2017 14:13:22 +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: ad3bb11b-6f73-4d4b-828b-b785022b2512 X-Archives-Hash: ba221c0366eab08274d9984118990341 commit: 2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 29 14:12:34 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 29 14:13:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8f606c kde-apps/konsole: Fix build w/ ECM 5.31 Add upstream patch to fix build w/ upcoming extra-cmake-modules. Thanks-to: karolherbst Package-Manager: portage-2.3.3 .../konsole/files/konsole-16.12.1-ecm531.patch | 22 ++++++++++++++++++++++ kde-apps/konsole/konsole-16.12.1.ebuild | 2 ++ 2 files changed, 24 insertions(+) diff --git a/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch b/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch new file mode 100644 index 00000000..fd22781 --- /dev/null +++ b/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch @@ -0,0 +1,22 @@ +commit 3a055ea19d5f458ccf06a33c697fbcda7a7f14df +Author: Aleix Pol +Date: Wed Jan 18 12:15:00 2017 +0100 + + Fix build + + frameworks/konsole/src/Session.cpp:839:5: warning: 'not' is not defined, + evaluates to 0 [-Wundef] + +diff --git a/src/Session.cpp b/src/Session.cpp +index d63c8a0..482ee0b 100644 +--- a/src/Session.cpp ++++ b/src/Session.cpp +@@ -836,7 +836,7 @@ void Session::sendTextToTerminal(const QString& text, const QChar& eol) const + // Only D-Bus calls this function (via SendText or runCommand) + void Session::sendText(const QString& text) const + { +-#if not defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS) ++#if !defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS) + if (show_disallow_certain_dbus_methods_message) { + + KNotification::event(KNotification::Warning, "Konsole D-Bus Warning", diff --git a/kde-apps/konsole/konsole-16.12.1.ebuild b/kde-apps/konsole/konsole-16.12.1.ebuild index 1070cde..ea4c0fe 100644 --- a/kde-apps/konsole/konsole-16.12.1.ebuild +++ b/kde-apps/konsole/konsole-16.12.1.ebuild @@ -49,6 +49,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-ecm531.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package X X11)