Update audio/musescore to latest 3.0.5

The interesting improvements are in 3.0.3, UI and playback improvements: https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3/release-notes-musescore-303 Then 3.0.4 is some regression fixes, and 3.0.5 has plugin improvements: https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3x/release-notes-musescore-305 PR: 237198 Reported by: chitty_cloud@me.com
svn path=/head/; revision=498685
2019-04-11 21:39:46 +00:00 · 2019-04-11 21:39:46 +00:00 · 8d31c48e79 · 2021-03-31 03:12:20 +00:00
commit 8d31c48e79
parent c305052eac
4 changed files with 8 additions and 160 deletions
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	musescore
-DISTVERSION=	3.0.2
+DISTVERSION=	3.0.5
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${DISTVERSION}/
 DISTNAME=	MuseScore-${DISTVERSION}
@ -30,7 +30,8 @@ ALL_TARGET=	lrelease manpages all
 INSTALLS_ICONS=	yes
 CMAKE_ARGS+=	-DUSE_SYSTEM_FREETYPE="ON" \
 		-DBUILD_PORTMIDI=OFF \
-		-DBUILD_PCH=OFF
+		-DBUILD_PCH=OFF \
+		-DDOWNLOAD_SOUNDFONT=OFF

 DATADIR=	${PREFIX}/share/mscore-${PORTVERSION:R}

