[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

["Sam James" <sam@gentoo.org>]

commit:     caca9922a0e508bcc8ebc0dd14cad785ddcc9ff9
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Jul 21 18:32:15 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 21 19:37:56 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caca9922

media-sound/musescore: fix qt6.9 for 4.5.2

backport patches for qt6.9 compatibility, waiting for a next release.

remove the call of qt5_get_bindir

skip few tests

force -fPIC with CMAKE_POSITION_INDEPENDENT_CODE

Bug: https://bugs.gentoo.org/958618
Closes: https://bugs.gentoo.org/958259
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43102
Closes: https://github.com/gentoo/gentoo/pull/43102
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/musescore/Manifest               |  1 +
 media-sound/musescore/musescore-4.5.2.ebuild | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 40f75159643a..4a4d932d8f63 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-4.4.4.tar.gz 143607247 BLAKE2B 934b95d51bb667be57101ebc7528dbb04cbb9a10501da7e8a5aea11e34fd45817b55072a1094bf1731aab4a9b1765a8582fa997502c1f1ca90097d492e120bfa SHA512 1e1d3f9018cb5f30e2e76a98673c03097ae3d0982e14a25df3b3b8a8f5d191968c470ba548e05afb6c5fbc6dce8b4c8a3112b99a70341fb285ced257d5df0ee8
+DIST musescore-4.5.2-fix_qt69.patch.xz 7348 BLAKE2B eeb13290eb99f90aec6750ad23711acc8de9bb17d599a7b0e765ccdfbe2ed979f56f75f951d76f6257547b48e636110a9bf17b7ec2e344feadccc5b4ff521452 SHA512 012a67742160e1a0f05cfed67087f77bae375613a6c4a2c7c31c60e475c50c80a450ad886dd9c8893bba1af0874800f3f8cc77cfea73f329993f50502baceb96
 DIST musescore-4.5.2.tar.gz 144700695 BLAKE2B b92eecc10b34dee033434568f7f9a9a1943159b42ef70ff0128da6bf6637d06ef896e035f4add5803c2223a846cd72242d410f24852b0018b9297b559ca6bb94 SHA512 5175626ed78774973548fee5a91de9ec10ed1e8d6ade00cdea21d4a2430c425f3cb1e02af9904270cd65c3fc37625811d17047eea2d13df5cab2d901232454f2

diff --git a/media-sound/musescore/musescore-4.5.2.ebuild b/media-sound/musescore/musescore-4.5.2.ebuild
index 2cccab04bde9..ae5812f543d4 100644
--- a/media-sound/musescore/musescore-4.5.2.ebuild
+++ b/media-sound/musescore/musescore-4.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 CHECKREQS_DISK_BUILD=3500M
 VIRTUALX_REQUIRED="test"
-inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
+inherit cmake flag-o-matic xdg check-reqs virtualx
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -13,6 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="
 		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix_qt69.patch.xz
 	"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/MuseScore-${PV}"
@@ -63,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 	"${FILESDIR}/${PN}-4.4.0-include.patch"
 	"${FILESDIR}/${PN}-4.5.0-missing-includes.patch"
+	"${WORKDIR}/${P}-fix_qt69.patch"
 )
 
 src_unpack() {
@@ -85,10 +87,8 @@ src_configure() {
 	# confuses rcc, bug #908808
 	filter-lto
 
-	# bug #766111
-	export PATH="$(qt5_get_bindir):${PATH}"
-
 	local mycmakeargs=(
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON # https://github.com/musescore/MuseScore/issues/28797
 		-DCMAKE_BUILD_TYPE="release"
 		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
 		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
@@ -127,6 +127,11 @@ src_test() {
 	CMAKE_SKIP_TESTS=(
 		# bug #950450
 		iex_musicxml_tests
+		# https://github.com/musescore/MuseScore/issues/22500
+		# fixed upstream
+		notation_tests
+		# it fails with gcc only, to investigate
+		muse_global_tests
 	)
 
 	virtx cmake_src_test