diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /media-sound/musescore | |
parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) |
gentoo resync : 04.05.2019
Diffstat (limited to 'media-sound/musescore')
7 files changed, 13 insertions, 247 deletions
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index 20aed140d9cc..9b645b8cd7d8 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,14 +1,7 @@ -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 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb AUX musescore-3.0.1-porttime.patch 637 BLAKE2B 2272e64f8b6944fd25567dc1eafcded49cf6f92ad8da3d16a897f4fa854e9638826fc1bc66a79e1d0032020b8217b9d65b4d9272ce0018effacb439ee64a4b63 SHA512 a3379adb9b8adc5fb6c430694bb34cd832948c68a5cdc2e3ddc148f34e8367ec7674c679da5881a417bdb90f8cec1415d41fefb7a5dd420c298b4bfa2ffb2a15 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 -EBUILD musescore-2.1.0-r1.ebuild 2089 BLAKE2B bc9bb75457814eb081a678140065da6e2b9dce7f33f2047f81fe87960573631af79418eeefa52da485b2c60e809b6091e4347683e4803a59d7cf0758d97d1582 SHA512 d9279a30d2820169719a861702107d39d4a10ca055ddb29c16342a9bc23b09f7c65ad7e70b5afcadd13943ea0cc26a9073c177b9a1dc6ee4ea67ce87bb4ea569 -EBUILD musescore-3.0.1-r1.ebuild 2628 BLAKE2B 4b5b7e0ebfc7bb79d63832bd60604accacecc22cb87ef379ecce5e7f4e54af42a1279b15303c82a5e6f2be6b68e8fe25e40e93cb628ecce7b1e14a73f6dc45f1 SHA512 649f6970cf0fa353061d143977feb1d965ba6ac23259c0ad538f28f46808efb98e532abe0ff8e4d66951a3ba389e79885f20c2a5295eab7d04d2f19efafdb8a9 +EBUILD musescore-3.0.1-r1.ebuild 2433 BLAKE2B b41f19798c7702f5b31c29f2feee04e4c2973846e40ab08d3c1b5db7449448b9a14dc90aa16f5af3374b1d359227721f853a3e5d80468087bebe502b7f5398c0 SHA512 db33d86a72952ec81318fde0775ac70ea612928ff14b5b422b770299d09c2e05ff7a79e1c2784e15ba1739e2f3990595177b43cbe1a5b0d34b07fc78e099ffd2 EBUILD musescore-9999.ebuild 2634 BLAKE2B b97c89d8ce5b5b63c762030be4d2912d8f7c658c568fb06210d06964ea046f7f189ab9685792cd328abee7d0b9eb2cb186e639e3f40b410fe0b41a5ce38e54dd SHA512 6de966e26fe26664bf7348fa35d0ce027c6703f4f23c86c131f3419ba72dc803caee766fb821339d84521175be2691c301ccec1e8c0d6b6379f5dbd0ada58454 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 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 <tg@debian.org> -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 <orcan@localhost.localdomain> -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 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 <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/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 <jojo@schmitz-digital.de> -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 d2c6bf1f0939..000000000000 --- 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 -} diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild b/media-sound/musescore/musescore-3.0.1-r1.ebuild index a433e8b66362..379a593d84d6 100644 --- a/media-sound/musescore/musescore-3.0.1-r1.ebuild +++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 CMAKE_MIN_VERSION="3.11" -inherit cmake-utils xdg-utils gnome2-utils +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake-utils xdg DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/" @@ -16,10 +17,14 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine" +IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis webengine" REQUIRED_USE="portmidi? ( portaudio )" -RDEPEND=" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND=" dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -34,20 +39,17 @@ RDEPEND=" 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 ) - mp3? ( media-sound/lame ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) " -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" +RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-man-pages.patch" @@ -72,7 +74,7 @@ src_configure() { -DUSE_SYSTEM_FREETYPE=ON -DBUILD_ALSA="$(usex alsa)" -DBUILD_JACK="$(usex jack)" - -DBUILD_LAME="$(usex mp3)" + -DBUILD_LAME=ON # bug 678234 -DBUILD_PORTAUDIO="$(usex portaudio)" -DBUILD_PORTMIDI="$(usex portmidi)" -DBUILD_PULSEAUDIO="$(usex pulseaudio)" @@ -87,15 +89,3 @@ src_compile() { cmake-utils_src_make -j1 lrelease manpages cmake-utils_src_compile } - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update - gnome2_icon_cache_update -} |