[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#906977: parley: diff for NMU version 4:17.08.3-1.1



Control: tags 906977 + pending


Dear maintainer,

I've prepared an NMU for parley (versioned as 4:17.08.3-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.


-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   
diff -Nru parley-17.08.3/debian/changelog parley-17.08.3/debian/changelog
--- parley-17.08.3/debian/changelog	2017-12-02 09:33:57.000000000 +0100
+++ parley-17.08.3/debian/changelog	2018-12-01 00:38:45.000000000 +0100
@@ -1,3 +1,12 @@
+parley (4:17.08.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS in buster/sid ('QItemSelection' does not name a type)":
+    add patch from upstream Git repo to fix build with Qt 5.11.
+    (Closes: #906977)
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 01 Dec 2018 00:38:45 +0100
+
 parley (4:17.08.3-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru parley-17.08.3/debian/patches/qt_5.11.patch parley-17.08.3/debian/patches/qt_5.11.patch
--- parley-17.08.3/debian/patches/qt_5.11.patch	1970-01-01 01:00:00.000000000 +0100
+++ parley-17.08.3/debian/patches/qt_5.11.patch	2018-12-01 00:38:28.000000000 +0100
@@ -0,0 +1,70 @@
+From f57328e2ba2074bd9e53794525984447d426c38b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 17 Mar 2018 20:18:04 +0100
+Subject: Fix build with Qt 5.11 (missing headers)
+
+Reviewers: #kde_edu, aacid
+
+Reviewed By: aacid
+
+Tags: #kde_edu
+
+Differential Revision: https://phabricator.kde.org/D11428
+---
+ src/dashboard/buttondelegate.cpp          | 1 +
+ src/editor/latexwidget.h                  | 1 +
+ src/practice/multiplechoicemodewidget.cpp | 1 +
+ src/statistics/statisticsmainwindow.cpp   | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/src/dashboard/buttondelegate.cpp b/src/dashboard/buttondelegate.cpp
+index a99dcc3..315f069 100644
+--- a/src/dashboard/buttondelegate.cpp
++++ b/src/dashboard/buttondelegate.cpp
+@@ -19,6 +19,7 @@
+ #include <QStandardItemModel>
+ #include <QPainter>
+ #include <QAbstractItemDelegate>
++#include <QAbstractItemView>
+ #include <QApplication>
+ #include <QToolButton>
+ #include <KLocalizedString>
+diff --git a/src/editor/latexwidget.h b/src/editor/latexwidget.h
+index 0424e43..e3156b0 100644
+--- a/src/editor/latexwidget.h
++++ b/src/editor/latexwidget.h
+@@ -16,6 +16,7 @@
+ #include "ui_latexwidget.h"
+ 
+ #include <QItemDelegate>
++#include <QItemSelection>
+ #include <QtWidgets/QWidget>
+ 
+ class QDataWidgetMapper;
+diff --git a/src/practice/multiplechoicemodewidget.cpp b/src/practice/multiplechoicemodewidget.cpp
+index a4eff53..67bd6b5 100644
+--- a/src/practice/multiplechoicemodewidget.cpp
++++ b/src/practice/multiplechoicemodewidget.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include "ui_practice_widget_multiplechoice.h"
+ 
++#include <QAction>
+ #include <QDebug>
+ #include <kcolorscheme.h>
+ #include <QPushButton>
+diff --git a/src/statistics/statisticsmainwindow.cpp b/src/statistics/statisticsmainwindow.cpp
+index 834091c..fe59460 100644
+--- a/src/statistics/statisticsmainwindow.cpp
++++ b/src/statistics/statisticsmainwindow.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "statisticsmainwindow.h"
+ 
++#include <QHeaderView>
+ #include <QtCore/qsignalmapper.h>
+ 
+ #include <KLocalizedString>
+-- 
+cgit v0.11.2
+
diff -Nru parley-17.08.3/debian/patches/series parley-17.08.3/debian/patches/series
--- parley-17.08.3/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ parley-17.08.3/debian/patches/series	2018-12-01 00:38:28.000000000 +0100
@@ -0,0 +1 @@
+qt_5.11.patch

Attachment: signature.asc
Description: Digital Signature


Reply to: