supercollider: update to 3.14.1.

srcpkgs/sc3-plugins/template

@@ -1,34 +1,32 @@
 # Template file for 'sc3-plugins'
 pkgname=sc3-plugins
-version=3.10.0
-revision=2
-_nova_simd_hash=2bdc68bc5704a42578300a4c18411df2405cb307
+version=3.14.0
+revision=1
+_supercollider_version=3.14.1
 create_wrksrc=yes
-build_wrksrc=sc3-plugins
+build_wrksrc=sc3-plugins-${version}-Source
 build_style=cmake
-configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON"
 hostmakedepends="pkg-config"
 makedepends="fftw-devel libstk-devel"
 depends="supercollider"
 short_desc="Extension plugins for the SuperCollider3 audio synthesis server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/supercollider/sc3-plugins"
-distfiles="https://github.com/supercollider/sc3-plugins/archive/Version-${version}.tar.gz
- https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2
- https://github.com/timblechmann/nova-simd/archive/${_nova_simd_hash}.tar.gz"
-checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe
- 9b2035a3a7942c61cbe89b00c35c7e16ac281c06786fe1c30dfd333194be499a
- df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8"
-
-post_extract() {
-	mv sc3-plugins-* sc3-plugins
-	rm -rf sc3-plugins/external_libraries/nova-simd
-	mv nova-simd-${_nova_simd_hash} sc3-plugins/external_libraries/nova-simd
-}
+distfiles="
+ https://github.com/supercollider/sc3-plugins/releases/download/Version-${version}/sc3-plugins-${version}-Source.tar.bz2
+ https://github.com/supercollider/supercollider/releases/download/Version-${_supercollider_version}/SuperCollider-${_supercollider_version}-Source.tar.bz2"
+checksum="
+096f495557607884e0dbfd132e9af0d55f165b856106608dd8db3c5e68992a1d
+ee640c68777ae697682066ce5c4a8b7e56c5b223e76c79c13b5be5387ee55bb2"
+if [ "$XBPS_TARGET_MACHINE" = "armv6l-musl" ] || [ "$XBPS_TARGET_MACHINE" = "armv7l-musl" ]; then
+	configure_args="-DSUPERNOVA=OFF -DSYSTEM_STK=ON"
+else
+	configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON"
+fi
 
 pre_configure() {
-	configure_args+=" -DSC_PATH=${wrksrc}/SuperCollider-Source "
+	configure_args+=" -DSC_PATH=${wrksrc}/SuperCollider-${_supercollider_version}-Source "
 }
 
 post_install() {

srcpkgs/supercollider/patches/conversion.patch

@@ -0,0 +1,34 @@
+# Authored on Alpine Linux
+# https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/supercollider/conversion.patch?ref_type=heads
+
+diff --git a/editors/sc-ide/widgets/code_editor/editor.cpp b/editors/sc-ide/widgets/code_editor/editor.cpp
+index a2f99389781..e8cee85eef9 100644
+--- a/editors/sc-ide/widgets/code_editor/editor.cpp
++++ b/editors/sc-ide/widgets/code_editor/editor.cpp
+@@ -698,7 +698,7 @@ void GenericCodeEditor::mousePressEvent(QMouseEvent* e) {
+                                          .arg(e->position().x())
+                                          .arg(e->position().y())
+ #endif
+-                                         .arg(e->modifiers())
++                                         .arg(static_cast<Qt::KeyboardModifiers::Int>(e->modifiers()))
+                                          .arg(button),
+                                      true);
+     }
+@@ -732,7 +732,7 @@ void GenericCodeEditor::mouseDoubleClickEvent(QMouseEvent* e) {
+                                          .arg(e->position().x())
+                                          .arg(e->position().y())
+ #endif
+-                                         .arg(e->modifiers())
++                                         .arg(static_cast<Qt::KeyboardModifiers::Int>(e->modifiers()))
+                                          .arg(button),
+                                      true);
+     }
+@@ -766,7 +766,7 @@ void GenericCodeEditor::mouseReleaseEvent(QMouseEvent* e) {
+                                          .arg(e->position().x())
+                                          .arg(e->position().y())
+ #endif
+-                                         .arg(e->modifiers())
++                                         .arg(static_cast<Qt::KeyboardModifiers::Int>(e->modifiers()))
+                                          .arg(button),
+                                      true);
+     }

srcpkgs/supercollider/template

@@ -1,47 +1,46 @@
 # Template file for 'supercollider'
 pkgname=supercollider
-version=3.14.0
-revision=4
+version=3.14.1
+revision=1
+# Please update the sc3-plugins template with the new version of supercollider, even if sc3-plugins itself does not have an update.
 build_style=cmake
 make_cmd=make
-configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
-hostmakedepends="emacs pkg-config qt5-host-tools qt5-qmake"
-makedepends="avahi-libs-devel boost-devel-minimal fftw-devel jack-devel
- libsndfile-devel libXt-devel qt5-declarative-devel qt5-location-devel
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
- qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-svg-devel
- qt5-webchannel-devel qt5-websockets-devel yaml-cpp-devel"
+configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON
+ -DSYSTEM_PORTAUDIO=ON -DLIBSCSYNTH=ON"
+hostmakedepends="pkg-config"
+makedepends="alsa-lib-devel boost-devel-minimal jack-devel libsndfile-devel libXt-devel
+ qt6-base-devel qt6-declarative-devel qt6-svg-devel qt6-tools-devel qt6-websockets-devel
+ readline-devel yaml-cpp-devel"
 short_desc="Environment and programming language for real time audio synthesis"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/supercollider/supercollider"
 distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"
-checksum=ab710e84376f5c082c92fcea7465b85d375934f3da7deed583457a0a48b0a918
+checksum=ee640c68777ae697682066ce5c4a8b7e56c5b223e76c79c13b5be5387ee55bb2
 
 export CMAKE_GENERATOR="Unix Makefiles"
 
 build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine support"
+desc_option_webengine="Build Qt6 WebEngine support"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ] && [ "$XBPS_WORDSIZE" != 32 ]; then
 		build_options_default="webengine"
 	fi
 fi
 
 if [ "$build_option_webengine" ]; then
-	makedepends+=" qt5-webengine-devel"
+	makedepends+=" qt6-webengine-devel"
 else
 	configure_args+=" -DSC_USE_QTWEBENGINE=OFF"
 fi
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base qt6-tools"
+	configure_args+=" -DQt6LinguistTools_DIR=/usr/lib/cmake/Qt6LinguistTools"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*);;
 	*) configure_args+=" -DSSE=OFF -DSSE2=OFF";;
 esac
-
-pre_patch() {
-	# https://github.com/supercollider/supercollider/issues/4096
-	rm -rf external_libraries/boost
-	sed -i 's/yaml/yaml-cpp/g' CMakeLists.txt editors/sc-ide/CMakeLists.txt
-}