--- MuseScore-3.3.0/CMakeLists.txt.orig 2019-10-31 04:29:57.000000000 -0600
+++ MuseScore-3.3.0/CMakeLists.txt 2019-11-01 11:01:32.149167861 -0600
@@ -744,7 +744,7 @@ endif (NOT MSVC)
subdirs(
awl bww2mxml share midi audiofile fluid libmscore synthesizer
effects thirdparty/rtf2html thirdparty/beatroot
- thirdparty/qzip thirdparty/kQOAuth
+ thirdparty/qzip
)
if (BUILD_CRASH_REPORTER)
--- MuseScore-3.3.0/mscore/CMakeLists.txt.orig 2019-10-31 04:29:57.000000000 -0600
+++ MuseScore-3.3.0/mscore/CMakeLists.txt 2019-11-01 12:17:44.329842172 -0600
@@ -217,11 +217,8 @@ else (APPLE)
qml.qrc # TODO: replace with qtquick_compiler_add_resources on Qt >= 5.11
musescorefonts-MScore.qrc
musescorefonts-Gootville.qrc
- musescorefonts-Bravura.qrc
musescorefonts-MuseJazz.qrc
musescorefonts-Campania.qrc
- musescorefonts-FreeSerif.qrc
- musescorefonts-Free.qrc
shortcut.qrc)
endif (APPLE)
--- MuseScore-3.3.0/mscore/logindialog.cpp.orig 2019-10-31 04:29:57.000000000 -0600
+++ MuseScore-3.3.0/mscore/logindialog.cpp 2019-11-01 11:01:32.151167826 -0600
@@ -13,7 +13,7 @@
#include "musescore.h"
#include "logindialog.h"
#include "network/loginmanager.h"
-#include "kQOAuth/kqoauthrequest_xauth.h"
+#include <QtKOAuth/kqoauthrequest_xauth.h>
namespace Ms {
--- MuseScore-3.3.0/mscore/musescore.h.orig 2019-10-31 04:29:57.000000000 -0600
+++ MuseScore-3.3.0/mscore/musescore.h 2019-11-01 11:01:32.152167809 -0600
@@ -26,7 +26,7 @@
#include "ui_insertmeasuresdialog.h"
#include "ui_aboutbox.h"
#include "ui_aboutmusicxmlbox.h"
-#include "singleapp/src/QtSingleApplication"
+#include <QtSingleApplication>
#include "updatechecker.h"
#include "libmscore/musescoreCore.h"
#include "libmscore/score.h"
--- MuseScore-3.3.0/mscore/musescore.qrc.orig 2019-10-31 04:29:57.000000000 -0600
+++ MuseScore-3.3.0/mscore/musescore.qrc 2019-11-01 12:58:07.552428375 -0600
@@ -3,7 +3,7 @@
<file>data/icons/edit.svg</file>
<file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
<file alias="fonts/gootville/metadata.json">../fonts/gootville/metadata.json</file>
- <file alias="fonts/bravura/metadata.json">../fonts/bravura/metadata.json</file>
+ <file alias="fonts/bravura/metadata.json">/usr/share/SMuFL/Fonts/bravura/bravura_metadata.json</file>
<file alias="fonts/musejazz/metadata.json">../fonts/musejazz/metadata.json</file>
<file alias="fonts/smufl/classes.json">../fonts/smufl/classes.json</file>
<file alias="fonts/smufl/ranges.json">../fonts/smufl/ranges.json</file>
--- MuseScore-3.3.0/mscore/network/loginmanager.cpp.orig 2019-10-31 04:29:57.000000000 -0600
+++ MuseScore-3.3.0/mscore/network/loginmanager.cpp 2019-11-01 11:01:32.152167809 -0600
@@ -15,8 +15,8 @@
#include "musescore.h"
#include "libmscore/score.h"
#include "preferences.h"
-#include "kQOAuth/kqoauthrequest.h"
-#include "kQOAuth/kqoauthrequest_xauth.h"
+#include <QtKOAuth/kqoauthrequest.h>
+#include <QtKOAuth/kqoauthrequest_xauth.h>
#ifdef USE_WEBENGINE
#include <QWebEngineCookieStore>
--- MuseScore-3.3.0/mtest/CMakeLists.txt.orig 2019-10-31 04:29:57.000000000 -0600
+++ MuseScore-3.3.0/mtest/CMakeLists.txt 2019-11-01 11:06:52.686632610 -0600
@@ -35,10 +35,7 @@ endif (MSVC)
QT5_ADD_RESOURCES(qrc_files ${PROJECT_SOURCE_DIR}/mtest/mtest.qrc
${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MScore.qrc
${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Gootville.qrc
- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Bravura.qrc
${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MuseJazz.qrc
- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Free.qrc
- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-FreeSerif.qrc
)
add_library (testResources STATIC
--- MuseScore-3.3.0/mtest/mtest.qrc.orig 2019-10-31 04:29:58.000000000 -0600
+++ MuseScore-3.3.0/mtest/mtest.qrc 2019-11-01 12:59:37.086895184 -0600
@@ -3,7 +3,7 @@
<qresource prefix="/">
<file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
<file alias="fonts/gootville/metadata.json">../fonts/gootville/metadata.json</file>
- <file alias="fonts/bravura/metadata.json">../fonts/bravura/metadata.json</file>
+ <file alias="fonts/bravura/metadata.json">/usr/share/SMuFL/Fonts/bravura/bravura_metadata.json</file>
<file alias="fonts/musejazz/metadata.json">../fonts/musejazz/metadata.json</file>
<file alias="fonts/smufl/glyphnames.json">../fonts/smufl/glyphnames.json</file>
<file alias="fonts/fonts_tablature.xml">../fonts/fonts_tablature.xml</file>