--- a/audio/musescore/distinfo
+++ b/audio/musescore/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1549439898
-SHA256 (MuseScore-3.0.2.zip) = 620ba2a56d80528c6654f4f59dcfe968b5667ac49fecfd63742ceb92aad5e0b1
-SIZE (MuseScore-3.0.2.zip) = 116531283
+TIMESTAMP = 1555007204
+SHA256 (MuseScore-3.0.5.zip) = 43ee606850195d9ea37f15abefa4110cc40e53f5597f2832d8ac71f25ad4abed
+SIZE (MuseScore-3.0.5.zip) = 120255687
--- a/audio/musescore/files/patch-git_bb0c1a9b
+++ b/audio/musescore/files/patch-git_bb0c1a9b
@ -1,155 +0,0 @@
-Upstream commit to fix non-WebEngine builds.
-
-https://github.com/musescore/MuseScore/commit/bb0c1a9b4940f3f6b52c0df535289ec8a3bc9e03
-
-diff --git a/mscore/logindialog.h b/mscore/logindialog.h
-index 4e86ae7985..f44511d8c0 100644
--- mscore/logindialog.h
-+++ mscore/logindialog.h
-@@ -21,6 +21,8 @@ class LoginManager;
- 
- //---------------------------------------------------------
- //   LoginDialog
-+//    Old-style login dialog in case QtWebEngine is
-+//    unavailable.
- //---------------------------------------------------------
- 
- class LoginDialog : public QDialog, public Ui::LoginDialog
-diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
-index 80c712aea9..5bb8354992 100644
--- mscore/musescore.cpp
-+++ mscore/musescore.cpp
-@@ -7572,12 +7572,14 @@ bool MuseScore::exportPartsPdfsToJSON(const QString& inFilePath, const QString&
-       }
- 
- //---------------------------------------------------------
-//   getQmlEngine
-+//   getPluginEngine
- //---------------------------------------------------------
- 
-+#ifdef SCRIPT_INTERFACE
- QmlPluginEngine* MuseScore::getPluginEngine()
-       {
-       if (!_qmlEngine)
-             _qmlEngine = new QmlPluginEngine(this);
-       return _qmlEngine;
-       }
-+#endif
-diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
-index a53d7fe811..664786ccc8 100644
--- mscore/network/loginmanager.cpp
-+++ mscore/network/loginmanager.cpp
-@@ -18,7 +18,9 @@
- #include "kQOAuth/kqoauthrequest.h"
- #include "kQOAuth/kqoauthrequest_xauth.h"
- 
-+#ifdef USE_WEBENGINE
- #include <QWebEngineCookieStore>
-+#endif
- 
- namespace Ms {
- 
-@@ -286,8 +288,11 @@ void LoginManager::onTryLoginError(const QString& error)
-       disconnect(this, SIGNAL(getUserError(QString)), this, SLOT(onTryLoginError(QString)));
-       connect(this, SIGNAL(loginSuccess()), this, SLOT(tryLogin()));
-       logout();
-+#ifdef USE_WEBENGINE
-       loginInteractive();
-//       mscore->showLoginDialog(); // TODO: switch depending on USE_WEBENGINE
-+#else
-+      mscore->showLoginDialog();
-+#endif
-       }
- /*------- END - TRY LOGIN ROUTINES ----------------------------*/
- 
-@@ -295,6 +300,7 @@ void LoginManager::onTryLoginError(const QString& error)
- //   loginInteractive
- //---------------------------------------------------------
- 
-+#ifdef USE_WEBENGINE
- void LoginManager::loginInteractive()
-       {
-       QWebEngineView* webView = new QWebEngineView;
-@@ -326,6 +332,7 @@ void LoginManager::loginInteractive()
-       webView->load(ApiInfo::loginUrl);
-       webView->show();
-       }
-+#endif
- 
- //---------------------------------------------------------
- //   login
-@@ -346,7 +353,7 @@ void LoginManager::login(QString login, QString password)
-       connect(reply, &QNetworkReply::finished, this, [this, reply] {
-             onReplyFinished(reply, RequestType::LOGIN);
-             });
-     }
-+      }
- 
- //---------------------------------------------------------
- //   onLoginSuccessReply
-@@ -874,6 +881,7 @@ ApiRequest ApiRequestBuilder::build() const
- //    musescore.com
- //---------------------------------------------------------
- 
-+#ifdef USE_WEBENGINE
- void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& request)
-       {
-       const ApiInfo& apiInfo = ApiInfo::instance();
-@@ -881,4 +889,5 @@ void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo&
-       request.setHttpHeader(apiInfo.clientIdHeader, apiInfo.clientId);
-       request.setHttpHeader(apiInfo.apiKeyHeader, apiInfo.apiKey);
-       }
-+#endif
- }
-diff --git a/mscore/network/loginmanager.h b/mscore/network/loginmanager.h
-index 584eeea30d..327d9fc966 100644
--- mscore/network/loginmanager.h
-+++ mscore/network/loginmanager.h
-@@ -13,6 +13,8 @@
- #ifndef __LOGINMANAGER_H__
- #define __LOGINMANAGER_H__
- 
-+#include "config.h"
-+
- namespace Ms {
- 
- //---------------------------------------------------------
-@@ -83,7 +85,9 @@ class LoginManager : public QObject
-    public:
-       LoginManager(QAction* uploadAudioMenuAction, QObject* parent = 0);
-       void login(QString login, QString password);
-+#ifdef USE_WEBENGINE
-       void loginInteractive();
-+#endif
-       void upload(const QString& path, int nid, const QString& title, const QString& description, const QString& priv, const QString& license, const QString& tags, const QString& changes);
-       bool hasAccessToken();
-       void getUser();
-diff --git a/mscore/network/loginmanager_p.h b/mscore/network/loginmanager_p.h
-index 88228a3958..2848dde35a 100644
--- mscore/network/loginmanager_p.h
-+++ mscore/network/loginmanager_p.h
-@@ -20,6 +20,8 @@
- #ifndef __LOGINMANAGER_P_H__
- #define __LOGINMANAGER_P_H__
- 
-+#include "config.h"
-+
- namespace Ms {
- 
- //---------------------------------------------------------
-@@ -102,6 +104,7 @@ class ApiRequestBuilder
- //   ApiWebEngineRequestInterceptor
- //---------------------------------------------------------
- 
-+#ifdef USE_WEBENGINE
- class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor
-       {
-       Q_OBJECT
-@@ -109,6 +112,7 @@ class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor
-       ApiWebEngineRequestInterceptor(QObject* parent) : QWebEngineUrlRequestInterceptor(parent) {}
-       void interceptRequest(QWebEngineUrlRequestInfo& info) override;
-       };
-+#endif
- 
- //---------------------------------------------------------
- //   HttpStatus
--- a/audio/musescore/pkg-plist
+++ b/audio/musescore/pkg-plist
@ -196,6 +196,7 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/locale/tours_fi.qm
 %%DATADIR%%/locale/tours_fil.qm
 %%DATADIR%%/locale/tours_fo.qm
+%%DATADIR%%/locale/tours_fr.qm
 %%DATADIR%%/locale/tours_ga.qm
 %%DATADIR%%/locale/tours_gd.qm
 %%DATADIR%%/locale/tours_gl.qm
@ -404,6 +405,7 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/templates/07-Band_and_Percussion/06-Battery_Percussion.mscx
 %%DATADIR%%/templates/07-Band_and_Percussion/07-Large_Pit_Percussion.mscx
 %%DATADIR%%/templates/07-Band_and_Percussion/08-Small_Pit_Percussion.mscx
+%%DATADIR%%/templates/07-Band_and_Percussion/09-European_Concert_Band.mscx
 %%DATADIR%%/templates/08-Orchestral/01-Classical_Orchestra.mscx
 %%DATADIR%%/templates/08-Orchestral/02-Symphony_Orchestra.mscx
 %%DATADIR%%/templates/08-Orchestral/03-String_Orchestra.mscx