[SCM] plasma-workspace packaging branch, master, updated. debian/5.3.2-2-4-gec62bbf

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=4d03dc4

The following commit has been merged in the master branch:
commit 4d03dc4499fa4a432a27850cb5806ca8b7a5e337
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jul 19 17:22:31 2015 +0200

    Fix FTBFS on mips(el).
---
 debian/changelog                          |  5 +++++
 debian/patches/check_signals_defined.diff | 34 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 53d754a..0398755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 plasma-workspace (4:5.3.2-3~) UNRELEASED; urgency=medium
 
+  [ Maximiliano Curia ]
   * Add Breaks to kde4 version of plasma-desktop. (Closes: #792666) Thanks to
     Reuben
 
+  [ Felix Geyer ]
+  * Fix FTBFS on mips(el).
+    - Add check_signals_defined.diff
+
  -- Maximiliano Curia <maxy at debian.org>  Sat, 18 Jul 2015 18:26:10 +0200
 
 plasma-workspace (4:5.3.2-2) unstable; urgency=medium
diff --git a/debian/patches/check_signals_defined.diff b/debian/patches/check_signals_defined.diff
new file mode 100644
index 0000000..66592a6
--- /dev/null
+++ b/debian/patches/check_signals_defined.diff
@@ -0,0 +1,34 @@
+Description: Test if signals are defined before using them.
+Author: Felix Geyer <fgeyer at debian.org>
+Forwarded: https://git.reviewboard.kde.org/r/124395/
+
+--- plasma-workspace-5.3.2.orig/ksmserver/screenlocker/greeter/autotests/killtest.cpp
++++ plasma-workspace-5.3.2/ksmserver/screenlocker/greeter/autotests/killtest.cpp
+@@ -76,9 +76,13 @@ void KillTest::testKill_data()
+     //QTest::newRow("SIGPWR")    << SIGPWR;
+     QTest::newRow("SIGSYS")      << SIGSYS    << true << QProcess::CrashExit;
+ #ifdef Q_OS_LINUX
++#ifdef SIGUNUSED
+     QTest::newRow("SIGUNUSED")   << SIGUNUSED << true << QProcess::CrashExit;
++#endif
++#ifdef SIGSTKFLT
+     QTest::newRow("SIGSTKFLT")   << SIGSTKFLT << true  << QProcess::CrashExit;
+ #endif
++#endif
+ }
+ 
+ void KillTest::testKill()
+@@ -148,9 +152,13 @@ void KillTest::testImmediateKill_data()
+     //QTest::newRow("SIGPWR")    << SIGPWR;
+     QTest::newRow("SIGSYS")      << SIGSYS;
+ #ifdef Q_OS_LINUX
++#ifdef SIGSTKFLT
+     QTest::newRow("SIGSTKFLT")   << SIGSTKFLT;
++#endif
++#ifdef SIGUNUSED
+     QTest::newRow("SIGUNUSED")   << SIGUNUSED;
+ #endif
++#endif
+ }
+ 
+ void KillTest::testImmediateKill()
diff --git a/debian/patches/series b/debian/patches/series
index 2e17e2c..4e24552 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kubuntu_startkde-qtpath.diff
 install_missing_header
 plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
+check_signals_defined.diff

-- 
plasma-workspace packaging