commit: c06a62f24c1a4edffc64833984a41ce6596345bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 00:50:05 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 00:50:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06a62f2
media-sound/musescore: Fix build with Qt 5.12
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../musescore/files/musescore-2.1.0-pch.patch | 2 +-
.../musescore/files/musescore-2.1.0-qt-5.12.patch | 48 ++++++++++++++++++++++
media-sound/musescore/musescore-2.1.0-r1.ebuild | 3 +-
3 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch
b/media-sound/musescore/files/musescore-2.1.0-pch.patch
index d69d1cd2f65..6cce1bd81cf 100644
--- a/media-sound/musescore/files/musescore-2.1.0-pch.patch
+++ b/media-sound/musescore/files/musescore-2.1.0-pch.patch
@@ -28,4 +28,4 @@ index 66b0ddfce8..7fdfffcc9b 100644
+ COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h
${PROJECT_BINARY_DIR}/all.h
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
-
\ No newline at end of file
+
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
new file mode 100644
index 00000000000..9d9a1cca7ef
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
@@ -0,0 +1,48 @@
+From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <[email protected]>
+Date: Tue, 18 Sep 2018 14:42:43 +0200
+Subject: [PATCH] changes needed for MuseScore to build with Qt 5.12 (Alpha)
+
+One needed for MSVC only (and only since Alpha, not with the previous
+preview), the other needed for MSVC and MinGW.
+Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
+prove)
+---
+ mscore/editstringdata.cpp | 4 ++--
+ mscore/prefsdialog.ui | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
+index 21a621bac0..a86207e5db 100644
+--- a/mscore/editstringdata.cpp
++++ b/mscore/editstringdata.cpp
+@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *parent,
QList<instrString> * strings, in
+ strg = (*_strings)[numOfStrings - i - 1];
+ _stringsLoc.append(strg);
+ QTableWidgetItem *newCheck = new QTableWidgetItem();
+- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable |
Qt::ItemIsEnabled));
++ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable |
Qt::ItemIsEnabled));
+ newCheck->setCheckState(strg.open ? Qt::Checked :
Qt::Unchecked);
+ stringList->setItem(i, 0, newCheck);
+ QTableWidgetItem *newPitch = new
QTableWidgetItem(midiCodeToStr(strg.pitch));
+@@ -168,7 +168,7 @@ void EditStringData::newStringClicked()
+ _stringsLoc.insert(i, strg);
+ stringList->insertRow(i);
+ QTableWidgetItem *newCheck = new QTableWidgetItem();
+- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable |
Qt::ItemIsEnabled));
++ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable |
Qt::ItemIsEnabled));
+ newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+ stringList->setItem(i, 0, newCheck);
+ QTableWidgetItem *newPitch = new
QTableWidgetItem(midiCodeToStr(strg.pitch));
+diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
+index 5dd493fdc7..21af750846 100644
+--- a/mscore/prefsdialog.ui
++++ b/mscore/prefsdialog.ui
+@@ -4276,7 +4276,6 @@ Adjusting latency can help synchronize your MIDI
hardware with MuseScore's inter
+ </item>
+ </layout>
+ </widget>
+- <pixmapfunction>getPixmap</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Awl::ColorLabel</class>
diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild
b/media-sound/musescore/musescore-2.1.0-r1.ebuild
index 56805b5d007..d2c6bf1f093 100644
--- a/media-sound/musescore/musescore-2.1.0-r1.ebuild
+++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}/${P}-qt-5.11.patch"
"${FILESDIR}/${P}-qtsingleapplication.patch"
"${FILESDIR}/${P}-pch.patch"
+ "${FILESDIR}/${P}-qt-5.12.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
