From aeb339494039401954a384b0aaf361f8664ddbe2bcb4e7ecb2ff633f804b05fa Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 15 Dec 2022 16:00:39 +0000 Subject: [PATCH 01/14] first run for update to 4.0. Needs more work OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=101 --- MuseScore-3.6.2.tar.gz | 3 - MuseScore-4.0.tar.gz | 3 + musescore.spec | 50 +++----- no-webview-in-startcentre.patch | 176 ----------------------------- use-qtmake-qt5.patch | 29 +++-- use-system-qtwebengine-files.patch | 26 ----- 6 files changed, 33 insertions(+), 254 deletions(-) delete mode 100644 MuseScore-3.6.2.tar.gz create mode 100644 MuseScore-4.0.tar.gz delete mode 100644 no-webview-in-startcentre.patch delete mode 100644 use-system-qtwebengine-files.patch diff --git a/MuseScore-3.6.2.tar.gz b/MuseScore-3.6.2.tar.gz deleted file mode 100644 index be5772f..0000000 --- a/MuseScore-3.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45 -size 69077899 diff --git a/MuseScore-4.0.tar.gz b/MuseScore-4.0.tar.gz new file mode 100644 index 0000000..b7f8dea --- /dev/null +++ b/MuseScore-4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1384979d3a0c1c0e4c9f4f5f5f58aa7998ce7efd4408284e9f60345dce63eda3 +size 123828349 diff --git a/musescore.spec b/musescore.spec index ce0ac1e..9d2f5d5 100644 --- a/musescore.spec +++ b/musescore.spec @@ -16,22 +16,18 @@ # -%ifarch ppc64 ppc64le -%define qtwebengine 0 -%else -%define qtwebengine 1 -%endif - # Internal QML imports %global __requires_exclude qmlimport\\((MuseScore|FileIO).* +# Workaround boo#1189991 +%define _lto_cflags %{nil} %define rname mscore -%define version_lesser 3.6 +%define version_lesser 4.0 %define revision 3224f34 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore -Version: 3.6.2 +Version: 4.0 Release: 0 Summary: A WYSIWYG music score typesetter # Musescore code license is GPL-2.0 @@ -41,7 +37,7 @@ License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0 Group: Productivity/Multimedia/Sound/Editors and Convertors URL: https://musescore.org Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseScore-%{version}.tar.gz -Source1: %{rname}.desktop +#Source1: %{rname}.desktop # MuseScore expect to be able to download the latest version of its soundfonts # They are downloaded from the link conteinde in CMakeLists.text # They are newer versions than the one included in the MuseScore tarball itself @@ -52,9 +48,9 @@ Source5: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General # PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present Patch0: use-qtmake-qt5.patch # PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed -Patch1: use-system-qtwebengine-files.patch +#FIXME Patch1: use-system-qtwebengine-files.patch # PATCH-FIX-OPENSUSE: don't use webview in startcentre (boo#1181604) -Patch2: no-webview-in-startcentre.patch +#FIXME Patch2: no-webview-in-startcentre.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -62,6 +58,7 @@ BuildRequires: libQt5Help5 BuildRequires: libQt5QuickTemplates2-devel BuildRequires: libmp3lame-devel BuildRequires: libqt5-linguist-devel +BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: pkgconfig BuildRequires: portmidi-devel BuildRequires: strip-nondeterminism @@ -71,7 +68,7 @@ BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Designer) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Help) -BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5NetworkAuth) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5QuickControls2) @@ -79,12 +76,8 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5UiTools) -%if %qtwebengine -BuildRequires: pkgconfig(Qt5WebEngine) -BuildRequires: pkgconfig(Qt5WebEngineCore) -BuildRequires: pkgconfig(Qt5WebEngineWidgets) -%endif BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5XmlPatterns) BuildRequires: pkgconfig(alsa) @@ -134,31 +127,22 @@ sed 's/\r$//' thirdparty/rtf2html/README.ru > tmpfile touch -r thirdparty/rtf2html/README.ru tmpfile mv -f tmpfile thirdparty/rtf2html/README.ru -sed 's/\r$//' thirdparty/portmidi/README.txt > tmpfile -touch -r thirdparty/portmidi/README.txt tmpfile -mv -f tmpfile thirdparty/portmidi/README.txt - %build %define __builddir build.release %cmake \ -DCMAKE_BUILD_TYPE=RELEASE \ -DMUSESCORE_BUILD_CONFIG=release \ + -DBUILD_UNIT_TESTS=OFF \ -DUSE_SYSTEM_FREETYPE="ON" \ -%if %qtwebengine - -DBUILD_WEBENGINE="ON" \ -%else - -DBUILD_WEBENGINE="OFF" \ -%endif -DBUILD_TELEMETRY_MODULE=OFF \ -DMUSESCORE_REVISION=%{revision} %make_jobs lrelease all # Put the desktop file in place for the packaging -cp %{SOURCE1} . +#cp %{SOURCE1} . %install %cmake_install -strip-nondeterminism -t zip %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/workspaces/*.workspace # install fonts mkdir -p %{buildroot}%{fontdir} @@ -174,13 +158,12 @@ install -p -m 644 fonts/petaluma/PetalumaText.otf %{buildroot}/%{fontdir} # unique names for font docs mv fonts/edwin/README.md fonts/edwin/README.md.edwin -mv fonts/edwin/GPL_LICENSE.txt fonts/edwin/GPL_LICENSE.txt.edwin mv fonts/edwin/LICENSE.txt fonts/edwin/LICENSE.txt.edwin mv fonts/leland/README.md fonts/leland/README.md.leland mv fonts/leland/LICENSE.txt fonts/leland/LICENSE.txt.leland # update desktop file -%suse_update_desktop_file -n %{rname} AudioVideo AudioVideoEditing +#%suse_update_desktop_file -n org.musescore.MuseScore AudioVideo AudioVideoEditing # also package additional demos mkdir -p %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/demos @@ -242,10 +225,10 @@ install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYIN %endif %files -%{_bindir}/%{name} +%{_bindir}/crashpad_handler %{_bindir}/%{rname} %{_datadir}/metainfo/org.musescore.MuseScore.appdata.xml -%{_datadir}/applications/%{rname}.desktop +%{_datadir}/applications/org.musescore.MuseScore.desktop %{_datadir}/mime/packages/* %{_datadir}/icons/hicolor/* %dir %{_datadir}/%{rname}-%{version_lesser} @@ -256,6 +239,8 @@ install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYIN %dir %docdir %doc %docdir/* +%{_libdir} + %files fonts %dir %{fontdir} %{fontdir}/*.ttf @@ -269,7 +254,6 @@ install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYIN # see section 'unique names for font docs' above %doc fonts/edwin/README.md.edwin -%doc fonts/edwin/GPL_LICENSE.txt.edwin %doc fonts/edwin/LICENSE.txt.edwin %doc fonts/leland/README.md.leland %doc fonts/leland/LICENSE.txt.leland diff --git a/no-webview-in-startcentre.patch b/no-webview-in-startcentre.patch deleted file mode 100644 index 20df760..0000000 --- a/no-webview-in-startcentre.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -ur a/mscore/startcenter.cpp b/mscore/startcenter.cpp ---- a/mscore/startcenter.cpp 2021-02-08 13:16:37.000000000 +0100 -+++ b/mscore/startcenter.cpp 2021-04-24 14:18:23.888027687 +0200 -@@ -58,43 +58,6 @@ - connect(closeButton, SIGNAL(clicked()), this, SLOT(close())); - setStyleSheet(QString("QPushButton { background-color: %1 }").arg(openScore->palette().color(QPalette::Base).name())); - --#ifdef USE_WEBENGINE -- if (!noWebView) { --#if defined(WIN_PORTABLE) -- QWebEngineProfile* defaultProfile = QWebEngineProfile::defaultProfile(); -- defaultProfile->setCachePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath()))); -- defaultProfile->setPersistentStoragePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath()))); --#endif -- _webView = new MyWebView(this); -- _webView->setMaximumWidth(200); -- -- MyWebEnginePage* page = new MyWebEnginePage(this); -- MyWebUrlRequestInterceptor* wuri = new MyWebUrlRequestInterceptor(page); -- QWebEngineProfile* profile = page->profile(); --#if defined(WIN_PORTABLE) -- profile->setCachePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath()))); -- profile->setPersistentStoragePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath()))); --#endif -- profile->setRequestInterceptor(wuri); -- _webView->setPage(page); -- -- auto extendedVer = QString(VERSION) + "." + QString(BUILD_NUMBER); -- QUrl connectPageUrl = QUrl(QString("https://connect2.musescore.com/?version=%1").arg(extendedVer)); -- _webView->setUrl(connectPageUrl); -- -- horizontalLayout->addWidget(_webView); -- -- //workaround for the crashes sometimes happening in Chromium on macOS with Qt 5.12 -- connect(_webView, &QWebEngineView::renderProcessTerminated, this, [this, profile, connectPageUrl](QWebEnginePage::RenderProcessTerminationStatus terminationStatus, int exitCode) -- { -- qDebug() << "Login page loading terminated" << terminationStatus << " " << exitCode; -- profile->clearHttpCache(); -- _webView->load(connectPageUrl); -- _webView->show(); -- }); -- } --#endif -- - // if (enableExperimental) - // right now don’t know how it use in WebEngine @handrok - // QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true); -@@ -217,62 +180,5 @@ - AbstractDialog::keyReleaseEvent(event); - } - --#ifdef USE_WEBENGINE -- --//--------------------------------------------------------- --// MyWebView --//--------------------------------------------------------- -- --MyWebView::MyWebView(QWidget *parent): -- QWebEngineView(parent) -- { -- if (!enableExperimental) -- setContextMenuPolicy(Qt::NoContextMenu); -- } -- --//--------------------------------------------------------- --// ~MyWebView --//--------------------------------------------------------- -- --MyWebView::~MyWebView() -- { -- disconnect(this, SIGNAL(loadFinished(bool)), this, SLOT(stopBusy(bool))); -- } -- --//--------------------------------------------------------- --// sizeHint --//--------------------------------------------------------- -- --QSize MyWebView::sizeHint() const -- { -- return QSize(200 , 600); -- } -- -- --bool MyWebEnginePage::acceptNavigationRequest(const QUrl & url, QWebEnginePage::NavigationType type, bool isMainFrame) -- { -- qDebug() << "acceptNavigationRequest(" << url << "," << type << "," << isMainFrame << ")"; -- -- if (type == QWebEnginePage::NavigationTypeLinkClicked) -- { -- QString path(url.path()); -- QFileInfo fi(path); -- if (fi.suffix() == "mscz" || fi.suffix() == "xml" -- || fi.suffix() == "musicxml" || fi.suffix() == "mxl") { -- mscore->loadFile(url); -- QAction* a = getAction("startcenter"); -- a->setChecked(false); -- mscore->showStartcenter(false); -- } -- else -- QDesktopServices::openUrl(url); -- -- return false; -- } -- return true; -- } -- -- --#endif //USE_WEBENGINE - } - -diff -ur a/mscore/startcenter.h b/mscore/startcenter.h ---- a/mscore/startcenter.h 2021-02-08 13:16:37.000000000 +0100 -+++ b/mscore/startcenter.h 2021-04-24 14:19:16.684029679 +0200 -@@ -19,62 +19,12 @@ - - namespace Ms { - --#ifdef USE_WEBENGINE -- --class MyWebUrlRequestInterceptor : public QWebEngineUrlRequestInterceptor { -- Q_OBJECT -- -- public: -- MyWebUrlRequestInterceptor(QObject* p = Q_NULLPTR) -- : QWebEngineUrlRequestInterceptor(p) {} -- -- void interceptRequest(QWebEngineUrlRequestInfo& info) -- { -- info.setHttpHeader("Accept-Language", -- QString("%1;q=0.8,en-US;q=0.6,en;q=0.4").arg(mscore->getLocaleISOCode()).toUtf8()); -- } -- }; -- --//--------------------------------------------------------- --// MyWebEnginePage --//--------------------------------------------------------- -- --class MyWebEnginePage : public QWebEnginePage { -- Q_OBJECT -- -- public: -- MyWebEnginePage(QObject* parent = Q_NULLPTR) -- : QWebEnginePage(parent) {} -- -- bool acceptNavigationRequest(const QUrl& url, QWebEnginePage::NavigationType type, bool isMainFrame); -- }; -- --//--------------------------------------------------------- --// MyWebEngineView --//--------------------------------------------------------- -- --class MyWebView : public QWebEngineView { -- Q_OBJECT -- -- public slots: -- -- public: -- MyWebView(QWidget* parent = 0); -- ~MyWebView(); -- virtual QSize sizeHint() const; -- }; -- --#endif //USE_WEBENGINE -- - //--------------------------------------------------------- - // Startcenter - //--------------------------------------------------------- - - class Startcenter : public AbstractDialog, public Ui::Startcenter { - Q_OBJECT --#ifdef USE_WEBENGINE -- MyWebView* _webView; --#endif - virtual void closeEvent(QCloseEvent*); - - private slots: diff --git a/use-qtmake-qt5.patch b/use-qtmake-qt5.patch index 2655351..2a6366f 100644 --- a/use-qtmake-qt5.patch +++ b/use-qtmake-qt5.patch @@ -1,7 +1,16 @@ -diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake ---- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100 -+++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100 -@@ -55,7 +47,7 @@ +diff -ur a/build/cmake/FindQt5.cmake b/build/cmake/FindQt5.cmake +--- a/build/cmake/FindQt5.cmake 2022-12-13 22:58:31.000000000 +0100 ++++ b/build/cmake/FindQt5.cmake 2022-12-14 20:37:54.029305951 +0100 +@@ -2,7 +2,7 @@ + include(GetUtilsFunctions) # library of CMake functions ("fn__" namespace) + + # Print Qt version or fail the build if Qt (qmake) is not in PATH. +-fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake) ++fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5) + + set(CMAKE_AUTOUIC ON) + set(CMAKE_AUTOMOC ON) +@@ -52,7 +52,7 @@ include_directories(${QT_INCLUDES}) @@ -10,15 +19,3 @@ diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake set(_qmake_vars QT_INSTALL_ARCHDATA QT_INSTALL_BINS -diff -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-01-14 14:33:11.000000000 +0100 -+++ b/CMakeLists.txt 2021-01-15 13:24:07.140841485 +0100 -@@ -25,7 +25,7 @@ - include(build/functions.cmake) # library of CMake functions ("fn__" namespace) - - # Print Qt version or fail the build if Qt (qmake) is not in PATH. --fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake) -+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5) - - # Libraries linked via full path no longer produce linker search paths. - cmake_policy(SET CMP0003 NEW) diff --git a/use-system-qtwebengine-files.patch b/use-system-qtwebengine-files.patch deleted file mode 100644 index c379572..0000000 --- a/use-system-qtwebengine-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt -index 6c489e8..03f26a0 100644 ---- a/main/CMakeLists.txt -+++ b/main/CMakeLists.txt -@@ -217,21 +217,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 From 760b07de224fcf557da182cf933b2037af4d881d794b33f210451f83722dd71f Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 15 Dec 2022 21:04:12 +0000 Subject: [PATCH 02/14] make it build OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=102 --- musescore.spec | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/musescore.spec b/musescore.spec index 9d2f5d5..59ad7e9 100644 --- a/musescore.spec +++ b/musescore.spec @@ -169,6 +169,10 @@ 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 unneeded include and lib dir +rm -rf %{buildroot}%{_includedir} +rm -rf %{buildroot}%{_libdir} + # collect doc files install -d -m 755 %{buildroot}%docdir install -p -m 644 thirdparty/beatroot/COPYING %{buildroot}%docdir/COPYING.beatroot @@ -176,38 +180,16 @@ install -p -m 644 thirdparty/beatroot/README.txt %{buildroot}%docdir/README install -p -m 644 thirdparty/dtl/COPYING %{buildroot}%docdir/COPYING.BSD.dtl install -p -m 644 thirdparty/freetype/README %{buildroot}%docdir/README.freetype install -p -m 644 thirdparty/intervaltree/README %{buildroot}%docdir/README.intervaltree -install -p -m 644 thirdparty/ofqf/README.md %{buildroot}%docdir/README.md.ofqf install -p -m 644 thirdparty/rtf2html/ChangeLog %{buildroot}%docdir/ChangeLog.rtf2html install -p -m 644 thirdparty/rtf2html/COPYING.LESSER %{buildroot}%docdir/COPYING.LESSER.rtf2html 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/portmidi/README.txt %{buildroot}%docdir/README.txt.portmidi -install -p -m 644 thirdparty/portmidi/license.txt %{buildroot}%docdir/license.txt.portmidi -install -p -m 644 thirdparty/qt-google-analytics/README.md %{buildroot}%docdir/README.md.qt-google-analytics -install -p -m 644 thirdparty/qt-google-analytics/LICENSE.txt %{buildroot}%docdir/LICENSE.qt-google-analytics 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 -# aeolus not included in this build -#install -p -m 644 aeolus/AUTHORS %%{buildroot}%%{docdir}/AUTHORS.aeolus -#install -p -m 644 aeolus/COPYING %%{buildroot}%%{docdir}/COPYING.aeolus -#install -p -m 644 aeolus/README %%{buildroot}%%{docdir}/README.aeolus -#install -p -m 644 aeolus/README.mscore %%{buildroot}%%{docdir}/README.mscore.aeolus -#install -p -m 644 aeolus/README.mscore1 %%{buildroot}%%{docdir}/README.mscore1.aeolus - -install -p -m 644 bww2mxml/COPYING %{buildroot}%docdir/COPYING.bww2mxml -install -p -m 644 bww2mxml/README %{buildroot}%docdir/README.bww2mxml -install -p -m 644 effects/chorus/COPYING %{buildroot}%docdir/COPYING.chorus -install -p -m 644 effects/chorus/README %{buildroot}%docdir/README.chorus -install -p -m 644 effects/compressor/README %{buildroot}%docdir/README.compressor -install -p -m 644 share/sound/README.md %{buildroot}%docdir/README.md.sound -install -p -m 644 share/locale/README.md %{buildroot}%docdir/README.md.locale -install -p -m 644 share/instruments/README.md %{buildroot}%docdir/README.md.instruments -install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYING.wallpaper - %fdupes %{buildroot}/%{_prefix} %if 0%{?suse_version} < 1500 @@ -239,8 +221,6 @@ install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYIN %dir %docdir %doc %docdir/* -%{_libdir} - %files fonts %dir %{fontdir} %{fontdir}/*.ttf From a7be2c62a3acdf5d1347bb2202dddf75f000175b1f38bbdda56df0fb35c20471 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 15 Dec 2022 21:48:12 +0000 Subject: [PATCH 03/14] - Update to 4.0: Changes in interface, graving, soundsystem, mixer, everything See [200~https://musescore.org/nl/node/337788 - Removed unused patches: * no-webview-in-startcentre.patch * use-system-qtwebengine-files.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=103 --- musescore.changes | 10 +++++++++ musescore.spec | 55 ++++++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/musescore.changes b/musescore.changes index 8f94ba4..76c8cc4 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 15 21:46:00 UTC 2022 - Cor Blom + +- Update to 4.0: + Changes in interface, graving, soundsystem, mixer, everything + See [200~https://musescore.org/nl/node/337788 +- Removed unused patches: + * no-webview-in-startcentre.patch + * use-system-qtwebengine-files.patch + ------------------------------------------------------------------- Sat Aug 27 20:06:56 UTC 2022 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 59ad7e9..5fd1658 100644 --- a/musescore.spec +++ b/musescore.spec @@ -37,30 +37,21 @@ License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0 Group: Productivity/Multimedia/Sound/Editors and Convertors URL: https://musescore.org Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseScore-%{version}.tar.gz -#Source1: %{rname}.desktop # MuseScore expect to be able to download the latest version of its soundfonts # They are downloaded from the link conteinde in CMakeLists.text # They are newer versions than the one included in the MuseScore tarball itself -Source2: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_Changelog.md -Source3: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_License.md -Source4: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_Readme.md -Source5: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3 +Source1: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_Changelog.md +Source2: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_License.md +Source3: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General_Readme.md +Source4: https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3 # PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present Patch0: use-qtmake-qt5.patch -# PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed -#FIXME Patch1: use-system-qtwebengine-files.patch -# PATCH-FIX-OPENSUSE: don't use webview in startcentre (boo#1181604) -#FIXME Patch2: no-webview-in-startcentre.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libQt5Help5 -BuildRequires: libQt5QuickTemplates2-devel -BuildRequires: libmp3lame-devel BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: pkgconfig -BuildRequires: portmidi-devel BuildRequires: strip-nondeterminism BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Concurrent) @@ -110,9 +101,17 @@ BuildArch: noarch %description fonts Additional fonts for use by the MuseScore music notation program. +%package devel +Summary: MuseScore development files +License: GPL-3.0-or-later WITH Font-exception-2.0 AND OFL-1.1 +Group: Development/Libraries/C and C++ + +%description devel +MuseScore files, used for plugin development. + %prep %autosetup -p1 -n MuseScore-%{version} -cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} share/sound/ +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} share/sound/ # fix EOL encoding sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile @@ -136,14 +135,14 @@ mv -f tmpfile thirdparty/rtf2html/README.ru -DUSE_SYSTEM_FREETYPE="ON" \ -DBUILD_TELEMETRY_MODULE=OFF \ -DMUSESCORE_REVISION=%{revision} -%make_jobs lrelease all - -# Put the desktop file in place for the packaging -#cp %{SOURCE1} . +%make_jobs lrelease all. %install %cmake_install +# don't package staic libs +rm %{buildroot}%{_libdir}/*.a + # install fonts mkdir -p %{buildroot}%{fontdir} install -p -m 644 fonts/*.ttf %{buildroot}/%{fontdir} @@ -162,17 +161,10 @@ mv fonts/edwin/LICENSE.txt fonts/edwin/LICENSE.txt.edwin mv fonts/leland/README.md fonts/leland/README.md.leland mv fonts/leland/LICENSE.txt fonts/leland/LICENSE.txt.leland -# update desktop file -#%suse_update_desktop_file -n org.musescore.MuseScore AudioVideo AudioVideoEditing - # also package additional demos mkdir -p %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/demos install -p -m 644 demos/*.mscz %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/demos -# remove unneeded include and lib dir -rm -rf %{buildroot}%{_includedir} -rm -rf %{buildroot}%{_libdir} - # collect doc files install -d -m 755 %{buildroot}%docdir install -p -m 644 thirdparty/beatroot/COPYING %{buildroot}%docdir/COPYING.beatroot @@ -190,6 +182,10 @@ install -p -m 644 thirdparty/singleapp/LICENSE.GPL3 %{buildroot}%docdir/LICENS 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 +install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYING.wallpaper + %fdupes %{buildroot}/%{_prefix} %if 0%{?suse_version} < 1500 @@ -238,4 +234,13 @@ install -p -m 644 thirdparty/singleapp/README.TXT %{buildroot}%docdir/README %doc fonts/leland/README.md.leland %doc fonts/leland/LICENSE.txt.leland +%files devel +%license LICENSE.GPL +%{_includedir}/gmock +%{_includedir}/gtest +%{_includedir}/kddockwidgets +%{_includedir}/opus +%{_libdir}/cmake +%{_libdir}/pkgconfig/*.pc + %changelog From f13e8fc1f1257fb80bd04df765bb26e0fa7fb8b946caf1e494d7a5838d5e1a67 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 15 Dec 2022 21:59:24 +0000 Subject: [PATCH 04/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=104 --- musescore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.spec b/musescore.spec index 5fd1658..51ba0f8 100644 --- a/musescore.spec +++ b/musescore.spec @@ -135,7 +135,7 @@ mv -f tmpfile thirdparty/rtf2html/README.ru -DUSE_SYSTEM_FREETYPE="ON" \ -DBUILD_TELEMETRY_MODULE=OFF \ -DMUSESCORE_REVISION=%{revision} -%make_jobs lrelease all. +%make_jobs %install %cmake_install From 7d644877aad4ed6a23e5aa2a42bb3128507bbb6826234ee0bf68c3e7e143c975 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 15 Dec 2022 22:17:56 +0000 Subject: [PATCH 05/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=105 --- musescore.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/musescore.spec b/musescore.spec index 51ba0f8..cc3b1f1 100644 --- a/musescore.spec +++ b/musescore.spec @@ -203,6 +203,7 @@ install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYIN %endif %files +%license LICENSE.GP %{_bindir}/crashpad_handler %{_bindir}/%{rname} %{_datadir}/metainfo/org.musescore.MuseScore.appdata.xml @@ -212,8 +213,7 @@ install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYIN %dir %{_datadir}/%{rname}-%{version_lesser} %{_datadir}/%{rname}-%{version_lesser}/* %{_mandir}/man1/* -%doc README.md -%license LICENSE.GPL +%doc README.mdL %dir %docdir %doc %docdir/* @@ -236,11 +236,8 @@ install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYIN %files devel %license LICENSE.GPL -%{_includedir}/gmock -%{_includedir}/gtest %{_includedir}/kddockwidgets %{_includedir}/opus %{_libdir}/cmake -%{_libdir}/pkgconfig/*.pc %changelog From abb5cc963349b27af4d9cfc1f5c114961e0d2805036def868cb876b27bdc9a8b Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 16 Dec 2022 08:37:46 +0000 Subject: [PATCH 06/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=106 --- musescore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.spec b/musescore.spec index cc3b1f1..cd18a12 100644 --- a/musescore.spec +++ b/musescore.spec @@ -203,7 +203,7 @@ install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYIN %endif %files -%license LICENSE.GP +%license LICENSE.GPL %{_bindir}/crashpad_handler %{_bindir}/%{rname} %{_datadir}/metainfo/org.musescore.MuseScore.appdata.xml From 275ed06e2386ffac5d9cd64bed3408497c1c382d960395b0b4631d276b0b5b89 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 16 Dec 2022 09:45:20 +0000 Subject: [PATCH 07/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=107 --- musescore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.spec b/musescore.spec index cd18a12..d9c8e3c 100644 --- a/musescore.spec +++ b/musescore.spec @@ -213,7 +213,7 @@ install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYIN %dir %{_datadir}/%{rname}-%{version_lesser} %{_datadir}/%{rname}-%{version_lesser}/* %{_mandir}/man1/* -%doc README.mdL +%doc README.md %dir %docdir %doc %docdir/* From c02dcd60fe303c3e9a674d6eddfd8407f4f52262dcbaa176252e7ca2693fd39d Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 16 Dec 2022 10:08:45 +0000 Subject: [PATCH 08/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=108 --- mscore.desktop | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 mscore.desktop diff --git a/mscore.desktop b/mscore.desktop deleted file mode 100644 index aa67560..0000000 --- a/mscore.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Comment=WYSIWYG Music score typesetter -Comment[de]=WYSIWYG Noteneditor -Exec=mscore -GenericName=Music score typesetter -Icon=mscore -Name=MuseScore -StartupNotify=true -Terminal=false -Type=Application From 215a6793391efd1928bc0b4e57163d4df0aef16423e8895eae769b557cae065a Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 16 Dec 2022 16:08:40 +0000 Subject: [PATCH 09/14] - Add Qt5QuickTemplate2 to BuildRequires - Remove opus devel files and add requires to system files OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=109 --- musescore.changes | 6 ++++++ musescore.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/musescore.changes b/musescore.changes index 76c8cc4..2a8eb2d 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 16 16:06:45 UTC 2022 - Cor Blom + +- Add Qt5QuickTemplate2 to BuildRequires +- Remove opus devel files and add requires to system files + ------------------------------------------------------------------- Thu Dec 15 21:46:00 UTC 2022 - Cor Blom diff --git a/musescore.spec b/musescore.spec index d9c8e3c..5c559c7 100644 --- a/musescore.spec +++ b/musescore.spec @@ -63,6 +63,7 @@ BuildRequires: pkgconfig(Qt5NetworkAuth) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5QuickControls2) +BuildRequires: pkgconfig(Qt5QuickTemplate2) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) @@ -105,6 +106,7 @@ Additional fonts for use by the MuseScore music notation program. Summary: MuseScore development files License: GPL-3.0-or-later WITH Font-exception-2.0 AND OFL-1.1 Group: Development/Libraries/C and C++ +Requires: pkgconfig(opus) %description devel MuseScore files, used for plugin development. @@ -165,6 +167,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 +rm -rf %{_includedir}/opus + # collect doc files install -d -m 755 %{buildroot}%docdir install -p -m 644 thirdparty/beatroot/COPYING %{buildroot}%docdir/COPYING.beatroot @@ -237,7 +242,6 @@ install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYIN %files devel %license LICENSE.GPL %{_includedir}/kddockwidgets -%{_includedir}/opus %{_libdir}/cmake %changelog From 51113245008a67b30cab06ab9e5a8c720d21e94b1b28b5703d6a6ef955c94335 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 16 Dec 2022 18:45:39 +0000 Subject: [PATCH 10/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=110 --- musescore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.spec b/musescore.spec index 5c559c7..fee2e99 100644 --- a/musescore.spec +++ b/musescore.spec @@ -63,7 +63,7 @@ BuildRequires: pkgconfig(Qt5NetworkAuth) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5QuickControls2) -BuildRequires: pkgconfig(Qt5QuickTemplate2) +BuildRequires: pkgconfig(Qt5QuickTemplates2) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) From c5434b07b023a5cb75363665693c5f2de6788e22bfe590ed87f38a7d5e8b3b8a Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 16 Dec 2022 19:23:48 +0000 Subject: [PATCH 11/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=111 --- musescore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.spec b/musescore.spec index fee2e99..3b27a38 100644 --- a/musescore.spec +++ b/musescore.spec @@ -168,7 +168,7 @@ 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 -rm -rf %{_includedir}/opus +rm -rf %{buildroot}%{_includedir}/opus # collect doc files install -d -m 755 %{buildroot}%docdir From 6675fcbfc06b2d51d5355c82097387efdda4645c742b3a30c5975333feed46d2 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 16 Dec 2022 21:36:34 +0000 Subject: [PATCH 12/14] - Remove explicit opus-devel require OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=112 --- musescore.changes | 5 +++++ musescore.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/musescore.changes b/musescore.changes index 2a8eb2d..2c556ad 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 16 21:35:50 UTC 2022 - Cor Blom + +- Remove explicit opus-devel require + ------------------------------------------------------------------- Fri Dec 16 16:06:45 UTC 2022 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 3b27a38..c79d821 100644 --- a/musescore.spec +++ b/musescore.spec @@ -106,7 +106,6 @@ Additional fonts for use by the MuseScore music notation program. Summary: MuseScore development files License: GPL-3.0-or-later WITH Font-exception-2.0 AND OFL-1.1 Group: Development/Libraries/C and C++ -Requires: pkgconfig(opus) %description devel MuseScore files, used for plugin development. From 72b125cc85309a0c66f5d24df2e3feec6992157afd652ef06394e71d3490a406 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sat, 17 Dec 2022 11:20:38 +0000 Subject: [PATCH 13/14] - Do not build crashpad and remove the prebuilt crashpad binary OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=113 --- musescore.changes | 5 +++++ musescore.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/musescore.changes b/musescore.changes index 2c556ad..1931c9d 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Dec 17 11:19:50 UTC 2022 - Cor Blom + +- Do not build crashpad and remove the prebuilt crashpad binary + ------------------------------------------------------------------- Fri Dec 16 21:35:50 UTC 2022 - Cor Blom diff --git a/musescore.spec b/musescore.spec index c79d821..bfccc82 100644 --- a/musescore.spec +++ b/musescore.spec @@ -133,8 +133,8 @@ mv -f tmpfile thirdparty/rtf2html/README.ru -DCMAKE_BUILD_TYPE=RELEASE \ -DMUSESCORE_BUILD_CONFIG=release \ -DBUILD_UNIT_TESTS=OFF \ - -DUSE_SYSTEM_FREETYPE="ON" \ - -DBUILD_TELEMETRY_MODULE=OFF \ + -DUSE_SYSTEM_FREETYPE=ON \ + -DBUILD_CRASHPAD_CLIENT=OFF \ -DMUSESCORE_REVISION=%{revision} %make_jobs @@ -168,6 +168,8 @@ install -p -m 644 demos/*.mscz %{buildroot}%{_datadir}/%{rname}-%{version_lesser # Remove opus devel files, they are provided by system rm -rf %{buildroot}%{_includedir}/opus +# Delete crashpad binary +rm -rf %{buildroot}/usr/bin/crashpad_handler # collect doc files install -d -m 755 %{buildroot}%docdir @@ -208,7 +210,6 @@ install -p -m 644 share/wallpapers/COPYRIGHT %{buildroot}%docdir/COPYIN %files %license LICENSE.GPL -%{_bindir}/crashpad_handler %{_bindir}/%{rname} %{_datadir}/metainfo/org.musescore.MuseScore.appdata.xml %{_datadir}/applications/org.musescore.MuseScore.desktop From ccfd713d3e2e35509570a68dafdee8a249dbc7c1ea8c987726d8bb1d506412a8 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sat, 17 Dec 2022 11:42:59 +0000 Subject: [PATCH 14/14] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=114 --- musescore.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.changes b/musescore.changes index 1931c9d..824cde2 100644 --- a/musescore.changes +++ b/musescore.changes @@ -19,7 +19,7 @@ Thu Dec 15 21:46:00 UTC 2022 - Cor Blom - Update to 4.0: Changes in interface, graving, soundsystem, mixer, everything - See [200~https://musescore.org/nl/node/337788 + See https://musescore.org/nl/node/337788 - Removed unused patches: * no-webview-in-startcentre.patch * use-system-qtwebengine-files.patch