[SCM] Packaging of KVIrc branch, master, updated. debian/4%4.2.0-2-10-g352300d

[Andrey Rahmatullin]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=commitdiff;h=7dd15ec

The following commit has been merged in the master branch:
commit 7dd15eced75bfccd9eb8aad243f4e926d2aedc53
Author: Andrey Rahmatullin <wrar at debian.org>
Date:   Fri Nov 4 19:07:02 2016 +0500

    Fix building in C++14 mode.
---
 debian/patches/31_c++14.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/31_c++14.patch b/debian/patches/31_c++14.patch
new file mode 100644
index 0000000..5d45efa
--- /dev/null
+++ b/debian/patches/31_c++14.patch
@@ -0,0 +1,31 @@
+Description: Fixes FTBFS with gcc 6.
+ Fixes invalid conversion errors. Also fixes two wrong flag operations, already
+ fixed upstream (in 0d14434b and 934fa2e1).
+Author: Andrey Rahmatullin <wrar at debian.org>
+Bug-Debian: https://bugs.debian.org/811908
+Last-Update: 2016-11-04
+
+diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
+index f925ca7..1266b46 100644
+--- a/src/kvirc/kernel/KviIrcConnection.cpp
++++ b/src/kvirc/kernel/KviIrcConnection.cpp
+@@ -669,7 +669,8 @@ void KviIrcConnection::closeAllChannels()
+ 	while(m_pChannelList->first())
+ 	{
+ 		m_pChannelList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(f);
+ 	}
+ }
+ 
+@@ -678,7 +679,8 @@ void KviIrcConnection::closeAllQueries()
+ 	while(m_pQueryList->first())
+ 	{
+ 		m_pQueryList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(f);
+ 	}
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7b4cb9f..37513c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 21_make_shared-mime-info_B-D_superfluous.patch
 22_use_old_.protocol_file_names.patch
 30_upstream_build-g
+31_c++14.patch

-- 
Packaging of KVIrc