haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

musescore: bump version.

Browse Source 
still crash on exit.
This commit is contained in:
Jerome Duval
2020-01-02 19:00:24 +01:00
parent b3324855f7
commit 96113d4587
2 changed files with 22 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-sound/musescore/musescore-3.2.3.recipe → media-sound/musescore/musescore-3.3.4.recipe
View File

@@ -4,8 +4,8 @@ HOMEPAGE="https://musescore.org/"
COPYRIGHT="2002-2019 Werner Schweer and others" COPYRIGHT="2002-2019 Werner Schweer and others"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/musescore/MuseScore/archive/v3.2.3.tar.gz" SOURCE_URI="https://github.com/musescore/MuseScore/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="d6e58c942efd4e9b6567705c81b77287acfe0baa99033b3fb96605698bb9b5af" CHECKSUM_SHA256="ab8bade6c7eec6a9ae03f435cad65e79c4ca031d19020aa6e2a4da2868f49a2a"
SOURCE_DIR="MuseScore-$portVersion" SOURCE_DIR="MuseScore-$portVersion"
PATCHES="musescore-$portVersion.patchset" PATCHES="musescore-$portVersion.patchset"

76
media-sound/musescore/patches/musescore-3.2.3.patchset → media-sound/musescore/patches/musescore-3.3.4.patchset
View File

