+++ /dev/null
-From 09d138946aad53962ce23298093747f0ce52304f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
-Date: Tue, 31 Dec 2019 17:39:34 +0100
-Subject: [PATCH 1/2] Specializes template routines.
-
-Qt 5.14 introduces serialisation/deserialisation for enum classes,
-this results in ambiguous templates between qdatastream.h and preferences.h.
-we specialize everything to workaround this.
----
- mscore/preferences.h | 41 ++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 36 insertions(+), 5 deletions(-)
-
-diff --git a/mscore/preferences.h b/mscore/preferences.h
-index bef3df8536..8c3ac9b0ed 100644
---- a/mscore/preferences.h
-+++ b/mscore/preferences.h
-@@ -233,21 +233,52 @@ extern Preferences preferences;
-
- // Stream operators for enum classes
- // enum classes don't play well with QSettings without custom serialization
--template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
--inline QDataStream &operator<<(QDataStream &out, const T &val)
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MuseScoreStyleType &val)
- {
- return out << static_cast<int>(val);
- }
-
--template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
--inline QDataStream &operator>>(QDataStream &in, T &val)
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MuseScoreStyleType &val)
- {
- int tmp;
- in >> tmp;
-- val = static_cast<T>(tmp);
-+ val = static_cast<Ms::MuseScoreStyleType>(tmp);
- return in;
- }
-
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::SessionStart &val)
-+{
-+ return out << static_cast<int>(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::SessionStart &val)
-+{
-+ int tmp;
-+ in >> tmp;
-+ val = static_cast<Ms::SessionStart>(tmp);
-+ return in;
-+}
-+
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MusicxmlExportBreaks &val)
-+{
-+ return out << static_cast<int>(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MusicxmlExportBreaks &val)
-+{
-+ int tmp;
-+ in >> tmp;
-+ val = static_cast<Ms::MusicxmlExportBreaks>(tmp);
-+ return in;
-+}
-+
-+
- class PreferenceVisitor {
- public:
- virtual void visit(QString key, IntPreference*) = 0;
-
-From 6b759bb5ee7b83fd8a82429e4cdb74279c5d33b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
-Date: Tue, 31 Dec 2019 17:42:04 +0100
-Subject: [PATCH 2/2] fix warnings: replace QString::null, with QString()
-
----
- mscore/capella.cpp | 2 +-
- mscore/importmidi/importmidi.cpp | 2 +-
- mscore/instrdialog.cpp | 2 +-
- mscore/musescore.cpp | 12 ++++++------
- mscore/musescore.h | 2 +-
- mscore/network/loginmanager.cpp | 2 +-
- 6 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/mscore/capella.cpp b/mscore/capella.cpp
-index 7144414e32..6243c8cca6 100644
---- a/mscore/capella.cpp
-+++ b/mscore/capella.cpp
-@@ -2708,7 +2708,7 @@ Score::FileError importCapella(MasterScore* score, const QString& name)
- QMessageBox::warning(0,
- QWidget::tr("Import Capella"),
- QWidget::tr("Load failed: %1").arg(cf.error(errNo)),
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- }
- fp.close();
- // avoid another error message box
-diff --git a/mscore/importmidi/importmidi.cpp b/mscore/importmidi/importmidi.cpp
-index a5d8894686..8091a83369 100644
---- a/mscore/importmidi/importmidi.cpp
-+++ b/mscore/importmidi/importmidi.cpp
-@@ -1200,7 +1200,7 @@ Score::FileError importMidi(MasterScore *score, const QString &name)
- QMessageBox::warning(0,
- QWidget::tr("Load MIDI"),
- QWidget::tr("Load failed: %1").arg(errorText),
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- }
- fp.close();
- qDebug("importMidi: bad file format");
-diff --git a/mscore/instrdialog.cpp b/mscore/instrdialog.cpp
-index fa7bacd622..8d81fe9e20 100644
---- a/mscore/instrdialog.cpp
-+++ b/mscore/instrdialog.cpp
-@@ -138,7 +138,7 @@ void InstrumentsDialog::on_loadButton_clicked()
- QMessageBox::warning(0,
- QWidget::tr("Load Style Failed"),
- QString(strerror(errno)),
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- return;
- }
- instrumentsWidget->buildTemplateList();
-diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
-index dd4a4b95ca..07cb596abe 100644
---- a/mscore/musescore.cpp
-+++ b/mscore/musescore.cpp
-@@ -4013,7 +4013,7 @@ bool MuseScore::readLanguages(const QString& path)
- QMessageBox::warning(0,
- QWidget::tr("Load Languages Failed:"),
- error,
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- return false;
- }
-
-@@ -6753,7 +6753,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
- QMessageBox::warning(0,
- tr("Encoding Error"),
- tr("Unable to open target file for writing"),
-- QString::null, QString::null);
-+ QString(), QString());
- }
- return false;
- }
-@@ -6792,7 +6792,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- QMessageBox::warning(0,
- tr("Error Opening LAME library"),
- tr("Could not open MP3 encoding library!"),
-- QString::null, QString::null);
-+ QString(), QString());
- qDebug("Could not open MP3 encoding library!");
- return false;
- }
-@@ -6804,7 +6804,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- QMessageBox::warning(0,
- tr("Error Opening LAME library"),
- tr("Not a valid or supported MP3 encoding library!"),
-- QString::null, QString::null);
-+ QString(), QString());
- qDebug("Not a valid or supported MP3 encoding library!");
- return false;
- }
-@@ -6829,7 +6829,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- if (!MScore::noGui) {
- QMessageBox::warning(0, tr("Encoding Error"),
- tr("Unable to initialize MP3 stream"),
-- QString::null, QString::null);
-+ QString(), QString());
- }
- qDebug("Unable to initialize MP3 stream");
- MScore::sampleRate = oldSampleRate;
-@@ -6996,7 +6996,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- QMessageBox::warning(0,
- tr("Encoding Error"),
- tr("Error %1 returned from MP3 encoder").arg(bytes),
-- QString::null, QString::null);
-+ QString(), QString());
- break;
- }
- else
-diff --git a/mscore/musescore.h b/mscore/musescore.h
-index 434072a12f..d8089a345c 100644
---- a/mscore/musescore.h
-+++ b/mscore/musescore.h
-@@ -142,7 +142,7 @@ struct LanguageItem {
- LanguageItem(const QString k, const QString n) {
- key = k;
- name = n;
-- handbook = QString::null;
-+ handbook = QString();
- }
- LanguageItem(const QString k, const QString n, const QString h) {
- key = k;
-diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
-index 7bcfd892e0..4abf7e3e4e 100644
---- a/mscore/network/loginmanager.cpp
-+++ b/mscore/network/loginmanager.cpp
-@@ -680,7 +680,7 @@ void LoginManager::mediaUploadFinished()
- QMessageBox::warning(0,
- tr("Upload Error"),
- tr("Sorry, MuseScore couldn't upload the audio file. Error %1").arg(e),
-- QString::null, QString::null);
-+ QString(), QString());
- }
- }
-
+++ /dev/null
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-DEPEND="
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtquickcontrols2:5
- >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
- dev-qt/qtsvg:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- >=media-libs/freetype-2.5.2
- media-libs/libsndfile
- sys-libs/zlib:=
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- jack? ( virtual/jack )
- mp3? ( media-sound/lame )
- portaudio? ( media-libs/portaudio )
- portmidi? ( media-libs/portmidi )
- pulseaudio? ( media-sound/pulseaudio )
- sf3? ( media-libs/libvorbis )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
- "${FILESDIR}/5583.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
- cmake_src_prepare
-
- # Move soundfonts to the correct directory
- mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=ON
- -DDOWNLOAD_SOUNDFONT=OFF
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
- -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
- -DUSE_SYSTEM_FREETYPE=ON
- -DBUILD_ALSA="$(usex alsa)"
- -DBUILD_JACK="$(usex jack)"
- -DBUILD_LAME="$(usex mp3)"
- -DBUILD_PORTAUDIO="$(usex portaudio)"
- -DBUILD_PORTMIDI="$(usex portmidi)"
- -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
- -DSOUNDFONT3="$(usex sf3)"
- -DBUILD_WEBENGINE="$(usex webengine)"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake_build -j1 lrelease manpages
- cmake_src_compile
-}
projects / gentoo.git / commitdiff