[packages/musescore] - up to 4.1.1
mrozowik
mrozowik at pld-linux.org
Sun Aug 6 20:21:38 CEST 2023
commit 59c6d48a1f54aa9fadf31645bf909673a10f4794
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Sun Aug 6 18:02:43 2023 +0000
- up to 4.1.1
desktop.patch | 8 ++++----
musescore-4.0.2-return.patch | 29 -----------------------------
musescore.spec | 12 +++---------
no-crashpad.patch | 24 +++++++++++-------------
set_as_stable.patch | 16 ++++++++--------
5 files changed, 26 insertions(+), 63 deletions(-)
---
diff --git a/musescore.spec b/musescore.spec
index a047372..b6b0458 100644
--- a/musescore.spec
+++ b/musescore.spec
@@ -5,17 +5,16 @@
Summary: MuseScore - music notation software
Summary(pl.UTF-8): MuseScore - oprogramowanie do notacji muzycznej
Name: musescore
-Version: 4.0.2
+Version: 4.1.1
Release: 1
License: GPL v2
Group: Applications
Source0: https://github.com/musescore/MuseScore/archive/v%{version}.tar.gz
-# Source0-md5: e1a5b52bd2cede8f6f332f0f6e315b73
+# Source0-md5: 080fd5bf13ef2774af451ae47de09dee
Patch0: no-crashpad.patch
Patch1: desktop.patch
Patch2: use-qtmake-qt5.patch
Patch3: set_as_stable.patch
-Patch4: %{name}-4.0.2-return.patch
URL: https://musescore.org/
BuildRequires: Qt5Concurrent-devel >= %{min_qt_version}
BuildRequires: Qt5Core-devel >= %{min_qt_version}
@@ -107,7 +106,6 @@ MuseScore.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# fix EOL encoding
sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile
@@ -195,10 +193,6 @@ install -p thirdparty/rtf2html/COPYING.LESSER tmp_doc/COPYING.LESSER.rtf2html
install -p thirdparty/rtf2html/README tmp_doc/README.rtf2html
install -p thirdparty/rtf2html/README.mscore tmp_doc/README.mscore.rtf2html
install -p thirdparty/rtf2html/README.ru tmp_doc/README.ru.rtf2html
-install -p thirdparty/singleapp/LGPL_EXCEPTION.txt tmp_doc/LGPL_EXCEPTION.txt.singleapp
-install -p thirdparty/singleapp/LICENSE.GPL3 tmp_doc/LICENSE.GPL3.singleapp
-install -p thirdparty/singleapp/LICENSE.LGPL tmp_doc/LICENSE.LGPL.singleapp
-install -p thirdparty/singleapp/README.TXT tmp_doc/README.TXT.singleapp
install -p tools/bww2mxml/COPYING tmp_doc/COPYING.bww2mxml
install -p tools/bww2mxml/README tmp_doc/README.bww2mxml
install -p share/sound/README.md tmp_doc/README.md.sound
@@ -230,7 +224,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README.md Compatibility LICENSE.GPL tmp_doc/*
%attr(755,root,root) %{_bindir}/mscore
-%{_datadir}/mscore-4.0
+%{_datadir}/mscore-4.1
%{_desktopdir}/org.musescore.MuseScore.desktop
%{_iconsdir}/*/*/apps/*
%{_iconsdir}/*/*/mimetypes/*
diff --git a/desktop.patch b/desktop.patch
index d33049e..edc70cb 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,5 +1,5 @@
---- MuseScore-4.0.2/build/Linux+BSD/org.musescore.MuseScore.desktop.in~ 2023-03-13 12:59:42.000000000 +0000
-+++ MuseScore-4.0.2/build/Linux+BSD/org.musescore.MuseScore.desktop.in 2023-03-16 22:21:45.069756860 +0000
+--- MuseScore-4.1.1/build/Linux+BSD/org.musescore.MuseScore.desktop.in~ 2023-07-25 18:38:26.000000000 +0000
++++ MuseScore-4.1.1/build/Linux+BSD/org.musescore.MuseScore.desktop.in 2023-08-06 09:02:12.915705506 +0000
@@ -8,9 +8,11 @@
GenericName=Music notation
GenericName[de]=Notensatz
@@ -9,6 +9,6 @@
Comment[ru]=Визуальный редактор нотных партитур
Comment[fr]=Gravure de partitions musicales
+Comment[pl]=Twórz, odtwarzaj i drukuj partytury
- Icon=mscore at MSCORE_INSTALL_SUFFIX@
- Exec=mscore at MSCORE_INSTALL_SUFFIX@ %F
+ Icon=mscore at MUSESCORE_INSTALL_SUFFIX@
+ Exec=mscore at MUSESCORE_INSTALL_SUFFIX@ %F
Terminal=false
diff --git a/musescore-4.0.2-return.patch b/musescore-4.0.2-return.patch
deleted file mode 100644
index 71fcb6a..0000000
--- a/musescore-4.0.2-return.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: MuseScore-4.0.2/src/project/internal/projectactionscontroller.cpp
-===================================================================
---- MuseScore-4.0.2.orig/src/project/internal/projectactionscontroller.cpp
-+++ MuseScore-4.0.2/src/project/internal/projectactionscontroller.cpp
-@@ -934,6 +934,7 @@ bool ProjectActionsController::askIfUser
- default:
- return false;
- }
-+ return false;
- }
-
- void ProjectActionsController::warnScoreWithoutPartsCannotBeSaved()
-@@ -960,6 +961,7 @@ bool ProjectActionsController::askIfUser
- case SaveLocationType::Undefined:
- return false;
- }
-+ return false;
- }
-
- void ProjectActionsController::warnCorruptedScoreCannotBeSavedOnCloud(const std::string& errorText, bool canRevert)
-@@ -1040,6 +1042,7 @@ bool ProjectActionsController::askIfUser
- case SaveLocationType::Undefined:
- return false;
- }
-+ return false;
- }
-
- void ProjectActionsController::showErrCorruptedScoreCannotBeSaved(const SaveLocation& location, const std::string& errorText)
-
diff --git a/no-crashpad.patch b/no-crashpad.patch
index b439e1d..6c1f2bf 100644
--- a/no-crashpad.patch
+++ b/no-crashpad.patch
@@ -1,13 +1,11 @@
-diff --git a/src/diagnostics/CMakeLists.txt b/src/diagnostics/CMakeLists.txt
-index 636d092..fec6273 100644
---- a/src/diagnostics/CMakeLists.txt
-+++ b/src/diagnostics/CMakeLists.txt
-@@ -104,7 +104,7 @@ include(${PROJECT_SOURCE_DIR}/build/module.cmake)
- # === Install crashpad handler ===
- set(CPAD_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}/crashpad_handler)
- if (OS_IS_LIN)
-- install(PROGRAMS ${CPAD_ROOT_PATH}/linux/x86-64/crashpad_handler DESTINATION bin)
-+ #install(PROGRAMS ${CPAD_ROOT_PATH}/linux/x86-64/crashpad_handler DESTINATION bin)
- elseif(OS_IS_WIN)
- install(PROGRAMS ${CPAD_ROOT_PATH}/windows/x86-64/crashpad_handler.exe DESTINATION bin)
- elseif(OS_IS_MAC)
+--- MuseScore-4.1.1/src/diagnostics/CMakeLists.txt~ 2023-07-25 18:38:26.000000000 +0000
++++ MuseScore-4.1.1/src/diagnostics/CMakeLists.txt 2023-08-06 08:59:41.430792298 +0000
+@@ -134,7 +134,7 @@
+ endif()
+ endif()
+
+- install(PROGRAMS ${MUE_CRASHPAD_HANDLER_PATH} DESTINATION bin)
++ # install(PROGRAMS ${MUE_CRASHPAD_HANDLER_PATH} DESTINATION bin)
+ elseif(OS_IS_WIN)
+ if (NOT MUE_CRASHPAD_HANDLER_PATH)
+ set(MUE_CRASHPAD_HANDLER_PATH ${CPAD_ROOT_PATH}/windows/x86-64/crashpad_handler.exe)
diff --git a/set_as_stable.patch b/set_as_stable.patch
index d603713..08179f1 100644
--- a/set_as_stable.patch
+++ b/set_as_stable.patch
@@ -1,11 +1,11 @@
---- MuseScore-4.0.2/CMakeLists.txt~ 2023-03-13 12:59:42.000000000 +0000
-+++ MuseScore-4.0.2/CMakeLists.txt 2023-03-16 22:48:04.570633760 +0000
-@@ -40,7 +40,7 @@
- ###########################################
+--- MuseScore-4.1.1/CMakeLists.txt~ 2023-07-25 18:38:26.000000000 +0000
++++ MuseScore-4.1.1/CMakeLists.txt 2023-08-06 09:05:22.472378347 +0000
+@@ -46,7 +46,7 @@
+ # - vtest - for visual tests (for CI)
+ # - utest - for unit tests (for CI)
- set(MUSESCORE_REVISION "" CACHE STRING "Build revision")
--set(MUSESCORE_BUILD_CONFIG "dev" CACHE STRING "Build config")
-+set(MUSESCORE_BUILD_CONFIG "release" CACHE STRING "Build config")
- # Possible MUSESCORE_BUILD_CONFIG values:
+-set(MUSESCORE_BUILD_MODE "dev" CACHE STRING "Build mode")
++set(MUSESCORE_BUILD_MODE "release" CACHE STRING "Build mode")
+ # Possible MUSESCORE_BUILD_MODE values:
# - dev - for development/nightly builds
# - testing - for testing versions (alpha, beta, RC)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/musescore.git/commitdiff/59c6d48a1f54aa9fadf31645bf909673a10f4794
More information about the pld-cvs-commit
mailing list