commit: 9ff9ffa0c86ac6ab87dfadf08ed49a57fdeafd79 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Apr 28 23:38:23 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 28 23:45:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff9ffa0
media-sound/musescore: Drop 2.1.0-r1 Closes: https://bugs.gentoo.org/630372 Package-Manager: Portage-2.3.65, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/musescore/Manifest | 2 - .../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 ------- media-sound/musescore/musescore-2.1.0-r1.ebuild | 89 ---------------------- 6 files changed, 219 deletions(-) diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index e0820b82051..0c4c655eec0 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,4 +1,2 @@ DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b -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-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d 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 6cce1bd81cf..00000000000 --- 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 <[email protected]> -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 2fa6afd9395..00000000000 --- 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 <[email protected]> -Date: Thu, 31 May 2018 21:04:51 -0400 -Subject: [PATCH] added missing #include <QButtonGroup> 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 <QProgressBar> - #include <QProgressDialog> - #include <QRadioButton> -+#include <QButtonGroup> - #include <QSplashScreen> - #include <QFontComboBox> - #include <QApplication> 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 9d9a1cca7ef..00000000000 --- 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 <[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/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch deleted file mode 100644 index 1e362dd3298..00000000000 --- 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 <[email protected]> -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) diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild deleted file mode 100644 index d2c6bf1f093..00000000000 --- a/media-sound/musescore/musescore-2.1.0-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils - -DESCRIPTION="WYSIWYG Music Score Typesetter" -HOMEPAGE="https://musescore.org/"; -SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis" -REQUIRED_USE="portmidi? ( portaudio )" - -RDEPEND=" - 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/qtsingleapplication-2.6.1_p20171024 - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - >=media-libs/freetype-2.5.2 - media-libs/libsndfile - media-sound/lame - sys-libs/zlib:= - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - jack? ( virtual/jack ) - portaudio? ( media-libs/portaudio ) - portmidi? ( media-libs/portmidi ) - pulseaudio? ( media-sound/pulseaudio ) - vorbis? ( media-libs/libvorbis ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${WORKDIR}/${P}-fix-buildsystem.patch" - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-qtsingleapplication.patch" - "${FILESDIR}/${P}-pch.patch" - "${FILESDIR}/${P}-qt-5.12.patch" -) - -S="${WORKDIR}/MuseScore-${PV}" - -src_configure() { - local mycmakeargs=( - -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=ON - -DBUILD_PORTAUDIO="$(usex portaudio)" - -DBUILD_PORTMIDI="$(usex portmidi)" - -DBUILD_PULSEAUDIO="$(usex pulseaudio)" - -DSOUNDFONT3="$(usex vorbis)" - ) - cmake-utils_src_configure -} - -src_compile() { - cd "${BUILD_DIR}" || die - cmake-utils_src_make -j1 lrelease manpages - cmake-utils_src_compile -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -}
