diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2018-07-09 04:19:49 +0300 |
|---|---|---|
| committer |   Tony Vroon <chainsaw@gentoo.org> | 2018-07-13 10:36:16 +0100 |
| commit | 6b776b26f210470caae41bfdaa53606f156697b5 (patch) | |
| tree | 5cc0b04e41c087e9e96a22f223d0730e1b5b57c4 /media-video/obs-studio | |
| parent | media-video/obs-studio: add USE="speexdsp" (diff) | |
| download | gentoo-6b776b26f210470caae41bfdaa53606f156697b5.tar.gz gentoo-6b776b26f210470caae41bfdaa53606f156697b5.tar.bz2 gentoo-6b776b26f210470caae41bfdaa53606f156697b5.zip | |
media-video/obs-studio: fix build with Qt 5.11
Upstream commit: https://github.com/obsproject/obs-studio/commit/4fd06b98
Closes: https://bugs.gentoo.org/660350
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Diffstat (limited to 'media-video/obs-studio')
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch | 28 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-21.0.2.ebuild | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch new file mode 100644 index 000000000000..6eb7f7c3ca8d --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch @@ -0,0 +1,28 @@ +From 4fd06b9825465ae5eb2a9b862cdb89098f655f14 Mon Sep 17 00:00:00 2001 +From: Jimi Huotari <chiitoo@gentoo.org> +Date: Sat, 17 Mar 2018 18:16:39 +0200 +Subject: [PATCH] frontend-tools: Include 'QAction' to fix build against Qt + 5.11 + +Some headers are no longer unconditionally included, leading to +build failures. + +http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8 +http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8 +http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f +--- + UI/frontend-plugins/frontend-tools/scripts.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/UI/frontend-plugins/frontend-tools/scripts.cpp b/UI/frontend-plugins/frontend-tools/scripts.cpp +index d923dcf610..364757e48b 100644 +--- a/UI/frontend-plugins/frontend-tools/scripts.cpp ++++ b/UI/frontend-plugins/frontend-tools/scripts.cpp +@@ -12,6 +12,7 @@ + #include <QFont> + #include <QDialogButtonBox> + #include <QResizeEvent> ++#include <QAction> + + #include <obs.hpp> + #include <obs-module.h> diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-21.0.2.ebuild index db4647c07d16..a8842b169dc0 100644 --- a/media-video/obs-studio/obs-studio-21.0.2.ebuild +++ b/media-video/obs-studio/obs-studio-21.0.2.ebuild @@ -55,6 +55,8 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" +PATCHES="${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch" + CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) src_configure() { |