@@ -1,11 +1,11 @@
From b12353d0d8e93bbf261acd8bc78a7811e6ffad90 Mon Sep 17 00:00:00 2001 From 98e0b44f5b2348bf808e1258480b30278745bf7f Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 17 Sep 2019 19:09:55 +0200 Date: Tue, 17 Sep 2019 19:09:55 +0200
Subject: Import still relevant part of Haiku patches. Subject: Import still relevant part of Haiku patches.
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93eaafa..b19aa24 100644 index 07b8b5e..148fe1f 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -114,6 +114,13 @@ if (APPLE) @@ -114,6 +114,13 @@ if (APPLE)
@@ -23,10 +23,10 @@ index 93eaafa..b19aa24 100644
if (NOT APPLE AND NOT MINGW AND NOT MSVC) if (NOT APPLE AND NOT MINGW AND NOT MSVC)
set(NIX_NOT_AVAIL "Not available on Linux/BSD") set(NIX_NOT_AVAIL "Not available on Linux/BSD")
diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
index 8033b35..b87b241 100644 index 1b85ed9..6710878 100644
--- a/mscore/CMakeLists.txt --- a/mscore/CMakeLists.txt
+++ b/mscore/CMakeLists.txt +++ b/mscore/CMakeLists.txt
@@ -768,8 +768,8 @@ else (MINGW) @@ -806,8 +806,8 @@ else (MINGW)
if (APPLE) if (APPLE)
target_link_libraries(mscore ${OsxFrameworks}) target_link_libraries(mscore ${OsxFrameworks})
@@ -37,7 +37,7 @@ index 8033b35..b87b241 100644
endif (APPLE) endif (APPLE)
# 'gold' does not use indirect shared libraries for symbol resolution, Linux only # 'gold' does not use indirect shared libraries for symbol resolution, Linux only
@@ -777,7 +777,9 @@ else (MINGW) @@ -815,7 +815,9 @@ else (MINGW)
if(USE_JACK) if(USE_JACK)
target_link_libraries(mscore ${CMAKE_DL_LIBS}) target_link_libraries(mscore ${CMAKE_DL_LIBS})
endif(USE_JACK) endif(USE_JACK)
@@ -52,7 +52,7 @@ index 8033b35..b87b241 100644
2.24.0 2.24.0
From 36e8607973af8f9d51ca6d9b68848ce9eeb20b40 Mon Sep 17 00:00:00 2001 From facf2821a4cd181412237e357df253a216912fb8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 31 Dec 2019 17:39:34 +0100 Date: Tue, 31 Dec 2019 17:39:34 +0100
Subject: Specializes template routines. Subject: Specializes template routines.
@@ -62,10 +62,10 @@ this results in ambiguous templates between qdatastream.h and preferences.h.
we specialize everything to workaround this. we specialize everything to workaround this.
diff --git a/mscore/preferences.h b/mscore/preferences.h diff --git a/mscore/preferences.h b/mscore/preferences.h
index 0a78d00..6d832e2 100644 index 913498c..ed6b892 100644
--- a/mscore/preferences.h --- a/mscore/preferences.h
+++ b/mscore/preferences.h +++ b/mscore/preferences.h
@@ -372,21 +372,52 @@ extern Preferences preferences; @@ -374,21 +374,52 @@ extern Preferences preferences;
// Stream operators for enum classes // Stream operators for enum classes
// enum classes don't play well with QSettings without custom serialization // enum classes don't play well with QSettings without custom serialization
@@ -127,7 +127,7 @@ index 0a78d00..6d832e2 100644
2.24.0 2.24.0
From 45c5b814952297cbb19e2de1f90cf99e76dbcf35 Mon Sep 17 00:00:00 2001 From 2ac0ba08a1211abaf53d8ac4abb1a0345b0d07e5 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 31 Dec 2019 17:42:04 +0100 Date: Tue, 31 Dec 2019 17:42:04 +0100
Subject: fix warnings: replace QString::null, with QString() Subject: fix warnings: replace QString::null, with QString()
@@ -173,10 +173,10 @@ index fa7bacd..8d81fe9 100644
} }
instrumentsWidget->buildTemplateList(); instrumentsWidget->buildTemplateList();
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
index a358c32..d3c0f19 100644 index 3476241..4ded5a9 100644
--- a/mscore/musescore.cpp --- a/mscore/musescore.cpp
+++ b/mscore/musescore.cpp +++ b/mscore/musescore.cpp
@@ -4007,7 +4007,7 @@ bool MuseScore::readLanguages(const QString& path) @@ -4065,7 +4065,7 @@ bool MuseScore::readLanguages(const QString& path)
QMessageBox::warning(0, QMessageBox::warning(0,
QWidget::tr("Load Languages Failed:"), QWidget::tr("Load Languages Failed:"),
error, error,
@@ -185,7 +185,7 @@ index a358c32..d3c0f19 100644
return false; return false;
} }
@@ -6798,7 +6798,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name) @@ -6884,7 +6884,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
QMessageBox::warning(0, QMessageBox::warning(0,
tr("Encoding Error"), tr("Encoding Error"),
tr("Unable to open target file for writing"), tr("Unable to open target file for writing"),
@@ -194,7 +194,7 @@ index a358c32..d3c0f19 100644
} }
return false; return false;
} }
@@ -6831,7 +6831,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled) @@ -6923,7 +6923,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
QMessageBox::warning(0, QMessageBox::warning(0,
tr("Error Opening LAME library"), tr("Error Opening LAME library"),
tr("Could not open MP3 encoding library!"), tr("Could not open MP3 encoding library!"),
@@ -203,7 +203,7 @@ index a358c32..d3c0f19 100644
qDebug("Could not open MP3 encoding library!"); qDebug("Could not open MP3 encoding library!");
return false; return false;
} }
@@ -6843,7 +6843,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled) @@ -6935,7 +6935,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
QMessageBox::warning(0, QMessageBox::warning(0,
tr("Error Opening LAME library"), tr("Error Opening LAME library"),
tr("Not a valid or supported MP3 encoding library!"), tr("Not a valid or supported MP3 encoding library!"),
@@ -212,7 +212,7 @@ index a358c32..d3c0f19 100644
qDebug("Not a valid or supported MP3 encoding library!"); qDebug("Not a valid or supported MP3 encoding library!");
return false; return false;
} }
@@ -6868,7 +6868,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled) @@ -6960,7 +6960,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
if (!MScore::noGui) { if (!MScore::noGui) {
QMessageBox::warning(0, tr("Encoding Error"), QMessageBox::warning(0, tr("Encoding Error"),
tr("Unable to initialize MP3 stream"), tr("Unable to initialize MP3 stream"),
@@ -221,7 +221,7 @@ index a358c32..d3c0f19 100644
} }
qDebug("Unable to initialize MP3 stream"); qDebug("Unable to initialize MP3 stream");
MScore::sampleRate = oldSampleRate; MScore::sampleRate = oldSampleRate;
@@ -7025,7 +7025,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled) @@ -7127,7 +7127,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
QMessageBox::warning(0, QMessageBox::warning(0,
tr("Encoding Error"), tr("Encoding Error"),
tr("Error %1 returned from MP3 encoder").arg(bytes), tr("Error %1 returned from MP3 encoder").arg(bytes),
@@ -231,10 +231,10 @@ index a358c32..d3c0f19 100644
} }
else else
diff --git a/mscore/musescore.h b/mscore/musescore.h diff --git a/mscore/musescore.h b/mscore/musescore.h
index 6980bd6..10ae19c 100644 index 51864b6..af59ebd 100644
--- a/mscore/musescore.h --- a/mscore/musescore.h
+++ b/mscore/musescore.h +++ b/mscore/musescore.h
@@ -135,7 +135,7 @@ struct LanguageItem { @@ -141,7 +141,7 @@ struct LanguageItem {
LanguageItem(const QString k, const QString n) { LanguageItem(const QString k, const QString n) {
key = k; key = k;
name = n; name = n;
@@ -244,10 +244,10 @@ index 6980bd6..10ae19c 100644
LanguageItem(const QString k, const QString n, const QString h) { LanguageItem(const QString k, const QString n, const QString h) {
key = k; key = k;
diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
index 36220d1..5875112 100644 index 41fdd40..d32b1b2 100644
--- a/mscore/network/loginmanager.cpp --- a/mscore/network/loginmanager.cpp
+++ b/mscore/network/loginmanager.cpp +++ b/mscore/network/loginmanager.cpp
@@ -793,7 +793,7 @@ void LoginManager::mediaUploadFinished() @@ -831,7 +831,7 @@ void LoginManager::mediaUploadFinished()
QMessageBox::warning(0, QMessageBox::warning(0,
tr("Upload Error"), tr("Upload Error"),
tr("Sorry, MuseScore couldn't upload the audio file. Error %1").arg(e), tr("Sorry, MuseScore couldn't upload the audio file. Error %1").arg(e),
@@ -259,39 +259,3 @@ index 36220d1..5875112 100644
-- --
2.24.0 2.24.0
From ac81b91a5fe4c6447eb04aec599d29037a033e83 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 31 Dec 2019 17:48:10 +0100
Subject: replace QList::swap with QList::swapItemsAt
diff --git a/fluid/fluidgui.cpp b/fluid/fluidgui.cpp
index 9baabb9..644051d 100644
--- a/fluid/fluidgui.cpp
+++ b/fluid/fluidgui.cpp
@@ -158,7 +158,7 @@ void FluidGui::moveSoundfontInTheList(int currentIdx, int targetIdx)
for (auto sfName : sfonts)
fluid()->removeSoundFont(sfName);
- sfonts.swap(currentIdx, targetIdx);
+ sfonts.swapItemsAt(currentIdx, targetIdx);
fluid()->loadSoundFonts(sfonts);
sfonts = fluid()->soundFonts();
soundFonts->clear();
diff --git a/zerberus/zerberusgui.cpp b/zerberus/zerberusgui.cpp
index 7340efc..2eb0ad6 100644
--- a/zerberus/zerberusgui.cpp
+++ b/zerberus/zerberusgui.cpp
@@ -121,7 +121,7 @@ ZerberusGui::ZerberusGui(Ms::Synthesizer* s)
void ZerberusGui::moveSoundfontInTheList(int currentIdx, int targetIdx)
{
QStringList sfonts = zerberus()->soundFonts();
- sfonts.swap(currentIdx, targetIdx);
+ sfonts.swapItemsAt(currentIdx, targetIdx);
zerberus()->removeSoundFonts(zerberus()->soundFonts());
loadSoundFontsAsync(sfonts);
--
2.24.0