summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2023-08-09 18:53:29 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2023-08-09 18:53:39 +0200
commitccd8a47995573f318c40991d2ade851a012ed702 (patch)
tree2eb85a48430543e3d1c4746ccd9f9bc3902aa3dd /media-sound/hydrogen
parentapp-emacs/eselect-mode: add 1.4.26 (diff)
downloadgentoo-ccd8a47995573f318c40991d2ade851a012ed702.tar.gz
gentoo-ccd8a47995573f318c40991d2ade851a012ed702.tar.bz2
gentoo-ccd8a47995573f318c40991d2ade851a012ed702.zip
media-sound/hydrogen: updated patch in the live ebuild
Closes: https://bugs.gentoo.org/911490 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-sound/hydrogen')
-rw-r--r--media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch29
-rw-r--r--media-sound/hydrogen/hydrogen-9999.ebuild2
2 files changed, 30 insertions, 1 deletions
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() {