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

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     ccd8a47995573f318c40991d2ade851a012ed702
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 16:53:29 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 16:53:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd8a479

media-sound/hydrogen: updated patch in the live ebuild

Closes: https://bugs.gentoo.org/911490
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/hydrogen-1.2.1-gnuinstalldirs.patch      | 29 ++++++++++++++++++++++
 media-sound/hydrogen/hydrogen-9999.ebuild          |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
new file mode 100644
index 000000000000..d7b6105a42ff
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc368f7..b764d7c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -418,10 +418,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt)
+ ENDIF()
+ INSTALL(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index e96d7ed..79b74e0 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -77,5 +77,5 @@ ENDIF()
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()

diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index cd84978b5281..951d4fb7a1fc 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch"
 )
 
 src_prepare() {