From 951405edfd6966aff2e14da20bf15995a8781a42 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Dec 16 2019 02:59:00 +0000
Subject: Undo qrc changes: leads to build failure.


---

diff --git a/mscore-3.3.0-unbundle.patch b/mscore-3.3.0-unbundle.patch
index 1e6a754..959fcf6 100644
--- a/mscore-3.3.0-unbundle.patch
+++ b/mscore-3.3.0-unbundle.patch
@@ -1,5 +1,5 @@
---- MuseScore-3.3.4/CMakeLists.txt.orig	2019-12-04 01:13:27.000000000 -0700
-+++ MuseScore-3.3.4/CMakeLists.txt	2019-12-15 09:37:10.961392255 -0700
+--- 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
@@ -9,8 +9,8 @@
        )
  
  if (BUILD_CRASH_REPORTER)
---- MuseScore-3.3.4/mscore/CMakeLists.txt.orig	2019-12-04 01:13:27.000000000 -0700
-+++ MuseScore-3.3.4/mscore/CMakeLists.txt	2019-12-15 09:37:10.962392252 -0700
+--- 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
@@ -23,8 +23,8 @@
              shortcut.qrc)
  endif (APPLE)
  
---- MuseScore-3.3.4/mscore/logindialog.cpp.orig	2019-12-04 01:13:27.000000000 -0700
-+++ MuseScore-3.3.4/mscore/logindialog.cpp	2019-12-15 09:37:10.963392249 -0700
+--- 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"
@@ -34,8 +34,8 @@
  
  namespace Ms {
  
---- MuseScore-3.3.4/mscore/musescore.h.orig	2019-12-04 01:13:27.000000000 -0700
-+++ MuseScore-3.3.4/mscore/musescore.h	2019-12-15 09:37:10.964392246 -0700
+--- 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"
@@ -45,8 +45,19 @@
  #include "updatechecker.h"
  #include "libmscore/musescoreCore.h"
  #include "libmscore/score.h"
---- MuseScore-3.3.4/mscore/network/loginmanager.cpp.orig	2019-12-04 01:13:27.000000000 -0700
-+++ MuseScore-3.3.4/mscore/network/loginmanager.cpp	2019-12-15 09:37:10.966392240 -0700
+--- 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"
@@ -58,8 +69,8 @@
  
  #ifdef USE_WEBENGINE
  #include <QWebEngineCookieStore>
---- MuseScore-3.3.4/mtest/CMakeLists.txt.orig	2019-12-04 01:13:27.000000000 -0700
-+++ MuseScore-3.3.4/mtest/CMakeLists.txt	2019-12-15 09:37:10.967392238 -0700
+--- 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
@@ -71,3 +82,14 @@
        )
  
  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>