diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
| commit | 82b695b834f88c5561de40e68f3fe7aa24d3b796 (patch) | |
| tree | 41743fff1013584ee4a50852a94cff01c3cc3d1c /gnu/packages/video.scm | |
| parent | fe365a3d0e4df7445bf16d3bb422a0bc6bb68ceb (diff) | |
| parent | ee3c8fbee21299ce105bafca7dc63bfb096cd7c5 (diff) | |
| download | patches-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar patches-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 32b3257dc9..dc71780514 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -885,6 +885,13 @@ audio/video codec library.") ;; XXX Likely not needed for >2.2.6. (substitute* "modules/gui/qt4/components/interface_widgets.cpp" (("<qx11info_x11.h>") "<QtX11Extras/qx11info_x11.h>")) + ;; Fix build against Qt 5.11. + (substitute* "modules/gui/qt4/actions_manager.cpp" + (("#include <vlc_keys.h>") "#include <vlc_keys.h> +#include <QAction>")) + (substitute* "modules/gui/qt4/components/simple_preferences.cpp" + (("#include <QFont>") "#include <QFont> +#include <QButtonGroup>")) #t))) (add-after 'install 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) |