[SCM] kcalcore packaging branch, master, updated. debian/4%17.08.0-1-9-g6dafe81

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 21bfd1f8d24edb600b621d9dce08621bbf1a3364
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 12 20:17:14 2017 +0100

    fix build with qt 5.9+ (#877313)
    
    backport upstream commit 93b2da839a298aab705c1865ee65e009aef53a55
---
 debian/changelog                                   |  4 +++
 debian/patches/series                              |  1 +
 ...rom-qt_qhash_seed-which-is-going-away-in-.patch | 38 ++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2c877c3..a26390f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ kcalcore (4:16.04.2-2) UNRELEASED; urgency=medium
   * Switch build & runtime dependencies from libical-dev to libical2-dev:
     kcalcore does not support libical3 yet, so use libical2 for now.
     (Closes: #883960)
+  * Backport upstream commit 93b2da839a298aab705c1865ee65e009aef53a55 to fix
+    build with Qt >= 5.9; patch
+    upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch.
+    (Closes: #877313)
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 12 Dec 2017 20:04:42 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4ac33ae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch
diff --git a/debian/patches/upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch b/debian/patches/upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch
new file mode 100644
index 0000000..4e074df
--- /dev/null
+++ b/debian/patches/upstream_Port-away-from-qt_qhash_seed-which-is-going-away-in-.patch
@@ -0,0 +1,38 @@
+From 93b2da839a298aab705c1865ee65e009aef53a55 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Wed, 15 Mar 2017 08:47:53 +0100
+Subject: [PATCH] Port away from qt_qhash_seed which is going away in Qt 5.9
+
+https://codereview.qt-project.org/188474
+---
+ autotests/readandwrite.cpp | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/autotests/readandwrite.cpp b/autotests/readandwrite.cpp
+index 0c3e969d3..8ebd0cbd9 100644
+--- a/autotests/readandwrite.cpp
++++ b/autotests/readandwrite.cpp
+@@ -36,11 +36,9 @@
+ 
+ using namespace KCalCore;
+ 
+-extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; // from qhash.cpp
+-
+ int main(int argc, char **argv)
+ {
+-    qt_qhash_seed.fetchAndStoreRelaxed(0); // Disable QHash randomness
++    qSetGlobalQHashSeed(0); // Disable QHash randomness
+ 
+     QCommandLineParser parser;
+     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("verbose"), i18n("Verbose output")));
+@@ -58,7 +56,6 @@ int main(int argc, char **argv)
+     QCoreApplication::setApplicationVersion(QStringLiteral("0.1"));
+     parser.process(app);
+     about.processCommandLine(&parser);
+-    // KComponentData componentData(&about);   // needed by KConfig used by KSaveFile TODO: still needed ?
+ 
+     const QStringList parsedArgs = parser.positionalArguments();
+     if (parsedArgs.count() != 2) {
+-- 
+2.15.1
+

-- 
kcalcore packaging