Accepting request 1103549 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1103549
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/musescore?expand=0&rev=35

0dde64eef84.patch

@@ -1,18 +0,0 @@
-commit 0dde64eef849027d16a0ac83b15bc8789d678564
-Author: Jerry James <loganjerry@gmail.com>
-Date:   Tue Dec 6 13:19:35 2022 -0700
-
-    Fix cmake error when building with jack on Linux
-
-Index: MuseScore-4.0.2/build/cmake/FindJack.cmake
-===================================================================
---- MuseScore-4.0.2.orig/build/cmake/FindJack.cmake
-+++ MuseScore-4.0.2/build/cmake/FindJack.cmake
-@@ -28,6 +28,7 @@ IF(BUILD_JACK)
-            set (JACK_LIB "$ENV{${progenv}}/Jack/lib/libjack.a")
-            MESSAGE("JACK support enabled.")
-      ELSE(MINGW OR MSVC)
-+           include(UsePkgConfig1)
-            PKGCONFIG1 (jack ${JACK_MIN_VERSION} JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP)
-            IF(JACK_INCDIR)
-                  MESSAGE(STATUS "${JACK_LONGNAME} >= ${JACK_MIN_VERSION} found. jack support enabled.")

MuseScore-4.0.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9907b75e6194405bf8c8d23d2bb1b03343c76258426a8aee11d161390fc4f06d
-size 123962958

MuseScore-4.1.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e53ce88b98c08422c8f8dc8c71c6e31d1038c2b263649f6647de6fa4269ce9b
+size 131007032

fix-for-latest-qt-declarative.patch

@@ -1,29 +0,0 @@
-From c747bdbcba81109e2749015a575827b2494af971 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Wed, 19 Apr 2023 23:22:14 +0800
-Subject: [PATCH] Set parentItem for pages in DockWindow
-
-After https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/40 a
-QQuickItem without a parentItem is always invisible. While this avoids
-some crashes in plasmashell, it breaks some applications like MuseScore
-where pages don't have a parent item.
-
-This is also important for Qt6 porting.
-
-Fixes #17276
----
- src/appshell/view/dockwindow/dockwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/appshell/view/dockwindow/dockwindow.cpp b/src/appshell/view/dockwindow/dockwindow.cpp
-index 1a2aaa428246..f8c79b8fe30a 100644
---- a/src/appshell/view/dockwindow/dockwindow.cpp
-+++ b/src/appshell/view/dockwindow/dockwindow.cpp
-@@ -619,6 +619,7 @@ void DockWindow::initDocks(DockPageView* page)
-     }
- 
-     if (page) {
-+        page->setParentItem(this);
-         page->init();
-     }
- 

musescore-4.0.2-return.patch

@@ -1,28 +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)

musescore.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Fri Aug 11 21:27:30 UTC 2023 - Cor Blom <cornelis@solcon.nl>
+
+- Update tp 4.1.1
+  New features in 4.1:
+  * New engraving and playback support for ornaments, including the
+    ability to set custom alterations for trills, turns and mordents
+  * A major improvement to the app's performance, allowing larger
+    scores to play back up to 60% more efficiently
+  * A dedicated new default reverb, which can be adjusted for each
+    instrument track as well as globally across the entire mix
+  * New auxiliary sends in the mixer, allowing instrument tracks to
+    be routed to dedicated auxiliary channel strips for applying
+    audio effects
+  * New engraving and playback support for capos on guitar staves
+  * New feature for displaying harp pedal diagrams
+  * Dynamics and expression text now automatically combine, plus new
+    controls for scaling and positioning dynamics
+  * New live Braille module, including a panel that displays
+    selected measures as Braille music notation (enabling more
+    efficient score reading on Braille displays)
+  * Upload audio directly to audio.com, allowing you to build a 
+    portfolio of your audio content to share with the world 
+  * View and open your online scores from musescore.com directly
+    from the desktop app 
+  Other updates:
+  * Save to cloud: option to make a score "unlisted"
+  * Publish to musescore.com: option to either replace the existing
+    published score, or publish the score as a new file
+  * New loading screen when opening multiple instances of the app on
+    macOS 
+  * Fixed syllable-based pasting of lyrics
+  * A more reliable VST scanning process
+  * Around 100 engraving fixes and improvements (Read this article on
+    musescore.org for a complete list)
+  * Numerous bug fixes
+- Removed patches:
+  * 0dde64eef84.patch
+  * fix-for-latest-qt-declarative.patch
+  * musescore-4.0.2-return.patch
+
 -------------------------------------------------------------------
 Fri Apr 28 08:39:34 UTC 2023 - Cor Blom <cornelis@solcon.nl>
 

musescore.spec

@@ -21,12 +21,12 @@
 # Workaround boo#1189991
 %define _lto_cflags %{nil}
 %define rname   mscore
-%define version_lesser 4.0
+%define version_lesser 4.1
 %define revision 5485621
 %define fontdir %{_datadir}/fonts/%{name}
 %define docdir  %{_docdir}/%{name}
 Name:           musescore
