musescore: bump to 3.6.2 (#5768)

This commit is contained in:
kenmays
2021-03-08 10:00:59 -08:00
committed by GitHub
parent ae2ec50bf9
commit aa659eedc8
2 changed files with 22 additions and 33 deletions

View File

@@ -1,17 +1,17 @@
SUMMARY="An open source and free music notation software"
DESCRIPTION="This application is used for creating, playing and printing beautiful sheet music"
SUMMARY="Free music composition and notation software"
DESCRIPTION="This application is used to create, play, and print beautiful sheet music"
HOMEPAGE="https://musescore.org/"
COPYRIGHT="2002-2019 Werner Schweer and others"
COPYRIGHT="2002-2021 Werner Schweer and others"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/musescore/MuseScore/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="554cfbb329b184260efdd9522777b2d8422c21f535d0955720517c37912d9ccf"
CHECKSUM_SHA256="c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45"
SOURCE_DIR="MuseScore-$portVersion"
PATCHES="musescore-$portVersion.patchset"
ADDITIONAL_FILES="musescore.rdef.in"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="!x86"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
musescore$secondaryArchSuffix = $portVersion
@@ -68,9 +68,17 @@ BUILD()
{
export DISABLE_ASLR=1
mkdir -p $appsDir
make PREFIX=$appsDir/MuseScore UPDATE_CACHE=FALSE BUILD_PULSEAUDIO=OFF \
BUILD_JACK=OFF BUILD_PORTMIDI=OFF BUILD_PORTAUDIO=OFF BUILD_WEBENGINE=OFF \
USE_SYSTEM_FREETYPE=ON DOWNLOAD_SOUNDFONT=OFF BUILD_ALSA=OFF \
make PREFIX=$appsDir/MuseScore \
UPDATE_CACHE=FALSE \
BUILD_PULSEAUDIO=OFF \
BUILD_JACK=OFF \
BUILD_PORTMIDI=OFF \
BUILD_PORTAUDIO=OFF \
BUILD_WEBENGINE=OFF \
USE_SYSTEM_FREETYPE=ON \
DOWNLOAD_SOUNDFONT=OFF \
BUILD_ALSA=OFF \
NO_RPATH=TRUE \
MUSESCORE_BUILD_CONFIG=release revision release
}

View File

@@ -1,4 +1,4 @@
From 1520ac840f6ca859f2bc264a8b53f24b29c595a4 Mon Sep 17 00:00:00 2001
From 879258db8aaada67116d9a83d5759393a0bd462c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 17 Sep 2019 19:09:55 +0200
Subject: Import still relevant part of Haiku patches.
@@ -50,17 +50,17 @@ index 6eb2162..ff07f7c 100644
2.30.0
From 32f85ff8f0b82a7fb0cab0d7cf3f4e87b465c6a8 Mon Sep 17 00:00:00 2001
From 5e36125644dc5c6b5eecfe1b0d8a4c4935a65bb5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 7 Jan 2020 13:31:47 +1000
Subject: Don't set Fusion style for Haiku
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
index ccfdab6..a3bd5ff 100644
index c08a15e..32444f2 100644
--- a/mscore/musescore.cpp
+++ b/mscore/musescore.cpp
@@ -7411,7 +7411,9 @@ void tryToRequestTelemetryPermission()
@@ -7391,7 +7391,9 @@ void tryToRequestTelemetryPermission()
void MuseScore::updateUiStyleAndTheme()
{
// set UI Theme
@@ -74,31 +74,12 @@ index ccfdab6..a3bd5ff 100644
2.30.0
From b172dd8a86d5cea1904341dd09c9e194749c5832 Mon Sep 17 00:00:00 2001
From 4988f4c9533e94fe0c70590592426af360612c5c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 20 Jan 2021 09:52:46 +0100
Subject: Haiku patch
diff --git a/build/FindQt5.cmake b/build/FindQt5.cmake
index 9ad7440..7c4f733 100644
--- a/build/FindQt5.cmake
+++ b/build/FindQt5.cmake
@@ -36,14 +36,6 @@ if (WIN32)
)
endif(WIN32)
-# For Windows, because of these lines, for some unknown reason, the build of the .msi package fails.
-if(NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
- find_package(Qt5Core 5.15.0 QUIET)
- if (Qt5Core_FOUND)
- message(FATAL_ERROR "MuseScore 3 does not support Qt 5.15: 5.15.0 shows empty palettes panel, 5.15.1 and later crash when opening pre-3.6 scores due to QTBUG-77337")
- endif()
-endif()
-
find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
foreach(_component ${_components})
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 0cfba78..69645fc 100644
--- a/main/CMakeLists.txt