From: tibequadorian <tibequadorian@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] musescore: update to 3.6.2.
Date: Fri, 26 Feb 2021 23:39:57 +0100 [thread overview]
Message-ID: <20210226223957.sXH4gC19RUdheb7TqSJ0iaaLM2UR3vWXrkkWVj5Nsrs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29063@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2021-02-26 22:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 22:29 [PR PATCH] " 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
2021-02-26 22:14 ` tibequadorian
2021-02-26 22:39 ` tibequadorian [this message]
2021-02-26 23:24 ` tibequadorian
2021-02-26 23:25 ` tibequadorian
2021-02-27 0:08 ` [PR PATCH] [Updated] " tibequadorian
2021-02-27 0:08 ` tibequadorian
2021-02-27 11:32 ` tibequadorian
2021-02-27 13:20 ` [PR PATCH] [Updated] " tibequadorian
2021-02-27 13:33 ` tibequadorian
2021-02-27 20:46 ` [PR REVIEW] " ericonr
2021-02-28 3:39 ` tibequadorian
2021-02-28 3:41 ` tibequadorian
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210226223957.sXH4gC19RUdheb7TqSJ0iaaLM2UR3vWXrkkWVj5Nsrs@z \
--to=tibequadorian@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).