-Version:        4.0.2
+Version:        4.1.1
 Release:        0
 Summary:        A WYSIWYG music score typesetter
 # Licenses in MuseScore are a mess. To help other maintainers I give the following overview:
@@ -63,12 +63,6 @@ Source4:        https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General
 Source5:        README.SUSE
 # PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present
 Patch0:         use-qtmake-qt5.patch
-# PATCH-FIX-UPSTREAM: fix build with jack on linux.
-Patch1:         0dde64eef84.patch
-# PATCH-FIX-UPSTREAM: make compiler happy by adding returns
-Patch2:         musescore-4.0.2-return.patch
-# PATCH-FIX-UPSTREAM: change in qt-declaratives breaks musescore
-Patch3:         fix-for-latest-qt-declarative.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -153,8 +147,10 @@ sed 's/\r$//' thirdparty/rtf2html/README.ru > tmpfile
 touch -r thirdparty/rtf2html/README.ru tmpfile
 mv -f tmpfile thirdparty/rtf2html/README.ru
 
-# fix missing -ldl for Leaps
+## fix missing -ldl for Leaps
-sed -i 's/\(target_link_libraries(mscore ${LINK_LIB}\)/\1 ${CMAKE_DL_LIBS}/' src/main/CMakeLists.txt
+# comment out because error
+#TODO: check if still needed
+#sed -i 's/\(target_link_libraries(mscore ${LINK_LIB}\)/\1 ${CMAKE_DL_LIBS}/' src/main/CMakeLists.txt
 
 %build
 # Limit memory / threads on PowerPC to avoid memory issues
@@ -170,24 +166,20 @@ sed -i 's/\(target_link_libraries(mscore ${LINK_LIB}\)/\1 ${CMAKE_DL_LIBS}/' src
 # BUILD_VST:BOOL=ON
 # -DBUILD_UPDATE_MODULE:BOOL=OFF triggers bug  https://github.com/musescore/MuseScore/issues/15617
 %cmake \
-       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+       -DMUSESCORE_BUILD_CONFIGURATION=app \
        -DMUSESCORE_BUILD_CONFIG=release \
        -DBUILD_UNIT_TESTS=OFF \
        -DUSE_SYSTEM_FREETYPE=ON \
        -DBUILD_JACK:BOOL=ON \
        -DBUILD_UPDATE_MODULE:BOOL=ON \
        -DBUILD_CRASHPAD_CLIENT=OFF \
-       -DMUSESCORE_REVISION=%{revision}
+       -DMUSESCORE_REVISION=%{revision} \
+       -Wno-dev
 %cmake_build
 
 %install
 %cmake_install
 
-# don't package kddockwidgets. It should not be installed
-rm %{buildroot}%{_libdir}/*.a
-rm -r %{buildroot}%{_includedir}/kddockwidgets
-rm -r %{buildroot}%{_libdir}/cmake/KDDockWidgets
-
 # install fonts
 mkdir -p %{buildroot}%{fontdir}
 install -p -m 644 fonts/*.ttf %{buildroot}/%{fontdir}
@@ -210,8 +202,9 @@ mv fonts/leland/LICENSE.txt      fonts/leland/LICENSE.txt.leland
 mkdir -p %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/demos
 install -p -m 644 demos/*.mscz %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/demos
 
-# Remove opus devel files, they are provided by system
+# Remove all devel files
-rm -r %{buildroot}%{_includedir}/opus
+rm -r %{buildroot}%{_includedir}
+rm -r %{buildroot}%{_libdir}
 # Delete crashpad binary
 rm %{buildroot}%{_bindir}/crashpad_handler
 
@@ -228,10 +221,6 @@ install -p -m 644 thirdparty/rtf2html/COPYING.LESSER  %{buildroot}%docdir/COPYIN
 install -p -m 644 thirdparty/rtf2html/README          %{buildroot}%docdir/README.rtf2html
 install -p -m 644 thirdparty/rtf2html/README.mscore   %{buildroot}%docdir/README.mscore.rtf2html
 install -p -m 644 thirdparty/rtf2html/README.ru       %{buildroot}%docdir/README.ru.rtf2html
-install -p -m 644 thirdparty/singleapp/LGPL_EXCEPTION.txt %{buildroot}%docdir/LGPL_EXCEPTION.txt.singleapp
-install -p -m 644 thirdparty/singleapp/LICENSE.GPL3   %{buildroot}%docdir/LICENSE.GPL3.singleapp
-install -p -m 644 thirdparty/singleapp/LICENSE.LGPL   %{buildroot}%docdir/LICENSE.LGPL.singleapp
-install -p -m 644 thirdparty/singleapp/README.TXT     %{buildroot}%docdir/README.TXT.singleapp
 
 install -p -m 644 tools/bww2mxml/COPYING              %{buildroot}%docdir/COPYING.bww2mxml
 install -p -m 644 tools/bww2mxml/README               %{buildroot}%docdir/README.bww2mxml