[SCM] kate packaging branch, master, updated. debian/4.12.4-1-6-gc7f564c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kate.git;a=commitdiff;h=c7f564c

The following commit has been merged in the master branch:
commit c7f564c6872d533f5ceaa3c66918d82ee85f8464
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri May 23 14:50:33 2014 +0200

    New patch: sideeffects_in_asserts_are_evil.patch
---
 debian/changelog                                   |  1 +
 .../patches/sideeffects_in_asserts_are_evil.patch  | 35 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 95ae928..2f0683a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kate (4:4.13.1-1~) UNRELEASED; urgency=medium
   * New upstream release.
   * Add pate plugin, sync with kubuntu package.
   * Update install files.
+  * New patch: sideeffects_in_asserts_are_evil.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 23 May 2014 13:21:10 +0200
 
diff --git a/debian/patches/sideeffects_in_asserts_are_evil.patch b/debian/patches/sideeffects_in_asserts_are_evil.patch
new file mode 100644
index 0000000..2681599
--- /dev/null
+++ b/debian/patches/sideeffects_in_asserts_are_evil.patch
@@ -0,0 +1,35 @@
+Index: kate/tests/katetextbuffertest.cpp
+===================================================================
+--- kate.orig/tests/katetextbuffertest.cpp	2014-05-23 14:47:39.895148666 +0200
++++ kate/tests/katetextbuffertest.cpp	2014-05-23 14:49:18.923218852 +0200
+@@ -417,12 +417,16 @@
+ {
+   const QString folder_name = QString("katetest_%1").arg(QCoreApplication::applicationPid());
+   const QString file_path = QDir::tempPath() + '/' + folder_name + "/foo";
+-  Q_ASSERT(QDir::temp().mkdir(folder_name));
++  bool result = QDir::temp().mkdir(folder_name);
++  Q_ASSERT(result);
+ 
+   QFile f(file_path);
+-  Q_ASSERT(f.open(QIODevice::WriteOnly | QIODevice::Truncate));
++
++  result = f.open(QIODevice::WriteOnly | QIODevice::Truncate);
++  Q_ASSERT(result);
+   f.write("1234567890");
+-  Q_ASSERT(f.flush());
++  result = f.flush();
++  Q_ASSERT(result);
+   f.close();
+ 
+   QFile::setPermissions(QDir::tempPath() + '/' + folder_name, QFile::ExeOwner);
+@@ -444,6 +448,8 @@
+   f.close();
+ 
+   QFile::setPermissions(QDir::tempPath() + '/' + folder_name, QFile::WriteOwner | QFile::ExeOwner);
+-  Q_ASSERT(f.remove());
+-  Q_ASSERT(QDir::temp().rmdir(folder_name));
++  result = f.remove();
++  Q_ASSERT(result);
++  result = QDir::temp().rmdir(folder_name);
++  Q_ASSERT(result);
+ }

-- 
kate packaging