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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7428915815E for ; Tue, 6 Feb 2024 19:47:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE937E29D0; Tue, 6 Feb 2024 19:47:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90C5EE29D0 for ; Tue, 6 Feb 2024 19:47:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C099F343028 for ; Tue, 6 Feb 2024 19:47:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35E94ACA for ; Tue, 6 Feb 2024 19:47:13 +0000 (UTC) From: "Jason A. Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" Message-ID: <1707248820.178e455e0d340ab8b4b79273a80acde620df6653.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/musescore/files/musescore-4.2.0-missing-headers.patch media-sound/musescore/files/musescore-4.2.1-missing-headers.patch media-sound/musescore/musescore-4.2.1-r1.ebuild media-sound/musescore/musescore-4.2.1-r2.ebuild media-sound/musescore/musescore-9999.ebuild X-VCS-Directories: media-sound/musescore/ media-sound/musescore/files/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: 178e455e0d340ab8b4b79273a80acde620df6653 X-VCS-Branch: master Date: Tue, 6 Feb 2024 19:47:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0770471f-2861-46de-a02d-d14e1711a233 X-Archives-Hash: 2ee8dbd8bb1056d98b5720130f928367 commit: 178e455e0d340ab8b4b79273a80acde620df6653 Author: Jason A. Donenfeld gentoo org> AuthorDate: Tue Feb 6 19:44:25 2024 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Tue Feb 6 19:47:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178e455e media-sound/musescore: update missing headers patch for 4.2.1 Signed-off-by: Jason A. Donenfeld gentoo.org> ...patch => musescore-4.2.1-missing-headers.patch} | 22 ++++++++++++++++++++++ ...e-4.2.1-r1.ebuild => musescore-4.2.1-r2.ebuild} | 2 +- media-sound/musescore/musescore-9999.ebuild | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch similarity index 61% rename from media-sound/musescore/files/musescore-4.2.0-missing-headers.patch rename to media-sound/musescore/files/musescore-4.2.1-missing-headers.patch index 2a40ccc00c35..56ae1f4fa2d6 100644 --- a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch +++ b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch @@ -18,6 +18,17 @@ #include "modularity/ioc.h" #include "../iinteractiveprovider.h" +--- a/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp ++++ b/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp +@@ -34,6 +34,8 @@ + + #include "log.h" + ++#include ++ + using AccidentalType = mu::engraving::AccidentalType; + using SymId = mu::engraving::SymId; + const static std::map smuflAccidentalTypes { --- a/src/importexport/videoexport/internal/videowriter.cpp +++ b/src/importexport/videoexport/internal/videowriter.cpp @@ -32,6 +32,8 @@ @@ -39,3 +50,14 @@ #include "async/asyncable.h" +--- a/src/project/internal/exporttype.h ++++ b/src/project/internal/exporttype.h +@@ -23,6 +23,8 @@ + #define MU_PROJECT_EXPORTTYPE_H + + #include ++#include ++#include + + #include "containers.h" + diff --git a/media-sound/musescore/musescore-4.2.1-r1.ebuild b/media-sound/musescore/musescore-4.2.1-r2.ebuild similarity index 98% rename from media-sound/musescore/musescore-4.2.1-r1.ebuild rename to media-sound/musescore/musescore-4.2.1-r2.ebuild index cb7e3aaf3288..de9540eac6c5 100644 --- a/media-sound/musescore/musescore-4.2.1-r1.ebuild +++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild @@ -70,8 +70,8 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch" "${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch" - "${FILESDIR}/${PN}-4.2.0-missing-headers.patch" "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch" + "${FILESDIR}/${PN}-4.2.1-missing-headers.patch" ) src_unpack() { diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index cb7e3aaf3288..de9540eac6c5 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -70,8 +70,8 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch" "${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch" - "${FILESDIR}/${PN}-4.2.0-missing-headers.patch" "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch" + "${FILESDIR}/${PN}-4.2.1-missing-headers.patch" ) src_unpack() {