Control: tags 906761 + patch
Control: tags 906761 + pending
Dear maintainer,
I've prepared an NMU for librecad (versioned as 2.1.3-1.1) and uploaded
it to DELAYED/14. 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 librecad-2.1.3/debian/changelog librecad-2.1.3/debian/changelog
--- librecad-2.1.3/debian/changelog 2018-03-24 18:39:10.000000000 +0200
+++ librecad-2.1.3/debian/changelog 2018-09-17 20:23:30.000000000 +0300
@@ -1,3 +1,11 @@
+librecad (2.1.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with Qt 5.11,
+ thanks to Reiner Herrmann. (Closes: #906761)
+
+ -- Adrian Bunk <[email protected]> Mon, 17 Sep 2018 20:23:30 +0300
+
librecad (2.1.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru librecad-2.1.3/debian/patches/0001-fix-build-with-Qt-5.11.patch librecad-2.1.3/debian/patches/0001-fix-build-with-Qt-5.11.patch
--- librecad-2.1.3/debian/patches/0001-fix-build-with-Qt-5.11.patch 1970-01-01 02:00:00.000000000 +0200
+++ librecad-2.1.3/debian/patches/0001-fix-build-with-Qt-5.11.patch 2018-09-17 20:23:30.000000000 +0300
@@ -0,0 +1,28 @@
+From 6c392e903e162b9283e88f53006e929663f2e883 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <[email protected]>
+Date: Mon, 11 Jun 2018 10:44:00 +0200
+Subject: fix build with Qt 5.11
+
+The new Qt removed some implicit inclusions of headers. To avoid build
+errors, add explicit includes of those we use in the sources.
+
+Signed-off-by: Jiri Slaby <[email protected]>
+---
+ librecad/src/ui/forms/qg_commandwidget.cpp | 1 +
+ librecad/src/ui/generic/colorwizard.cpp | 1 +
+ librecad/src/ui/generic/widgetcreator.cpp | 2 ++
+ 3 files changed, 4 insertions(+)
+
+Index: librecad-2.1.3/librecad/src/ui/generic/widgetcreator.cpp
+===================================================================
+--- librecad-2.1.3.orig/librecad/src/ui/generic/widgetcreator.cpp
++++ librecad-2.1.3/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,8 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+
++#include <QAction>
++#include <QActionGroup>
+ #include <QSettings>
+ #include <QLineEdit>
+ #include <QPushButton>
diff -Nru librecad-2.1.3/debian/patches/series librecad-2.1.3/debian/patches/series
--- librecad-2.1.3/debian/patches/series 2018-03-24 18:39:10.000000000 +0200
+++ librecad-2.1.3/debian/patches/series 2018-09-17 20:23:29.000000000 +0300
@@ -1,2 +1,3 @@
debian_build.patch
librecad-desktop.pach
+0001-fix-build-with-Qt-5.11.patch
