public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/qsynth/files/, media-sound/qsynth/
@ 2016-01-12 14:59 Jason Donenfeld
  0 siblings, 0 replies; 2+ messages in thread
From: Jason Donenfeld @ 2016-01-12 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     706e0055683bc0d5f9246200bb1cda4fca7229c5
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 14:58:36 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 14:59:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706e0055

media-sound/qsynth: Fix configure for qt5

Package-Manager: portage-2.2.26

 media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch | 11 +++++++++++
 media-sound/qsynth/qsynth-0.4.0.ebuild                  |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch b/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
new file mode 100644
index 0000000..6b16492
--- /dev/null
+++ b/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
@@ -0,0 +1,11 @@
+diff -ru qsynth-0.4.0/configure qsynth-0.4.0-modified/configure
+--- qsynth-0.4.0/configure	2015-09-07 16:59:25.083842955 +0200
++++ qsynth-0.4.0-modified/configure	2016-01-12 15:57:36.673008368 +0100
+@@ -4159,6 +4159,7 @@
+ 
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#define QT_NO_VERSION_TAGGING
+ #include "QtCore/qglobal.h"
+ int
+ main ()

diff --git a/media-sound/qsynth/qsynth-0.4.0.ebuild b/media-sound/qsynth/qsynth-0.4.0.ebuild
index e9bc54b..de76b60 100644
--- a/media-sound/qsynth/qsynth-0.4.0.ebuild
+++ b/media-sound/qsynth/qsynth-0.4.0.ebuild
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
+src_prepare() {
+	use qt5 && epatch "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch"
+}
+
 src_configure() {
 	econf \
 		$(use_enable debug) \


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/qsynth/files/, media-sound/qsynth/
@ 2021-03-08 21:14 Andreas Sturmlechner
  0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-03-08 21:14 UTC (permalink / raw
  To: gentoo-commits

commit:     8ef14a2aa9f3ac313384537e65d99dd6a9b3c1af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  8 20:49:49 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  8 21:13:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef14a2a

media-sound/qsynth: Drop 0.6.3 and 0.9.0

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/qsynth/Manifest                        |  2 -
 .../qsynth/files/qsynth-0.4.0-qt5-tagging.patch    | 11 ---
 .../files/qsynth-0.9.0-cmake-no-git-version.patch  | 37 ----------
 media-sound/qsynth/qsynth-0.6.3.ebuild             | 69 -------------------
 media-sound/qsynth/qsynth-0.9.0.ebuild             | 79 ----------------------
 5 files changed, 198 deletions(-)

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index c24bb02be3e..b7d8b93ebcf 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,3 +1 @@
-DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
-DIST qsynth-0.9.0.tar.gz 383118 BLAKE2B d9464a2f122d7281ff69171c431fff72d05886ec130d20aae8d8f122e1cefd1180b8bcdc157f324c5cdbc7e2c524c82a9cc7f481efc8b69912ce61912e73ed58 SHA512 5cc0e099cd05f3639ded81642bde80205c8921b65d22dcb32d40ac874107043edeb672e69d7e4734e0fd37a498be2e5b787f0b8c1707be45e39cfab616fd522c
 DIST qsynth-0.9.1.tar.gz 393897 BLAKE2B f63766614d821409cd12e418e36b8dbd739da8e2cd7deae91c2b00dd4f5ba2f447a3ca19c3829de3282e368baa37567333be051641221300d13dd7948d762008 SHA512 70bba332b90963d1c1da18fb3de8f05544fed3406c2144b6ed78cf93720cbcb684ff367d7ef4bc80be94ebea060b38753ae0cb183e85f96f127014c08de701b0

diff --git a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch b/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
deleted file mode 100644
index 6b164924aca..00000000000
--- a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru qsynth-0.4.0/configure qsynth-0.4.0-modified/configure
---- qsynth-0.4.0/configure	2015-09-07 16:59:25.083842955 +0200
-+++ qsynth-0.4.0-modified/configure	2016-01-12 15:57:36.673008368 +0100
-@@ -4159,6 +4159,7 @@
- 
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#define QT_NO_VERSION_TAGGING
- #include "QtCore/qglobal.h"
- int
- main ()

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
deleted file mode 100644
index 11091ba1166..00000000000
--- a/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7ddf562dfc92174f47e3da95a1e18e5b1af83bfc Mon Sep 17 00:00:00 2001
-From: Christoph Karl <pampelmuse@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-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild
deleted file mode 100644
index 2e469dea3b3..00000000000
--- a/media-sound/qsynth/qsynth-0.6.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/media-sound/qsynth/qsynth-0.9.0.ebuild b/media-sound/qsynth/qsynth-0.9.0.ebuild
deleted file mode 100644
index 70d95bac46a..00000000000
--- a/media-sound/qsynth/qsynth-0.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop qmake-utils xdg-utils
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-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"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-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)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-03-08 21:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-12 14:59 [gentoo-commits] repo/gentoo:master commit in: media-sound/qsynth/files/, media-sound/qsynth/ Jason Donenfeld
  -- strict thread matches above, loose matches on Subject: below --
2021-03-08 21:14 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox