* Re: [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
@ 2021-02-26 0:38 ` tibequadorian
2021-02-26 21:28 ` [PR PATCH] [Updated] " tibequadorian
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 0:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#issuecomment-786327264
Comment:
is it right that package contains /usr/bin/QtWebEngineProcess?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
2021-02-26 0:38 ` tibequadorian
@ 2021-02-26 21:28 ` tibequadorian
2021-02-26 22:01 ` tibequadorian
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
[WIP] musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 2191 bytes --]
From d5357eea1c7148d8b55d3c3a989067ce1ab9819e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
fix cross builds
---
srcpkgs/musescore/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..2c711aa90d0 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -3,13 +3,13 @@
# downloading in the build process.
# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,20 +17,15 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+checksum=c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
build_options="webengine"
desc_option_webengine="Build with Qt5 WebEngine support"
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
-
if [ "$build_option_webengine" ]; then
makedepends+=" qt5-webengine-devel"
else
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
2021-02-26 0:38 ` tibequadorian
2021-02-26 21:28 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-26 22:01 ` tibequadorian
2021-02-26 22:08 ` tibequadorian
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 22:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
[WIP] musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 3272 bytes --]
From 132c1683aba00603f86a522723edab5e262eecdd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
---
.../use-system-qtwebengine-files.patch | 26 +++++++++++++++++++
srcpkgs/musescore/template | 9 +++----
2 files changed, 30 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
diff --git a/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch b/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
new file mode 100644
index 00000000000..17dfba2b32c
--- /dev/null
+++ b/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
@@ -0,0 +1,26 @@
+diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
+index 0cfba7814..9e241737a 100644
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -226,21 +226,6 @@ if (MINGW)
+ else (MINGW)
+
+ if ( NOT MSVC )
+- ## install qwebengine core
+- if (NOT APPLE AND USE_WEBENGINE)
+- install(PROGRAMS
+- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
+- DESTINATION bin
+- )
+- install(DIRECTORY
+- ${QT_INSTALL_DATA}/resources
+- DESTINATION lib/qt5
+- )
+- install(DIRECTORY
+- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
+- DESTINATION lib/qt5/translations
+- )
+- endif(NOT APPLE AND USE_WEBENGINE)
+
+ set_target_properties (
+ mscore
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..19d3007c0fb 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -3,13 +3,13 @@
# downloading in the build process.
# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,12 +17,11 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+checksum=c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
build_options="webengine"
desc_option_webengine="Build with Qt5 WebEngine support"
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (2 preceding siblings ...)
2021-02-26 22:01 ` tibequadorian
@ 2021-02-26 22:08 ` tibequadorian
2021-02-26 22:14 ` tibequadorian
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 22:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
[WIP] musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 3471 bytes --]
From b186d31976d47da3bb37b2de97f2d0d56f65cc30 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
---
.../use-system-qtwebengine-files.patch | 26 +++++++++++++++++++
srcpkgs/musescore/template | 13 ++++------
2 files changed, 31 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
diff --git a/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch b/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
new file mode 100644
index 00000000000..3b15b6fec4d
--- /dev/null
+++ b/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
@@ -0,0 +1,26 @@
+diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
+index 0cfba7814..9e241737a 100644
+--- main/CMakeLists.txt
++++ main/CMakeLists.txt
+@@ -226,21 +226,6 @@ if (MINGW)
+ else (MINGW)
+
+ if ( NOT MSVC )
+- ## install qwebengine core
+- if (NOT APPLE AND USE_WEBENGINE)
+- install(PROGRAMS
+- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
+- DESTINATION bin
+- )
+- install(DIRECTORY
+- ${QT_INSTALL_DATA}/resources
+- DESTINATION lib/qt5
+- )
+- install(DIRECTORY
+- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
+- DESTINATION lib/qt5/translations
+- )
+- endif(NOT APPLE AND USE_WEBENGINE)
+
+ set_target_properties (
+ mscore
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..5d28b527e58 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -3,13 +3,13 @@
# downloading in the build process.
# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,19 +17,16 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+checksum=c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
build_options="webengine"
desc_option_webengine="Build with Qt5 WebEngine support"
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
+build_options_default="webengine"
if [ "$build_option_webengine" ]; then
makedepends+=" qt5-webengine-devel"
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (3 preceding siblings ...)
2021-02-26 22:08 ` tibequadorian
@ 2021-02-26 22:14 ` tibequadorian
2021-02-26 22:39 ` [PR PATCH] [Updated] " tibequadorian
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 22:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#issuecomment-786327264
Comment:
is it right that package contains /usr/bin/QtWebEngineProcess?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (4 preceding siblings ...)
2021-02-26 22:14 ` tibequadorian
@ 2021-02-26 22:39 ` tibequadorian
2021-02-26 23:24 ` tibequadorian
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
[WIP] musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 3473 bytes --]
From d410868729ea226d293b833a5de65159b563e139 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
disable qtwebengine by default
---
.../use-system-qtwebengine-files.patch | 26 +++++++++++++++++++
srcpkgs/musescore/template | 13 +++-------
2 files changed, 30 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
diff --git a/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch b/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
new file mode 100644
index 00000000000..3b15b6fec4d
--- /dev/null
+++ b/srcpkgs/musescore/patches/use-system-qtwebengine-files.patch
@@ -0,0 +1,26 @@
+diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
+index 0cfba7814..9e241737a 100644
+--- main/CMakeLists.txt
++++ main/CMakeLists.txt
+@@ -226,21 +226,6 @@ if (MINGW)
+ else (MINGW)
+
+ if ( NOT MSVC )
+- ## install qwebengine core
+- if (NOT APPLE AND USE_WEBENGINE)
+- install(PROGRAMS
+- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
+- DESTINATION bin
+- )
+- install(DIRECTORY
+- ${QT_INSTALL_DATA}/resources
+- DESTINATION lib/qt5
+- )
+- install(DIRECTORY
+- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
+- DESTINATION lib/qt5/translations
+- )
+- endif(NOT APPLE AND USE_WEBENGINE)
+
+ set_target_properties (
+ mscore
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..2c711aa90d0 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -3,13 +3,13 @@
# downloading in the build process.
# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,20 +17,15 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+checksum=c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
build_options="webengine"
desc_option_webengine="Build with Qt5 WebEngine support"
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
-
if [ "$build_option_webengine" ]; then
makedepends+=" qt5-webengine-devel"
else
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (5 preceding siblings ...)
2021-02-26 22:39 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-26 23:24 ` tibequadorian
2021-02-26 23:25 ` tibequadorian
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#issuecomment-786947250
Comment:
Cross builds now work!
With qt5-webengine they only work with the patch I've included, only for little-endian build target and only if word size of host and target matches.
Luckily it's a really unnecessecary dependency on musescore, therefore I've disabled it by default. Patch is still there if someone wants to enable it.
Still needs testing because I've only tested it on x86_64-glibc.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (6 preceding siblings ...)
2021-02-26 23:24 ` tibequadorian
@ 2021-02-26 23:25 ` tibequadorian
2021-02-27 0:08 ` [PR PATCH] [Updated] " tibequadorian
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-26 23:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#issuecomment-786947556
Comment:
Wanna take a look, @ericonr ? :D
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (7 preceding siblings ...)
2021-02-26 23:25 ` tibequadorian
@ 2021-02-27 0:08 ` tibequadorian
2021-02-27 0:08 ` tibequadorian
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-27 0:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
[WIP] musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 2379 bytes --]
From 8f9c227743119f42ba1ffe93fef802fd363632ef Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
disable qtwebengine
---
srcpkgs/musescore/template | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..04f14879eb1 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -3,13 +3,14 @@
# downloading in the build process.
# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
-make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
+make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
+ MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,22 +18,8 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
-
-build_options="webengine"
-desc_option_webengine="Build with Qt5 WebEngine support"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
-
-if [ "$build_option_webengine" ]; then
- makedepends+=" qt5-webengine-devel"
-else
- make_build_args+=" BUILD_WEBENGINE=OFF"
-fi
+checksum=c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (8 preceding siblings ...)
2021-02-27 0:08 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-27 0:08 ` tibequadorian
2021-02-27 11:32 ` tibequadorian
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-27 0:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#issuecomment-786959685
Comment:
update: removed the qt5-webengine option completely, there's no reason to keep it tbh
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (9 preceding siblings ...)
2021-02-27 0:08 ` tibequadorian
@ 2021-02-27 11:32 ` tibequadorian
2021-02-27 13:20 ` [PR PATCH] [Updated] " tibequadorian
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-27 11:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#issuecomment-786959685
Comment:
update: removed the qt5-webengine option (and patch) completely, there's no reason to keep it tbh
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (10 preceding siblings ...)
2021-02-27 11:32 ` tibequadorian
@ 2021-02-27 13:20 ` tibequadorian
2021-02-27 13:33 ` tibequadorian
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-27 13:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
[WIP] musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 3242 bytes --]
From 6a6428cbcbbfa53081fe08266affd74931cfb6dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
disable qtwebengine
add soundfont to distfiles
---
srcpkgs/musescore/template | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..b7fc0639aa7 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -1,15 +1,13 @@
# Template file for 'musescore'
-# TODO: Add MuseScore Soundfont as distfiles or separate package instead of
-# downloading in the build process.
-# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
-make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
+make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
+ DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,22 +15,18 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
-distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz
+ https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3
+ https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_License.md"
+checksum="c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
+ 5b85b6c2c61d10b2b91cddd41efcce7b25cd31c8271d511c73afafbef20b6fa3
+ 5ad8d737e13c7f01f5b9674872a82a92b4ba253603e8ed14b9db12293550b4b9"
+skip_extraction="MuseScore_General.sf3 MuseScore_General_License.md"
-build_options="webengine"
-desc_option_webengine="Build with Qt5 WebEngine support"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
-
-if [ "$build_option_webengine" ]; then
- makedepends+=" qt5-webengine-devel"
-else
- make_build_args+=" BUILD_WEBENGINE=OFF"
-fi
+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/"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (11 preceding siblings ...)
2021-02-27 13:20 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-27 13:33 ` tibequadorian
2021-02-27 20:46 ` [PR REVIEW] " ericonr
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-27 13:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
[WIP] musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 3231 bytes --]
From dae8e7457dfd92920e7b2510bc20f2a8ce6d5cb5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
disable qtwebengine
add soundfont to distfiles
---
srcpkgs/musescore/template | 39 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..9bc29cf3307 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -1,15 +1,13 @@
# Template file for 'musescore'
-# TODO: Add MuseScore Soundfont as distfiles or separate package instead of
-# downloading in the build process.
-# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
-make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
+make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
+ DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,22 +15,19 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
-distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+_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"
-build_options="webengine"
-desc_option_webengine="Build with Qt5 WebEngine support"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
-
-if [ "$build_option_webengine" ]; then
- makedepends+=" qt5-webengine-devel"
-else
- make_build_args+=" BUILD_WEBENGINE=OFF"
-fi
+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/"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (12 preceding siblings ...)
2021-02-27 13:33 ` tibequadorian
@ 2021-02-27 20:46 ` ericonr
2021-02-28 3:39 ` tibequadorian
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ericonr @ 2021-02-27 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#discussion_r584188645
Comment:
Are there no versioned variants of this file? If upstream changes them, the template will just stop building :/
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (13 preceding siblings ...)
2021-02-27 20:46 ` [PR REVIEW] " ericonr
@ 2021-02-28 3:39 ` tibequadorian
2021-02-28 3:41 ` tibequadorian
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-28 3:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#discussion_r584225608
Comment:
I don't think so :/ These are the same that CMakeLists.txt uses to download ... at least they're checksummed now, remember https://github.com/void-linux/void-packages/pull/27451 ?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (14 preceding siblings ...)
2021-02-28 3:39 ` tibequadorian
@ 2021-02-28 3:41 ` tibequadorian
2021-02-28 3:45 ` [PR PATCH] [Updated] " tibequadorian
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-28 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#issuecomment-787286448
Comment:
> Can you explain in the commit message why the qtwebengine option isn't necessary?
Yeah I mean it just provides a small bar in the start center that links to several youtube videos about the software... nothing anyone will even notice
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (15 preceding siblings ...)
2021-02-28 3:41 ` tibequadorian
@ 2021-02-28 3:45 ` tibequadorian
2021-02-28 3:45 ` tibequadorian
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-28 3:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1737 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 3327 bytes --]
From 66b477a8bb47ecabaac99b86b544a8a2f3793d62 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
add soundfont to distfiles
disable qtwebengine because its unportable and unnecessary as it just provides some web content in the start center
---
srcpkgs/musescore/template | 39 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..9bc29cf3307 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -1,15 +1,13 @@
# Template file for 'musescore'
-# TODO: Add MuseScore Soundfont as distfiles or separate package instead of
-# downloading in the build process.
-# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
-make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
+make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
+ DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,22 +15,19 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
-distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+_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"
-build_options="webengine"
-desc_option_webengine="Build with Qt5 WebEngine support"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
-
-if [ "$build_option_webengine" ]; then
- makedepends+=" qt5-webengine-devel"
-else
- make_build_args+=" BUILD_WEBENGINE=OFF"
-fi
+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/"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (16 preceding siblings ...)
2021-02-28 3:45 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-28 3:45 ` tibequadorian
2021-02-28 3:47 ` [PR REVIEW] " tibequadorian
2021-02-28 6:52 ` [PR PATCH] [Merged]: " ericonr
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-28 3:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1737 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages musescore
https://github.com/void-linux/void-packages/pull/29063
musescore: update to 3.6.2.
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musescore-29063.patch --]
[-- Type: text/x-diff, Size: 3322 bytes --]
From a9f153420973114d8510f67fd7825779de12d3e6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH] musescore: update to 3.6.2.
change maintainer
enable cross builds
add soundfont to distfiles
disable qtwebengine because its unportable and unnecessary as it just provides web content in the start center
---
srcpkgs/musescore/template | 39 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d..9bc29cf3307 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -1,15 +1,13 @@
# Template file for 'musescore'
-# TODO: Add MuseScore Soundfont as distfiles or separate package instead of
-# downloading in the build process.
-# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
pkgname=musescore
-version=3.5.2
+version=3.6.2
revision=1
wrksrc="MuseScore-${version}"
build_style=gnu-makefile
-make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
+make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
+ DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+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
@@ -17,22 +15,19 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://musescore.org/"
-distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+_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"
-build_options="webengine"
-desc_option_webengine="Build with Qt5 WebEngine support"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
-fi
-
-if [ "$build_option_webengine" ]; then
- makedepends+=" qt5-webengine-devel"
-else
- make_build_args+=" BUILD_WEBENGINE=OFF"
-fi
+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/"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (17 preceding siblings ...)
2021-02-28 3:45 ` tibequadorian
@ 2021-02-28 3:47 ` tibequadorian
2021-02-28 6:52 ` [PR PATCH] [Merged]: " ericonr
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2021-02-28 3:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/29063#discussion_r584226171
Comment:
so if upstream changes them, they would have to update too
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Merged]: musescore: update to 3.6.2.
2021-02-25 22:29 [PR PATCH] [WIP] musescore: update to 3.6.2 tibequadorian
` (18 preceding siblings ...)
2021-02-28 3:47 ` [PR REVIEW] " tibequadorian
@ 2021-02-28 6:52 ` ericonr
19 siblings, 0 replies; 21+ messages in thread
From: ericonr @ 2021-02-28 6:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
There's a merged pull request on the void-packages repository
musescore: update to 3.6.2.
https://github.com/void-linux/void-packages/pull/29063
Description:
Change maintainer (https://github.com/void-linux/void-packages/issues/29061)
I'll see if I can get cross builds working...
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 21+ messages in thread