update patch, maybe fix?
authormirabilos <tg@debian.org>
Wed, 10 Jul 2019 00:43:21 +0000 (02:43 +0200)
committermirabilos <mirabilos@evolvis.org>
Wed, 10 Jul 2019 00:43:21 +0000 (02:43 +0200)
debian/patches/experiments/fix-pluginless-build.diff

index d9ed968..ff039b3 100644 (file)
@@ -4,7 +4,7 @@ Forwarded: https://github.com/musescore/MuseScore/pull/5216
 
 --- a/mscore/musescore.cpp
 +++ b/mscore/musescore.cpp
-@@ -2062,7 +2062,9 @@ void MuseScore::updateMenus()
+@@ -2067,7 +2067,9 @@ void MuseScore::updateMenus()
        connect(openRecent,     SIGNAL(triggered(QAction*)), SLOT(selectScore(QAction*)));
        connect(menuWorkspaces, SIGNAL(aboutToShow()),       SLOT(showWorkspaceMenu()));
        setMenuTitles();
@@ -14,11 +14,9 @@ Forwarded: https://github.com/musescore/MuseScore/pull/5216
        }
        
  //---------------------------------------------------------
-diff --git a/mscore/musescore.h b/mscore/musescore.h
-index 6980bd671..d797db0ae 100644
 --- a/mscore/musescore.h
 +++ b/mscore/musescore.h
-@@ -358,8 +358,10 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
+@@ -358,8 +358,10 @@ class MuseScore : public QMainWindow, pu
        ScriptEngine* se               { 0 };
        QString pluginPath;
  
@@ -29,7 +27,7 @@ index 6980bd671..d797db0ae 100644
  
        QTimer* autoSaveTimer;
        QList<QAction*> pluginActions;
-@@ -459,7 +461,9 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
+@@ -459,7 +461,9 @@ class MuseScore : public QMainWindow, pu
        bool saveFile(MasterScore* score);
        void fingeringMenu();
  
@@ -39,40 +37,17 @@ index 6980bd671..d797db0ae 100644
        void startDebugger();
        void midiinToggled(bool);
        void undoRedo(bool undo);
-@@ -570,8 +574,10 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
-       virtual void cmd(QAction* a);
-       void dirtyChanged(Score*);
-       void setPos(const Fraction& tick);
-+#ifdef SCRIPT_INTERFACE
-       void pluginTriggered(int);
-       void pluginTriggered(QString path);
-+#endif
-       void handleMessage(const QString& message);
-       void setCurrentScoreView(ScoreView*);
-       void setCurrentScoreView(int);
-@@ -612,7 +618,9 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
-       void writeSettings();
-       void play(Element* e) const;
-       void play(Element* e, int pitch) const;
-+#ifdef SCRIPT_INTERFACE
-       bool loadPlugin(const QString& filename);
-+#endif
-       QString createDefaultName() const;
-       void startAutoSave();
-       double getMag(ScoreView*) const;
-@@ -652,9 +660,11 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
-       bool splitScreen() const { return _splitScreen; }
-       void setSplitScreen(bool val);
+@@ -654,7 +658,9 @@ class MuseScore : public QMainWindow, pu
        virtual void setCurrentView(int tabIdx, int idx);
-+#ifdef SCRIPT_INTERFACE
        void loadPlugins();
        void unloadPlugins();
++#ifdef SCRIPT_INTERFACE
        void addPluginMenuEntries();
 +#endif
  
        ScoreState state() const { return _sstate; }
        void changeState(ScoreState);
-@@ -824,8 +834,10 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
+@@ -824,8 +830,10 @@ class MuseScore : public QMainWindow, pu
  
        TourHandler* tourHandler()       { return _tourHandler; }