From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8D24138334 for ; Fri, 13 Jul 2018 09:36:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60D28E0986; Fri, 13 Jul 2018 09:36:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2259CE0986 for ; Fri, 13 Jul 2018 09:36:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECEDE33BF01 for ; Fri, 13 Jul 2018 09:36:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85F00371 for ; Fri, 13 Jul 2018 09:36:34 +0000 (UTC) From: "Tony Vroon" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tony Vroon" Message-ID: <1531474576.6b776b26f210470caae41bfdaa53606f156697b5.chainsaw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/files/, media-video/obs-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch media-video/obs-studio/obs-studio-21.0.2.ebuild X-VCS-Directories: media-video/obs-studio/files/ media-video/obs-studio/ X-VCS-Committer: chainsaw X-VCS-Committer-Name: Tony Vroon X-VCS-Revision: 6b776b26f210470caae41bfdaa53606f156697b5 X-VCS-Branch: master Date: Fri, 13 Jul 2018 09:36:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 91fd384e-1305-4824-a702-4a154b2b6669 X-Archives-Hash: 30836e5c746e8c862205a67d4499e14f commit: 6b776b26f210470caae41bfdaa53606f156697b5 Author: Jimi Huotari gentoo org> AuthorDate: Mon Jul 9 01:19:49 2018 +0000 Commit: Tony Vroon gentoo org> CommitDate: Fri Jul 13 09:36:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b776b26 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 .../files/obs-studio-21.0.2-qt-5.11.0.patch | 28 ++++++++++++++++++++++ media-video/obs-studio/obs-studio-21.0.2.ebuild | 2 ++ 2 files changed, 30 insertions(+) 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 00000000000..6eb7f7c3ca8 --- /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 +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 + #include + #include ++#include + + #include + #include 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 db4647c07d1..a8842b169dc 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() {