prepare for rdoc/omr exclusion
authormirabilos <tg@debian.org>
Thu, 18 Apr 2019 12:44:24 +0000 (14:44 +0200)
committermirabilos <mirabilos@evolvis.org>
Thu, 18 Apr 2019 12:44:24 +0000 (14:44 +0200)
debian/patches/debian-specific/dfsg-exclusions.diff

index 6bc02f1..c6429c8 100644 (file)
@@ -3,6 +3,105 @@ Author: mirabilos <tg@debian.org>
 Forwarded: not-needed
 Justification: Debian-specific exclusion from distfile
 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -659,7 +659,6 @@ else(APPLE AND CMAKE_BUILD_TYPE MATCHES
+ add_subdirectory(mtest EXCLUDE_FROM_ALL)
+ endif(APPLE AND CMAKE_BUILD_TYPE MATCHES "DEBUG")
+-add_subdirectory(rdoc EXCLUDE_FROM_ALL)
+ add_subdirectory(miditools EXCLUDE_FROM_ALL)
+ add_subdirectory(fonttools EXCLUDE_FROM_ALL)
+ add_subdirectory(manual)
+--- a/mscore/mediadialog.cpp
++++ b/mscore/mediadialog.cpp
+@@ -24,7 +24,9 @@
+ #include "libmscore/score.h"
+ #include "libmscore/audio.h"
+ #include "scoreview.h"
++#ifdef OMR
+ #include "omr/omr.h"
++#endif
+ #include "libmscore/tempo.h"
+ namespace Ms {
+@@ -60,6 +62,7 @@ MediaDialog::MediaDialog(QWidget* /*pare
+ void MediaDialog::setScore(Score* s)
+       {
+       score = s;
++#ifdef OMR
+       Omr* omr = score->omr();
+       if (omr) {
+             scanFile->setText(omr->path());
+@@ -67,7 +70,9 @@ void MediaDialog::setScore(Score* s)
+             removeScan->setEnabled(true);
+             scanFileButton->setEnabled(false);
+             }
+-      else {
++      else
++#endif
++      {
+             scanFile->setText(QString());
+             addScan->setEnabled(true);
+             removeScan->setEnabled(false);
+@@ -94,6 +99,7 @@ void MediaDialog::setScore(Score* s)
+ void MediaDialog::addScanPressed()
+       {
++#ifdef OMR
+       QString path = scanFile->text();
+       if (score->omr() || path.isEmpty())
+             return;
+@@ -105,6 +111,7 @@ void MediaDialog::addScanPressed()
+             }
+       score->setOmr(omr);
+       mscore->currentScoreView()->showOmr(true);
++#endif
+       }
+ //---------------------------------------------------------
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -102,7 +102,6 @@ add_library(
+       ${PROJECT_SOURCE_DIR}/mscore/stringutils.cpp
+       ${PROJECT_SOURCE_DIR}/mscore/extension.cpp # required by zerberus tests
+       ${OMR_SRC}
+-      omr
+       )
+ add_executable(
+--- a/mtest/mscoreapi.h
++++ b/mtest/mscoreapi.h
+@@ -4,8 +4,6 @@
+     #include "musescore.h"
+     #include "libmscore/score.h"
+-    #include "omr/omr.h"
+-    #include "omr/omrpage.h"
+     #include "libmscore/part.h"
+     #include "libmscore/staff.h"
+     #include "libmscore/page.h"
+--- a/mtest/openscore.h
++++ b/mtest/openscore.h
+@@ -4,8 +4,6 @@
+ #include "musescore.h"
+ #include "libmscore/score.h"
+-#include "omr/omr.h"
+-#include "omr/omrpage.h"
+ #include "libmscore/part.h"
+ #include "libmscore/staff.h"
+ #include "libmscore/page.h"
+--- a/mtest/testutils.cpp
++++ b/mtest/testutils.cpp
+@@ -17,7 +17,6 @@
+ #include "libmscore/note.h"
+ #include "libmscore/chord.h"
+ #include "libmscore/instrtemplate.h"
+-#include "omr/omr.h"
+ #include "testutils.h"
+ #include "mscore/preferences.h"
+ #include "libmscore/page.h"
 --- a/share/CMakeLists.txt
 +++ b/share/CMakeLists.txt
 @@ -18,7 +18,7 @@