[SCM] kstars packaging branch, master, updated. debian/4.11.3-4-2-gfb6d045

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit fb6d0451d022fc576aa0b4b83546898a14ec4358
Author: Pino Toscano <pino at debian.org>
Date:   Sat Nov 30 20:19:40 2013 +0100

    always the system temporary directory
    
    backport upstream commit 64748ed5e45177224699c4f597d81d6cae3bfcdc
---
 debian/changelog                                   |  4 ++
 debian/patches/series                              |  1 +
 ...eam_tests-always-the-system-temporary-dir.patch | 56 ++++++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 97a243e..9075d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kstars (4:4.11.3-5) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit 64748ed5e45177224699c4f597d81d6cae3bfcdc to just
+    use the system temporary directory, bypassing KDE's one. It should finally
+    allow to run tests with no available $HOME.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 30 Nov 2013 20:17:08 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 978922f..cb98914 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ eigen3.patch
 link_pthread.diff
 upstream_tests-split-init-tearup.patch
 upstream_tests-use-proper-temporary-files.patch
+upstream_tests-always-the-system-temporary-dir.patch
diff --git a/debian/patches/upstream_tests-always-the-system-temporary-dir.patch b/debian/patches/upstream_tests-always-the-system-temporary-dir.patch
new file mode 100644
index 0000000..0232428
--- /dev/null
+++ b/debian/patches/upstream_tests-always-the-system-temporary-dir.patch
@@ -0,0 +1,56 @@
+From 64748ed5e45177224699c4f597d81d6cae3bfcdc Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 30 Nov 2013 20:08:16 +0100
+Subject: [PATCH] tests: always the system temporary dir
+
+the KDE directory might need further directories in $HOME, which we
+don't want to create; hence, force QDir::tempPath() as base directory
+for the temporary files
+---
+ Tests/testcsvparser.cpp | 2 ++
+ Tests/testfwparser.cpp  | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/Tests/testcsvparser.cpp b/Tests/testcsvparser.cpp
+index e4b8bbc..806e105 100644
+--- a/Tests/testcsvparser.cpp
++++ b/Tests/testcsvparser.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include "testcsvparser.h"
+ 
++#include <QDir>
+ #include <ktemporaryfile.h>
+ 
+ TestCSVParser::TestCSVParser(): QObject() {
+@@ -85,6 +86,7 @@ void TestCSVParser::initTestCase() {
+   test_cases_.append(",,,,,,,,,,,
");
+   test_cases_.append("
");
+   KTemporaryFile temp_file;
++  temp_file.setPrefix(QDir::tempPath() + "/");
+   temp_file.setSuffix(".txt");
+   temp_file.setAutoRemove(false);
+   QVERIFY(temp_file.open());
+diff --git a/Tests/testfwparser.cpp b/Tests/testfwparser.cpp
+index 37f5c48..c30716c 100644
+--- a/Tests/testfwparser.cpp
++++ b/Tests/testfwparser.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "testfwparser.h"
+ 
++#include <QDir>
+ #include <ktemporaryfile.h>
+ 
+ TestFWParser::TestFWParser(): QObject() {
+@@ -30,6 +31,7 @@ void TestFWParser::initTestCase() {
+   test_cases_.append("this is an ex

");
+ 
+   KTemporaryFile temp_file;
++  temp_file.setPrefix(QDir::tempPath() + "/");
+   temp_file.setSuffix(".txt");
+   temp_file.setAutoRemove(false);
+   QVERIFY(temp_file.open());
+-- 
+1.8.4.2
+

-- 
kstars packaging