commit: 425bf47e3a1a50bca7ddda6f95b77d68cf2fb4d1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Aug 21 20:09:18 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Aug 21 21:23:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425bf47e
media-sound/musescore: Set USE_SYSTEM_QTSINGLEAPPLICATION=ON Bug: https://bugs.gentoo.org/489144 Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../musescore-2.1.0-qtsingleapplication.patch | 28 ++++++++++++++++++++++ ...score-9999.ebuild => musescore-2.1.0-r1.ebuild} | 27 +++++++++++---------- media-sound/musescore/musescore-9999.ebuild | 12 ++++++---- 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch new file mode 100644 index 00000000000..1e362dd3298 --- /dev/null +++ b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch @@ -0,0 +1,28 @@ +From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001 +From: Joachim Schmitz <j...@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-9999.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild similarity index 71% copy from media-sound/musescore/musescore-9999.ebuild copy to media-sound/musescore/musescore-2.1.0-r1.ebuild index 09988cf9c63..5ba187f5315 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils git-r3 +inherit cmake-utils DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/"; -EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"; -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"; +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="" +KEYWORDS="~amd64 ~x86" IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio" REQUIRED_USE="portmidi? ( portaudio )" @@ -24,34 +24,37 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 + >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile - sys-libs/zlib + 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 ) - " +" 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" ) -src_unpack() { - git-r3_src_unpack - default_src_unpack -} +S="${WORKDIR}/MuseScore-${PV}" src_configure() { local mycmakeargs=( + -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON + -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON -DBUILD_ALSA="$(usex alsa)" -DBUILD_JACK="$(usex jack)" -DBUILD_LAME="$(usex mp3)" diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index 09988cf9c63..3272159f0c8 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,23 +24,25 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 + >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile - sys-libs/zlib + 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 ) - " +" DEPEND="${RDEPEND} dev-qt/linguist-tools:5 virtual/pkgconfig - " +" + PATCHES=( "${WORKDIR}/${P}-fix-buildsystem.patch" ) @@ -52,6 +54,8 @@ src_unpack() { src_configure() { local mycmakeargs=( + -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON + -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON -DBUILD_ALSA="$(usex alsa)" -DBUILD_JACK="$(usex jack)" -DBUILD_LAME="$(usex mp3)"
