commit: fd5fc2768ca299220de2d2a9a5a3ba61d1db22ca Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Mon Jul 3 08:38:31 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Jul 3 08:38:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd5fc276
media-sound/qsynth: added support fot qt6, fixed missing dep Closes: https://bugs.gentoo.org/881297 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> ...synth-0.9.11.ebuild => qsynth-0.9.11-r1.ebuild} | 29 +++++++++++----------- media-sound/qsynth/qsynth-9999.ebuild | 29 ++++++++++++---------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/media-sound/qsynth/qsynth-0.9.11.ebuild b/media-sound/qsynth/qsynth-0.9.11-r1.ebuild similarity index 77% rename from media-sound/qsynth/qsynth-0.9.11.ebuild rename to media-sound/qsynth/qsynth-0.9.11-r1.ebuild index 9304e1e44040..5690fe3abd29 100644 --- a/media-sound/qsynth/qsynth-0.9.11.ebuild +++ b/media-sound/qsynth/qsynth-0.9.11-r1.ebuild @@ -18,33 +18,34 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+alsa debug jack pulseaudio" +IUSE="+alsa debug jack pulseaudio qt6" REQUIRED_USE="|| ( alsa jack pulseaudio )" BDEPEND=" - dev-qt/linguist-tools:5 + qt6? ( dev-qt/qttools:6[linguist] ) + !qt6? ( dev-qt/linguist-tools:5 ) " DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 + qt6? ( + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" ) - -src_prepare() { - cmake_src_prepare - - sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die -} - src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) + -DCONFIG_QT6=$(usex qt6 1 0) ) cmake_src_configure } diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild index 76fd6013eca5..5690fe3abd29 100644 --- a/media-sound/qsynth/qsynth-9999.ebuild +++ b/media-sound/qsynth/qsynth-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,31 +18,34 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+alsa debug jack pulseaudio" +IUSE="+alsa debug jack pulseaudio qt6" REQUIRED_USE="|| ( alsa jack pulseaudio )" BDEPEND=" - dev-qt/linguist-tools:5 + qt6? ( dev-qt/qttools:6[linguist] ) + !qt6? ( dev-qt/linguist-tools:5 ) " DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 + qt6? ( + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?] " RDEPEND="${DEPEND}" -src_prepare() { - cmake_src_prepare - - sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die -} - src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) + -DCONFIG_QT6=$(usex qt6 1 0) ) cmake_src_configure }
