[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-15-gc4bb01c

Maximiliano Curia maxy at moszumanska.debian.org
Mon Mar 27 12:31:44 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=5400289

The following commit has been merged in the master branch:
commit 54002895301286e4e374513af77d385bb8090d16
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 27 13:42:49 2017 +0200

    Add upstream patch: Fix-build.patch
---
 debian/patches/Fix-build.patch | 23 +++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/Fix-build.patch b/debian/patches/Fix-build.patch
new file mode 100644
index 0000000..1a854c6
--- /dev/null
+++ b/debian/patches/Fix-build.patch
@@ -0,0 +1,23 @@
+From: Aleix Pol <aleixpol at kde.org>
+Date: Wed, 18 Jan 2017 12:15:00 +0100
+Subject: Fix build
+
+frameworks/konsole/src/Session.cpp:839:5: warning: 'not' is not defined,
+evaluates to 0 [-Wundef]
+---
+ src/Session.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Session.cpp b/src/Session.cpp
+index d63c8a0c..482ee0b6 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/debian/patches/series b/debian/patches/series
index 22ec607..de12d28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Pre-process-the-e-custom-command-argument.patch
 upstream_render_text_at_primary_fonts_baseline.patch
 Add-nofork-as-compatibility-alias-for-separate.patch
+Fix-build.patch

-- 
konsole packaging



More information about the pkg-kde-commits mailing list