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 AD8B7159C9B for ; Sat, 10 Aug 2024 07:52:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 051472BC207; Sat, 10 Aug 2024 07:52:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 DC49A2BC207 for ; Sat, 10 Aug 2024 07:52:35 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0477D335D72 for ; Sat, 10 Aug 2024 07:52:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F58F1EB4 for ; Sat, 10 Aug 2024 07:52:33 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1723276349.792e62986c7be8a0a683cd76a3f5048f723b8d4b.fordfrog@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.4.0-unbundle-harfbuzz.patch media-sound/musescore/musescore-9999.ebuild X-VCS-Directories: media-sound/musescore/files/ media-sound/musescore/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 792e62986c7be8a0a683cd76a3f5048f723b8d4b X-VCS-Branch: master Date: Sat, 10 Aug 2024 07:52:33 +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: 9ff76925-953e-403e-837b-4bd449ee3eb5 X-Archives-Hash: d97b4063ae43a5eafabb506aefc71d3c commit: 792e62986c7be8a0a683cd76a3f5048f723b8d4b Author: Miroslav Šulc gentoo org> AuthorDate: Sat Aug 10 07:52:09 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Aug 10 07:52:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792e6298 media-sound/musescore: updated live ebuild Signed-off-by: Miroslav Šulc gentoo.org> .../files/musescore-4.4.0-unbundle-harfbuzz.patch | 25 ++++++++++++++++++++++ media-sound/musescore/musescore-9999.ebuild | 19 ++++++++++------ 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch new file mode 100644 index 000000000000..b9a1247a78c1 --- /dev/null +++ b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch @@ -0,0 +1,25 @@ +--- a/src/framework/draw/CMakeLists.txt ++++ b/src/framework/draw/CMakeLists.txt +@@ -123,20 +123,14 @@ else() + include(${local_path}/harfbuzz.cmake) + + # func from ${name}.cmake) +- cmake_language(CALL harfbuzz_Populate ${remote_url} ${local_path} "source" "" "") + +- add_subdirectory(_deps/harfbuzz/harfbuzz) +- target_no_warning(harfbuzz -Wno-conversion) +- target_no_warning(harfbuzz -Wno-unused-parameter) +- target_no_warning(harfbuzz -Wno-unused-variable) +- target_no_warning(harfbuzz -WMSVC-no-hides-previous) +- target_no_warning(harfbuzz -WMSVC-no-unreachable) ++ pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz) + + #add_subdirectory(thirdparty/msdfgen) + + set(MODULE_INCLUDE + ${FREETYPE_INCLUDE_DIRS} +- ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz/harfbuzz/harfbuzz/src ++ /usr/include/harfbuzz + #${CMAKE_CURRENT_LIST_DIR}/thirdparty/msdfgen/msdfgen-1.4 + ) + diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index 5e65d317f42e..06e97196028f 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -59,6 +59,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch" "${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch" + "${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch" "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch" ) @@ -86,13 +87,11 @@ src_configure() { export PATH="$(qt5_get_bindir):${PATH}" local mycmakeargs=( + -DCMAKE_BUILD_TYPE="release" -DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=TRUE - -DMUE_BUILD_CRASHPAD_CLIENT=OFF - -DMUE_BUILD_UNIT_TESTS="$(usex test)" - -DMUE_BUILD_UPDATE_MODULE=OFF -DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)" -DMUE_COMPILE_USE_CCACHE=OFF -DMUE_COMPILE_USE_SYSTEM_FLAC=ON @@ -100,15 +99,23 @@ src_configure() { -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON -DMUE_COMPILE_USE_SYSTEM_TINYXML=ON -DMUE_DOWNLOAD_SOUNDFONT=OFF - -DMUE_ENABLE_AUDIO_JACK=$(usex jack) - -DMUSESCORE_BUILD_MODE=release + -DMUSE_APP_BUILD_MODE="release" + -DMUSE_MODULE_AUDIO_JACK="$(usex jack)" + -DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF + # tests + -DMUE_BUILD_BRAILLE_TESTS="$(usex test)" + -DMUE_BUILD_ENGRAVING_TESTS="$(usex test)" + -DMUE_BUILD_IMPORTEXPORT_TESTS="$(usex test)" + -DMUE_BUILD_NOTATION_TESTS="$(usex test)" + -DMUE_BUILD_PLAYBACK_TESTS="$(usex test)" + -DMUE_BUILD_PROJECT_TESTS="$(usex test)" ) cmake_src_configure } src_compile() { cd "${BUILD_DIR}" || die - cmake_build lrelease manpages + cmake_build cmake_src_compile }