musescore: update to 4.7.0

common/shlibs

@@ -4588,3 +4588,5 @@ libgpiodcxx.so.2 libgpiod-2.2_4
 libigloo.so.0 libigloo-0.9.5_1
 libfyaml.so.0 libfyaml-0.9.6_1
 libcpptrace.so.1 cpptrace-1.0.4_1
+libnlohmann_json_schema_validator.so.2 json-schema-validator-2.4.0_1
+libmnxdom.so mnxdom-3.0_1

srcpkgs/flac/template

@@ -1,11 +1,9 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.5.0
-revision=1
-build_style=gnu-configure
-configure_args="--disable-rpath --disable-doxygen-docs --disable-examples
- --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
-hostmakedepends="pkg-config"
+revision=2
+build_style=cmake
+configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF"
 makedepends="libogg-devel"
 short_desc="Free Lossless Audio Codec"
 maintainer="Rutpiv <roger_freitas@live.com>"
@@ -27,13 +25,14 @@ libflac_package() {
 }
 
 libflac-devel_package() {
-	depends="libogg-devel libflac>=${version}_${revision}"
+	depends="libogg-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/aclocal
+		install -Dm 644 src/*/*.m4 -t ${PKGDESTDIR}/usr/share/aclocal
 		vmove usr/share/doc
 	}
 }

srcpkgs/json-schema-validator-devel

@@ -0,0 +1 @@
+json-schema-validator

srcpkgs/json-schema-validator/template

@@ -0,0 +1,28 @@
+# Template file for 'json-schema-validator'
+pkgname=json-schema-validator
+version=2.4.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON -DJSON_VALIDATOR_BUILD_EXAMPLES=OFF"
+makedepends="json-c++"
+short_desc="JSON schema validator for JSON for Modern C++"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="MIT"
+homepage="https://github.com/pboettch/json-schema-validator"
+changelog="https://github.com/pboettch/json-schema-validator/releases"
+distfiles="https://github.com/pboettch/json-schema-validator/archive/refs/tags/${version}.tar.gz"
+checksum=24cbb114609cc9b43d4018b8d03e082ff5d2f26f5dce8bd36538097267b63af9
+
+post_install() {
+	vlicense LICENSE
+}
+
+json-schema-validator-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} json-c++"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/libogg/template

@@ -1,8 +1,9 @@
 # Template file for 'libogg'
 pkgname=libogg
 version=1.3.6
-revision=1
-build_style=gnu-configure
+revision=2
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
 short_desc="Ogg bitstream file format library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
@@ -11,15 +12,26 @@ changelog="https://gitlab.xiph.org/xiph/ogg/-/raw/master/CHANGES"
 distfiles="https://downloads.xiph.org/releases/ogg/$pkgname-$version.tar.xz"
 checksum=5c8253428e181840cd20d41f3ca16557a9cc04bad4a3d04cce84808677fa1061
 
+post_configure() {
+	configure_args="-DBUILD_SHARED_LIBS=OFF"
+	cmake_builddir="build-static" do_configure
+}
+
+post_build() {
+	cmake_builddir="build-static" do_build
+}
+
 post_install() {
-	vlicense COPYING LICENSE
+	cmake_builddir="build-static" do_install
+	vlicense ../COPYING LICENSE
 }
 
 libogg-devel_package() {
 	depends="libogg>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"

srcpkgs/libsndfile/template

@@ -1,9 +1,9 @@
 # Template file for 'libsndfile'
 pkgname=libsndfile
 version=1.2.2
-revision=2
-build_style=gnu-configure
-configure_args="--enable-static"
+revision=3
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config python3"
 makedepends="alsa-lib-devel libvorbis-devel libflac-devel sqlite-devel opus-devel mpg123-devel lame-devel"
 short_desc="C library for reading and writing files containing sampled sound"
@@ -14,6 +14,19 @@ changelog="https://github.com/libsndfile/libsndfile/raw/master/CHANGELOG.md"
 distfiles="https://github.com/libsndfile/libsndfile/releases/download/${version}/libsndfile-${version}.tar.xz"
 checksum=3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e
 
+post_configure() {
+	configure_args="-DBUILD_STATIC_LIBS=OFF"
+	cmake_builddir="build-static" do_configure
+}
+
+post_build() {
+	cmake_builddir="build-static" do_build
+}
+
+post_install() {
+	cmake_builddir="build-static" do_install
+}
+
 libsndfile-progs_package() {
 	short_desc+=" - bundled cmdline apps"
 	pkg_install() {
@@ -27,6 +40,7 @@ libsndfile-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"

srcpkgs/mnxdom-devel

@@ -0,0 +1 @@
+mnxdom

srcpkgs/mnxdom/template

@@ -0,0 +1,41 @@
+# Template file for 'mnxdom'
+pkgname=mnxdom
+version=3.0
+revision=1
+_mnx_commit=d513cf7a28a84c803ed36e448b416cb49c3a22f9
+build_style=cmake
+build_helper=qemu
+configure_args="-DBUILD_SHARED_LIBS=ON -DUSE_SYSTEM_GOOGLETEST=ON
+ -DUSE_SYSTEM_JSON_SCHEMA_VALIDATOR=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON
+ -DMNX_W3C_SOURCE=${XBPS_BUILDDIR}/${pkgname}-${version}/mnx"
+hostmakedepends="xxd"
+makedepends="gtest-devel json-c++ json-schema-validator-devel"
+short_desc="MNX Document Object Model for C++17"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="MIT"
+homepage="https://github.com/rpatters1/mnxdom"
+changelog="https://github.com/rpatters1/mnxdom/releases"
+distfiles="https://github.com/rpatters1/mnxdom/archive/refs/tags/v${version}.tar.gz
+ https://github.com/w3c-cg/mnx/archive/${_mnx_commit}.tar.gz"
+checksum="5ba67216c0de69ab14d8f28724d1e37e9727d4a649eb80930770e8e39a71a5f7
+ 730de77b1b01e4e00d414219022e6d9a41e75f6d9250e50e816f1e679b721e08"
+skip_extraction="${_mnx_commit}.tar.gz"
+
+export CXXFLAGS="-Wno-sign-compare"
+
+post_extract() {
+	vsrcextract -C mnx "${_mnx_commit}.tar.gz"
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+mnxdom-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} json-c++"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

srcpkgs/musescore/template

@@ -1,36 +1,35 @@
 # Template file for 'musescore'
 pkgname=musescore
-version=3.6.2
-revision=3
-build_style=gnu-makefile
-make_build_args="USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
- DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
-make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-tools"
-makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
- portmidi-devel pulseaudio-devel qt5-declarative-devel qt5-script-devel
- qt5-svg-devel qt5-tools-devel qt5-webchannel-devel
- qt5-location-devel qt5-xmlpatterns-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
-depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
+version=4.7.0
+revision=1
+build_style=cmake
+build_helper=qmake6
+configure_args="-DMUE_BUILD_BRAILLE_TESTS=OFF -DMUE_BUILD_CONVERTER_TESTS=OFF
+ -DMUE_BUILD_ENGRAVING_TESTS=OFF -DMUE_BUILD_IMPORTEXPORT_TESTS=OFF
+ -DMUE_BUILD_NOTATION_TESTS=OFF -DMUE_BUILD_PLAYBACK_TESTS=OFF
+ -DMUE_BUILD_PROJECT_TESTS=OFF -DMUE_COMPILE_USE_SYSTEM_FLAC=ON
+ -DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON -DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON
+ -DMUE_COMPILE_USE_SYSTEM_MNXDOM=ON -DMUE_COMPILE_USE_SYSTEM_OPUS=ON
+ -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON -DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
+ -DMUE_INSTALL_SOUNDFONT=ON -DMUSESCORE_BUILD_CONFIGURATION=app
+ -DMUSE_APP_BUILD_MODE=release -DMUSE_ENABLE_UNIT_TESTS=OFF
+ -DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF -DMUSE_MODULE_UPDATE=OFF
+ -Wno-dev"
+hostmakedepends="pkg-config qt6-declarative-host-tools qt6-shadertools
+ qt6-tools"
+makedepends="libflac-devel libopusenc-devel libsndfile-devel mnxdom-devel
+ qt6-base-private-devel qt6-declarative-devel qt6-networkauth-devel
+ qt6-qt5compat-devel qt6-scxml-devel qt6-shadertools-devel qt6-svg-devel
+ tinyxml2-devel"
+depends="qt6-plugin-tls-openssl"
 short_desc="Create, play and print beautiful sheet music"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://musescore.org/"
-_soundfont_url="https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General"
-distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz
- ${_soundfont_url}/MuseScore_General.sf3
- ${_soundfont_url}/MuseScore_General_License.md"
-checksum="c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
- 5b85b6c2c61d10b2b91cddd41efcce7b25cd31c8271d511c73afafbef20b6fa3
- 5ad8d737e13c7f01f5b9674872a82a92b4ba253603e8ed14b9db12293550b4b9"
-skip_extraction="MuseScore_General.sf3 MuseScore_General_License.md"
+distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
+checksum=60164691b11fac4e2d6fbbc141d3e2afc16b884d2bffc3e1be878cc1db2ff039
 
-post_extract() {
-	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General.sf3" "${wrksrc}/share/sound/"
-	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General_License.md" "${wrksrc}/share/sound/"
-}
-
-post_patch() {
-	vsed -i CMakeLists.txt -e 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0/CMAKE_MINIMUM_REQUIRED(VERSION 3.5.0/g'
-}
+if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+	# fix qmlls argmax error
+	configure_args+=" -DQT_INSTALL_DOCS=/tmp"
+fi