diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
| commit | 706ae8e15c8d36b0aee7c19c54c143d3e17f5784 (patch) | |
| tree | e9fe8ebfb1417d30979b5413165599f066a1c504 /gnu/packages/patches/qtoctave-qt-5.11-fix.patch | |
| parent | 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 (diff) | |
| parent | 8440db459a10daa24282038f35bc0b6771bd51ab (diff) | |
| download | gnu-guix-706ae8e15c8d36b0aee7c19c54c143d3e17f5784.tar gnu-guix-706ae8e15c8d36b0aee7c19c54c143d3e17f5784.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/qtoctave-qt-5.11-fix.patch')
| -rw-r--r-- | gnu/packages/patches/qtoctave-qt-5.11-fix.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/qtoctave-qt-5.11-fix.patch b/gnu/packages/patches/qtoctave-qt-5.11-fix.patch new file mode 100644 index 0000000000..67317d1b36 --- /dev/null +++ b/gnu/packages/patches/qtoctave-qt-5.11-fix.patch @@ -0,0 +1,26 @@ +This patch comes from upstream: +https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1. + +# HG changeset patch +# User Mike Miller <mtmiller@octave.org> +# Date 1527214835 25200 +# Node ID cdaa884568b159549bd373f04386ff62417f6df9 +# Parent 9e39a53b4e007d3f79f88b711ab9fa5f2f24fbc9 +add Qt include needed to build against Qt 5.11 (bug #53978) + +* settings-dialog.cc: Add missing include for <QButtonGroup> to fix build +failure with Qt 5.11. + +diff --git a/libgui/src/settings-dialog.cc b/libgui/src/settings-dialog.cc +--- a/libgui/src/settings-dialog.cc ++++ b/libgui/src/settings-dialog.cc +@@ -34,6 +34,8 @@ + #include "workspace-model.h" + #include "settings-dialog.h" + #include "ui-settings-dialog.h" ++ ++#include <QButtonGroup> + #include <QDir> + #include <QFileInfo> + #include <QFileDialog> + |