diff options
| author | Kei Kebreau <kkebreau@posteo.net> | 2018-06-30 20:03:42 -0400 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2018-06-30 20:05:58 -0400 |
| commit | 7a3772b37478a3170e3703b31c9a60b764988c35 (patch) | |
| tree | f552697b6dee8a6f4ba73c7dd851714a371d4d7c | |
| parent | 1314d349396e03c662a271e38d51691229293259 (diff) | |
| download | guix-7a3772b37478a3170e3703b31c9a60b764988c35.tar.gz | |
gnu: qtoctave: Fix build for Qt 5.11.
* gnu/packages/maths.scm (qtoctave)[source]: Add patch. [native-inputs]: Add texlive. * gnu/packages/patches/qtoctave-qt-5.11-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/maths.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/qtoctave-qt-5.11-fix.patch | 26 |
3 files changed, 33 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 58aebf12a2..ce1a2b50f6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1088,6 +1088,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-CVE-2018-11806.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ + %D%/packages/patches/qtoctave-qt-5.11-fix.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quassel-qt-5.11.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f3ada33e08..64b8887e48 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1400,12 +1400,18 @@ script files.") (define-public qtoctave (package (inherit octave) (name "qtoctave") + (source (origin + (inherit (package-source octave)) + (patches (append (origin-patches (package-source octave)) + (search-patches + "qtoctave-qt-5.11-fix.patch"))))) (inputs `(("qscintilla" ,qscintilla) ("qt" ,qtbase) ,@(package-inputs octave))) (native-inputs `(("qttools" , qttools) ;for lrelease + ("texlive" ,texlive) ;for texi2dvi ,@(package-native-inputs octave))) (arguments (substitute-keyword-arguments (package-arguments octave) 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> + |