Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Grab patch from upstream to fix FTBFS with Qt 5.11.
  * debian/docs: Change README to README.md.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru actiona-3.9.4/debian/docs actiona-3.9.4/debian/docs
--- actiona-3.9.4/debian/docs   2018-06-14 08:44:41.000000000 -0400
+++ actiona-3.9.4/debian/docs   2019-01-06 13:01:52.000000000 -0500
@@ -1 +1 @@
-README
+README.md
diff -Nru actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch 
actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch
--- actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch        1969-12-31 
19:00:00.000000000 -0500
+++ actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch        2019-01-06 
13:01:52.000000000 -0500
@@ -0,0 +1,32 @@
+Description: Fix compilation with Qt 5.11
+Author: Jmgr <j...@jmgr.info>
+Origin: upstream
+Bug: https://github.com/Jmgr/actiona/issues/78
+Applied-Upstream: 
https://github.com/Jmgr/actiona/commit/26437ea8e0ce7ff957e500b0cc0ec3d655d5c3c5
+Last-Update: 2019-01-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/actiontools/abstractcodeeditor.h 
b/actiontools/abstractcodeeditor.h
+index 0b9737e7..690a118a 100644
+--- a/actiontools/abstractcodeeditor.h
++++ b/actiontools/abstractcodeeditor.h
+@@ -24,6 +24,7 @@
+ #include "actiontools_global.h"
+ 
+ #include <QPainter>
++#include <QSet>
+ 
+ class QAbstractItemModel;
+ 
+diff --git a/actiontools/coloredit.cpp b/actiontools/coloredit.cpp
+index e961885e..9f0d5824 100644
+--- a/actiontools/coloredit.cpp
++++ b/actiontools/coloredit.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QColorDialog>
+ #include <QDesktopWidget>
++#include <QRegExpValidator>
+ 
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+ #include <QApplication>
diff -Nru actiona-3.9.4/debian/patches/series 
actiona-3.9.4/debian/patches/series
--- actiona-3.9.4/debian/patches/series 2018-06-14 08:44:41.000000000 -0400
+++ actiona-3.9.4/debian/patches/series 2019-01-06 13:01:47.000000000 -0500
@@ -0,0 +1 @@
+fix-ftbfs-qt-5.11.patch

Reply via email to