commit: ed3d458a0390ff32516bed6606d9ff7482b03959 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 13 23:17:54 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 13 23:17:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3d458a
media-sound/qsynth: 0.9.0 version bump, switch to cmake CMake does not rely on shaky guesswork of Qt binary names and locations. Closes: https://bugs.gentoo.org/764944 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/qsynth/Manifest | 1 + .../files/qsynth-0.9.0-cmake-no-git-version.patch | 37 ++++++++++++++++++++++ .../{qsynth-9999.ebuild => qsynth-0.9.0.ebuild} | 35 ++++++++++++-------- media-sound/qsynth/qsynth-9999.ebuild | 35 ++++++++++++-------- 4 files changed, 80 insertions(+), 28 deletions(-) diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest index aded7a7e5b5..b6fb37b4356 100644 --- a/media-sound/qsynth/Manifest +++ b/media-sound/qsynth/Manifest @@ -1 +1,2 @@ DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2 +DIST qsynth-0.9.0.tar.gz 383118 BLAKE2B d9464a2f122d7281ff69171c431fff72d05886ec130d20aae8d8f122e1cefd1180b8bcdc157f324c5cdbc7e2c524c82a9cc7f481efc8b69912ce61912e73ed58 SHA512 5cc0e099cd05f3639ded81642bde80205c8921b65d22dcb32d40ac874107043edeb672e69d7e4734e0fd37a498be2e5b787f0b8c1707be45e39cfab616fd522c diff --git a/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch b/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch new file mode 100644 index 00000000000..11091ba1166 --- /dev/null +++ b/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch @@ -0,0 +1,37 @@ +From 7ddf562dfc92174f47e3da95a1e18e5b1af83bfc Mon Sep 17 00:00:00 2001 +From: Christoph Karl <pampelm...@gmx.at> +Date: Dec 31 2020 15:42:42 +0000 +Subject: Fix version number in about dialog + + +--- + +diff -rupN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-12-31 16:31:19.395906813 +0100 ++++ b/CMakeLists.txt 2020-12-31 16:37:42.293523588 +0100 +@@ -5,25 +5,6 @@ cmake_minimum_required(VERSION 3.1) + set (VERSION "0.9.0") + + set (CONFIG_VERSION ${VERSION}) +-execute_process ( +- COMMAND git describe --tags --dirty --abbrev=6 +- OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT +- RESULT_VARIABLE GIT_DESCRIBE_RESULT +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-if (GIT_DESCRIBE_RESULT EQUAL 0) +- set (VERSION "${GIT_DESCRIBE_OUTPUT}") +- string (REGEX REPLACE "^[^0-9]+" "" VERSION "${VERSION}") +- string (REGEX REPLACE "-g" "git." VERSION "${VERSION}") +- string (REGEX REPLACE "[_|-]+" "." VERSION "${VERSION}") +- execute_process ( +- COMMAND git rev-parse --abbrev-ref HEAD +- OUTPUT_VARIABLE GIT_REVPARSE_OUTPUT +- RESULT_VARIABLE GIT_REVPARSE_RESULT +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- if (GIT_REVPARSE_RESULT EQUAL 0 AND NOT GIT_REVPARSE_OUTPUT STREQUAL "master") +- set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]") +- endif () +-endif () + + set (PACKAGE_NAME "Qsynth") + set (PACKAGE_VERSION "${VERSION}") diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-0.9.0.ebuild similarity index 65% copy from media-sound/qsynth/qsynth-9999.ebuild copy to media-sound/qsynth/qsynth-0.9.0.ebuild index 7866d934551..70d95bac46a 100644 --- a/media-sound/qsynth/qsynth-9999.ebuild +++ b/media-sound/qsynth/qsynth-0.9.0.ebuild @@ -1,18 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop qmake-utils xdg-utils git-r3 autotools +inherit cmake desktop qmake-utils xdg-utils DESCRIPTION="Qt application to control FluidSynth" HOMEPAGE="https://qsynth.sourceforge.io/"; -EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"; + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"; + inherit git-r3 +else + SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi LICENSE="GPL-2" SLOT="0" IUSE="+alsa debug jack pulseaudio" -KEYWORDS="" + +REQUIRED_USE="|| ( alsa jack pulseaudio )" BDEPEND=" dev-qt/linguist-tools:5 @@ -26,24 +34,23 @@ DEPEND=" " RDEPEND="${DEPEND}" -REQUIRED_USE="|| ( alsa jack pulseaudio )" +PATCHES=( "${FILESDIR}/${P}-cmake-no-git-version.patch" ) src_prepare() { - default - eautoreconf + cmake_src_prepare + + sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die } src_configure() { - sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die - econf \ - $(use_enable debug) - - eqmake5 ${PN}.pro -o ${PN}.mak + local mycmakeargs=( + -DCONFIG_DEBUG=$(usex debug 1 0) + ) + cmake_src_configure } src_install() { - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - einstalldocs + cmake_src_install # The desktop file is invalid, and we also change the command # depending on useflags diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild index 7866d934551..70d95bac46a 100644 --- a/media-sound/qsynth/qsynth-9999.ebuild +++ b/media-sound/qsynth/qsynth-9999.ebuild @@ -1,18 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop qmake-utils xdg-utils git-r3 autotools +inherit cmake desktop qmake-utils xdg-utils DESCRIPTION="Qt application to control FluidSynth" HOMEPAGE="https://qsynth.sourceforge.io/"; -EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"; + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"; + inherit git-r3 +else + SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi LICENSE="GPL-2" SLOT="0" IUSE="+alsa debug jack pulseaudio" -KEYWORDS="" + +REQUIRED_USE="|| ( alsa jack pulseaudio )" BDEPEND=" dev-qt/linguist-tools:5 @@ -26,24 +34,23 @@ DEPEND=" " RDEPEND="${DEPEND}" -REQUIRED_USE="|| ( alsa jack pulseaudio )" +PATCHES=( "${FILESDIR}/${P}-cmake-no-git-version.patch" ) src_prepare() { - default - eautoreconf + cmake_src_prepare + + sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die } src_configure() { - sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die - econf \ - $(use_enable debug) - - eqmake5 ${PN}.pro -o ${PN}.mak + local mycmakeargs=( + -DCONFIG_DEBUG=$(usex debug 1 0) + ) + cmake_src_configure } src_install() { - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - einstalldocs + cmake_src_install # The desktop file is invalid, and we also change the command # depending on useflags
