diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-29 15:12:34 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-29 15:13:14 +0100 |
| commit | 2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020 (patch) | |
| tree | 85d950243c69ae8624cffd4ce502a8d90b14d3df /kde-apps/konsole | |
| parent | app-admin/collectd: Block too old sys-apps/openrc version (bug #607476) (diff) | |
| download | gentoo-2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020.tar.gz gentoo-2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020.tar.bz2 gentoo-2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020.zip | |
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
Diffstat (limited to 'kde-apps/konsole')
| -rw-r--r-- | kde-apps/konsole/files/konsole-16.12.1-ecm531.patch | 22 | ||||
| -rw-r--r-- | kde-apps/konsole/konsole-16.12.1.ebuild | 2 |
2 files changed, 24 insertions, 0 deletions
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 000000000000..fd22781b3375 --- /dev/null +++ b/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch @@ -0,0 +1,22 @@ +commit 3a055ea19d5f458ccf06a33c697fbcda7a7f14df +Author: Aleix Pol <aleixpol@kde.org> +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 1070cde13ade..ea4c0fec62d1 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) |