Bug#879756: marble: diff for NMU version 4:17.08.3-3.1

[reiner@reiner-h.de]

Control: tags 879756 + pending

Dear maintainer,

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

Regards.

diff -Nru marble-17.08.3/debian/changelog marble-17.08.3/debian/changelog
--- marble-17.08.3/debian/changelog	2018-01-11 14:31:18.000000000 +0100
+++ marble-17.08.3/debian/changelog	2018-10-27 13:38:29.000000000 +0200
@@ -1,3 +1,11 @@
+marble (4:17.08.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add missing qml-module dependencies for marble-maps. (Closes: #879756)
+  * Add patch to build with Qt 5.11 by including missing headers.
+
+ -- Reiner Herrmann <reiner@reiner-h.de>  Sat, 27 Oct 2018 13:38:29 +0200
+
 marble (4:17.08.3-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru marble-17.08.3/debian/control marble-17.08.3/debian/control
--- marble-17.08.3/debian/control	2018-01-02 20:00:03.000000000 +0100
+++ marble-17.08.3/debian/control	2018-10-27 13:37:34.000000000 +0200
@@ -145,7 +145,12 @@
 Section: misc
 Depends: marble-data (>= ${source:Version}),
          marble-plugins (= ${binary:Version}),
+         qml-module-qtgraphicaleffects,
          qml-module-qtmultimedia,
+         qml-module-qtquick-dialogs,
+         qml-module-qtquick-controls,
+         qml-module-qtquick-controls2,
+         qml-module-qtquick-window2,
          ${misc:Depends},
          ${shlibs:Depends},
 Suggests: gosmore, monav-routing-daemon, routino
diff -Nru marble-17.08.3/debian/patches/qt5.11.patch marble-17.08.3/debian/patches/qt5.11.patch
--- marble-17.08.3/debian/patches/qt5.11.patch	1970-01-01 01:00:00.000000000 +0100
+++ marble-17.08.3/debian/patches/qt5.11.patch	2018-10-27 13:38:29.000000000 +0200
@@ -0,0 +1,58 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Fix build with Qt 5.11
+
+--- a/src/plugins/render/gpsinfo/GpsInfo.cpp
++++ b/src/plugins/render/gpsinfo/GpsInfo.cpp
+@@ -21,6 +21,8 @@
+ #include "ViewportParams.h"
+ #include "GeoDataAccuracy.h"
+ 
++#include <QIcon>
++
+ namespace Marble
+ {
+ 
+--- a/src/plugins/render/speedometer/Speedometer.cpp
++++ b/src/plugins/render/speedometer/Speedometer.cpp
+@@ -19,6 +19,8 @@
+ #include "MarbleGraphicsGridLayout.h"
+ #include "ViewportParams.h"
+ 
++#include <QIcon>
++
+ namespace Marble
+ {
+ 
+--- a/src/lib/marble/RenderPlugin.h
++++ b/src/lib/marble/RenderPlugin.h
+@@ -14,6 +14,9 @@
+ #ifndef MARBLE_RENDERPLUGIN_H
+ #define MARBLE_RENDERPLUGIN_H
+ 
++#include <QAction>
++#include <QActionGroup>
++#include <QStandardItem>
+ #include <QObject>
+ #include <QString>
+ #include <QRegion>
+@@ -22,10 +25,6 @@
+ #include "marble_export.h"
+ 
+ 
+-class QAction;
+-class QActionGroup;
+-class QStandardItem;
+-
+ namespace Marble
+ {
+ 
+--- a/src/plugins/render/satellites/SatellitesPlugin.cpp
++++ b/src/plugins/render/satellites/SatellitesPlugin.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include "ui_SatellitesConfigDialog.h"
+ 
++#include <QAction>
+ #include <QUrl>
+ #include <QMouseEvent>
+ 
diff -Nru marble-17.08.3/debian/patches/series marble-17.08.3/debian/patches/series
--- marble-17.08.3/debian/patches/series	2016-06-04 10:59:56.000000000 +0200
+++ marble-17.08.3/debian/patches/series	2018-10-27 13:38:29.000000000 +0200
@@ -1,2 +1,3 @@
 do_not_install_private_headers
 kubuntu_disable-MarbleRunnerManagerTest.diff
+qt5.11.patch