[gentoo-commits] repo/gentoo:master commit in: media-sound/qsynth/, media-sound/qsynth/files/

[Miroslav Šulc]

commit:     de8d5c247b2699a7c713f13557e1cca59915f9b9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 14:21:25 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 14:21:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8d5c24

media-sound/qsynth: bump to 0.9.1, xdg-utils -> xdg, updated live

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/qsynth/Manifest                         |  1 +
 .../files/qsynth-0.9.1-cmake-no-git-version.patch   | 21 +++++++++++++++++++++
 .../{qsynth-9999.ebuild => qsynth-0.9.1.ebuild}     | 12 +++---------
 media-sound/qsynth/qsynth-9999.ebuild               | 10 +---------
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index b6fb37b4356..c24bb02be3e 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,2 +1,3 @@
 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.9.1-cmake-no-git-version.patch 
b/media-sound/qsynth/files/qsynth-0.9.1-cmake-no-git-version.patch
new file mode 100644
index 00000000000..9ea401abc26
--- /dev/null
+++ b/media-sound/qsynth/files/qsynth-0.9.1-cmake-no-git-version.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47ea36f..0194f32 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,7 @@ project(qsynth
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+ 
+ set (CONFIG_VERSION ${PROJECT_VERSION})
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+@@ -29,6 +30,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+ else ()
+   set (VERSION "${PROJECT_VERSION}")
+ endif ()
++]]
++set (VERSION "${PROJECT_VERSION}")
+ 
+ set (PACKAGE_NAME "Qsynth")
+ set (PACKAGE_VERSION "${VERSION}")

diff --git a/media-sound/qsynth/qsynth-9999.ebuild 
b/media-sound/qsynth/qsynth-0.9.1.ebuild
similarity index 91%
copy from media-sound/qsynth/qsynth-9999.ebuild
copy to media-sound/qsynth/qsynth-0.9.1.ebuild
index b0cfa6dfb05..dac583b64db 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg-utils
+inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/";
@@ -34,6 +34,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-cmake-no-git-version.patch" )
+
 src_prepare() {
        cmake_src_prepare
 
@@ -67,11 +69,3 @@ src_install() {
 
        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-9999.ebuild 
b/media-sound/qsynth/qsynth-9999.ebuild
index b0cfa6dfb05..f2e790dc5a2 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg-utils
+inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/";
@@ -67,11 +67,3 @@ src_install() {
 
        make_desktop_entry "${cmd}" Qsynth qsynth
 }
-
-pkg_postinst() {
-       xdg_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
-}