From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- .../musescore/files/musescore-2.1.0-pch.patch | 31 -------------- .../musescore/files/musescore-2.1.0-qt-5.11.patch | 21 ---------- .../musescore/files/musescore-2.1.0-qt-5.12.patch | 48 ---------------------- .../musescore-2.1.0-qtsingleapplication.patch | 28 ------------- 4 files changed, 128 deletions(-) delete mode 100644 media-sound/musescore/files/musescore-2.1.0-pch.patch delete mode 100644 media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch delete mode 100644 media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch delete mode 100644 media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch (limited to 'media-sound/musescore/files') diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch deleted file mode 100644 index 6cce1bd81cfe..000000000000 --- a/media-sound/musescore/files/musescore-2.1.0-pch.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001 -From: mirabilos -Date: Sun, 4 Mar 2018 16:38:21 +0100 -Subject: [PATCH] Fix numerous reports of missing all.h during compilation - -When disabling PCH, the all.h copying code is no longer run before -AUTOMOC=caused *_autogen targets, so we must run it earlier. - -From Debian ---- - CMakeLists.txt | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 66b0ddfce8..7fdfffcc9b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -553,11 +553,8 @@ endif (NOT MINGW AND NOT APPLE) - # - - # all.h is expected in PROJECT_BINARY_DIR by subdirs --add_custom_command( -- OUTPUT ${PROJECT_BINARY_DIR}/all.h -- COMMAND ${CMAKE_COMMAND} -- ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h -- DEPENDS ${PROJECT_SOURCE_DIR}/all.h -+execute_process( -+ COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - ) - diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch deleted file mode 100644 index 2fa6afd9395d..000000000000 --- a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001 -From: Orcan Ogetbil -Date: Thu, 31 May 2018 21:04:51 -0400 -Subject: [PATCH] added missing #include required by qt >= 5.11 - ---- - all.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/all.h b/all.h -index 72db72b0ec..2ee0e8e807 100644 ---- a/all.h -+++ b/all.h -@@ -131,6 +131,7 @@ - #include - #include - #include -+#include - #include - #include - #include 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 deleted file mode 100644 index 9d9a1cca7ef0..000000000000 --- a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001 -From: Joachim Schmitz -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 * 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 - - - -- getPixmap - - - Awl::ColorLabel diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch deleted file mode 100644 index 1e362dd3298a..000000000000 --- a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001 -From: Joachim Schmitz -Date: Wed, 8 Aug 2018 09:16:54 +0200 -Subject: [PATCH] Fix #52106: fails to compile with - -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON - ---- - CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a30c03d63..be6a50578a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -537,8 +537,13 @@ endif(APPLE) - ## - - if (USE_SYSTEM_QTSINGLEAPPLICATION) -+ if (USE_PATH_WITH_EXPLICIT_QT_VERSION) -+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions) -+ find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6) -+ else (USE_PATH_WITH_EXPLICIT_QT_VERSION) - find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions) - find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6) -+ endif (USE_PATH_WITH_EXPLICIT_QT_VERSION) - else(USE_SYSTEM_QTSINGLEAPPLICATION) - subdirs (thirdparty/singleapp) - set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src) -- cgit v1.2.3