Control: tags 906971 + pending
Dear maintainer,
I've prepared an NMU for apper (versioned as 1.0.0-1.1) and uploaded
it to DELAYED/15. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru apper-1.0.0/debian/changelog apper-1.0.0/debian/changelog
--- apper-1.0.0/debian/changelog 2018-02-21 21:38:26.000000000 +0200
+++ apper-1.0.0/debian/changelog 2018-09-22 22:39:11.000000000 +0300
@@ -1,3 +1,11 @@
+apper (1.0.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with Qt 5.11,
+ thanks to Reiner Herrmann. (Closes: #906971)
+
+ -- Adrian Bunk <[email protected]> Sat, 22 Sep 2018 22:39:11 +0300
+
apper (1.0.0-1) unstable; urgency=medium
* New upstream version: 1.0.0
diff -Nru apper-1.0.0/debian/patches/0001-Fix-build-against-Qt-5.11.patch apper-1.0.0/debian/patches/0001-Fix-build-against-Qt-5.11.patch
--- apper-1.0.0/debian/patches/0001-Fix-build-against-Qt-5.11.patch 1970-01-01 02:00:00.000000000 +0200
+++ apper-1.0.0/debian/patches/0001-Fix-build-against-Qt-5.11.patch 2018-09-22 22:13:36.000000000 +0300
@@ -0,0 +1,37 @@
+From d8960ea9097e5a324acd04ce3f03f2d8bfe88df6 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <[email protected]>
+Date: Tue, 31 Jul 2018 09:45:37 -0500
+Subject: Fix build against Qt 5.11+
+
+---
+ Apper/Settings/Settings.cpp | 1 +
+ libapper/Requirements.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Apper/Settings/Settings.cpp b/Apper/Settings/Settings.cpp
+index e077b8e..615d86d 100644
+--- a/Apper/Settings/Settings.cpp
++++ b/Apper/Settings/Settings.cpp
+@@ -27,6 +27,7 @@
+ #include <Enum.h>
+ #include <PkStrings.h>
+
++#include <QAction>
+ #include <QTimer>
+ #include <QSortFilterProxyModel>
+
+diff --git a/libapper/Requirements.h b/libapper/Requirements.h
+index 730644b..8325326 100644
+--- a/libapper/Requirements.h
++++ b/libapper/Requirements.h
+@@ -23,6 +23,7 @@
+
+ #include <QDialog>
+
++#include <QButtonGroup>
+ #include <QToolButton>
+
+ namespace Ui {
+--
+2.11.0
+
diff -Nru apper-1.0.0/debian/patches/series apper-1.0.0/debian/patches/series
--- apper-1.0.0/debian/patches/series 2018-02-21 21:38:26.000000000 +0200
+++ apper-1.0.0/debian/patches/series 2018-09-22 22:39:11.000000000 +0300
@@ -1 +1,2 @@
01_fix-build-with-editorigins.patch
+0001-Fix-build-against-Qt-5.11.patch
