gentoo resync : 24.12.2018

4 files changed, 54 insertions, 4 deletions

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f04969c424cf..2da136295a5b 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,9 +1,10 @@
-AUX musescore-2.1.0-pch.patch 1044 BLAKE2B 884fd6a532ace31f878c0a0e17323792871e7f297a340b605edf3a8cbc1591669c73d58610ba24b2104dc030e7a2599b60df6c553ab2e9a69a12a33dd97a87ed SHA512 daf676955df4947c119904e93452a2fa81e877951d6e509e250e7cb88b406a5533fb7b3463613c1b27bf4708586484ce65786572aaade3a616197c2dfc76115d
+AUX musescore-2.1.0-pch.patch 1045 BLAKE2B c6deca9a34f687d5f8f9048e91049a0706a39c5f9299c2a244193337b3cd1047efc145c12ee0abac01b936958b835f9946c01ad4cb271b8ea8f9a2df535d5bc7 SHA512 9fdbf8a8f9903051196c01513395dc38585ba64f216140bb728e7adb72cbb71669b414338ac9b7f0b53f8c98bf63b2a19d4c6b195c3ad110590db768927d01d1
 AUX musescore-2.1.0-qt-5.11.patch 575 BLAKE2B 1dd0dfea52f73dc3d031dcead6ba07ac55195b264f393c39f0c411d6fc3f9d974f78a6948a9918ca67381e5c2c0b67750a5ccf0ac4a2ed2a8d1000434157d8a8 SHA512 5a6ec5aedaae257223fec6137dcc5ded44d6a4478f183c61220cd7d3c4b96c0fe591ff12070e4962979bb5c6d93a8c87a3003d3bcb449b1fe0977072e55615ed
+AUX musescore-2.1.0-qt-5.12.patch 2451 BLAKE2B 5c4f0143f262a451551f438607d8d09ff98f2fb23bbea09a74c00b1699ac9d284e582acacbcb224e0a02878a65744a2c202ae80e8a9045056abe68888b52a6a5 SHA512 529d48f961c21b89195dcad44c9d5105724c71bacbd30846dfc183f0ff5654b20a58cdffbe0b8fc7730f851d39652e4315dbb407ebd91994ebc061c6dcee2447
 AUX musescore-2.1.0-qtsingleapplication.patch 1176 BLAKE2B 6218c930ba69595f6ad674d225b95a34e8b7fec4b93f9bd23ca7f0c3201c4af04056c1b23c191be2764d350afae36d1f586555358141e9efb50e6a622ab9c5ab SHA512 fc1300940b6101f985a607fa3c1e3ebc2d3b88335f57bb9cb2b442e0253c24cc31a5d1d07c1dfc507234a0146bfd480ea546ac8b63ffbfcef1635d5086326bf0
 DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
 DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
 DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
-EBUILD musescore-2.1.0-r1.ebuild 2058 BLAKE2B 6d0dc4398e40241cd2a4eb8a1931e01bef710e506142c1fb88dc75e459c8b46139f2f4619dd4256301fcb56c91cf5302e9849f403aa3513d5e470f91725bf91d SHA512 92e3574b1e6b1754598e3831326586554a574af543569d85fbe6c21251076bb5d04ca57d44fdd8d4cca11bbc7182813b49dd19aa5e1b2087d21abd3805e7a497
+EBUILD musescore-2.1.0-r1.ebuild 2089 BLAKE2B bc9bb75457814eb081a678140065da6e2b9dce7f33f2047f81fe87960573631af79418eeefa52da485b2c60e809b6091e4347683e4803a59d7cf0758d97d1582 SHA512 d9279a30d2820169719a861702107d39d4a10ca055ddb29c16342a9bc23b09f7c65ad7e70b5afcadd13943ea0cc26a9073c177b9a1dc6ee4ea67ce87bb4ea569
 EBUILD musescore-9999.ebuild 2050 BLAKE2B 8c7c0f41b3c956c6a960b791db44b8c9d39f7ba6d3fb12b2b18253c5160e272fd3f6e75abf421fdbe2caf34628c8f55775d4b18b28b92d7717ca5fdcd5c8be06 SHA512 550226b2ea764ee2f03c8ca71ff601adeb5822dd629e94fc52435879a069128e886ccdd1e9f42feba482f193129113e0b16173d07379709c5cd123e79177c29d
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
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 d69d1cd2f654..6cce1bd81cfe 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 000000000000..9d9a1cca7ef0
--- /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 <jojo@schmitz-digital.de>
+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 56805b5d0079..d2c6bf1f0939 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}"