diff options
| -rw-r--r-- | media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch | 29 | ||||
| -rw-r--r-- | media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch | 13 | ||||
| -rw-r--r-- | media-sound/hydrogen/hydrogen-9999.ebuild | 3 |
3 files changed, 30 insertions, 15 deletions
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch new file mode 100644 index 000000000000..ef70497abf72 --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04aa6380..e979783e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -362,10 +362,10 @@ ELSE() + INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE) + ENDIF() + IF(NOT MINGW AND NOT APPLE) +- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") +- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.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 cfdc72a7..b7b0dbcb 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} + + 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/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch deleted file mode 100644 index 3c32e2b3e621..000000000000 --- a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/data/i18n/CMakeLists.txt 2020-09-07 09:31:57.481066097 +0200 -+++ b/data/i18n/CMakeLists.txt 2020-09-07 09:29:27.612763184 +0200 -@@ -5,4 +5,9 @@ - - QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES}) - ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES}) --INSTALL(FILES ${QM_FILES} DESTINATION "./data/i18n") -+ -+IF(MINGW) -+ INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n") -+ELSE() -+ INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n") -+ENDIF() diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index 87e5b809fe3b..aa141dadf063 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-9999.ebuild @@ -58,8 +58,7 @@ RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) PATCHES=( - "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" - "${FILESDIR}/${P}-i18n-path.patch" + "${FILESDIR}/${P}-gnuinstalldirs.patch" ) src_prepare() { |