diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-13 20:14:49 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-13 20:17:16 +0100 |
| commit | 342c44e9545350abc429cbd44185d4012afbab6a (patch) | |
| tree | c4fcb78055ddfb2644284fc763fe0bc8803cf86b /media-sound/hydrogen | |
| parent | sys-apps/biosdisk: Removed old 20100611 version. (diff) | |
| download | gentoo-342c44e9545350abc429cbd44185d4012afbab6a.tar.gz gentoo-342c44e9545350abc429cbd44185d4012afbab6a.tar.bz2 gentoo-342c44e9545350abc429cbd44185d4012afbab6a.zip | |
media-sound/hydrogen: Fix cmake-patch
Thanks-to: PhobosK <phobosk@fastmail.fm>
Closes: https://bugs.gentoo.org/650430
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'media-sound/hydrogen')
| -rw-r--r-- | media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch (renamed from media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch) | 12 | ||||
| -rw-r--r-- | media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild (renamed from media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild) | 2 | ||||
| -rw-r--r-- | media-sound/hydrogen/hydrogen-9999.ebuild | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch index e0100eedf7cc..59a5486e2cad 100644 --- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch @@ -30,7 +30,7 @@ index 96dbf47a..2caab298 100644 #Installation paths # TODO remove data from path -SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data") -+SET(SYS_DATA_PATH "${CMAKE_FULL_INSTALL_DATAROOTDIR}/hydrogen/data") ++SET(SYS_DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen/data") # TODO remove data from path, could be .config/hydrogen SET(USR_DATA_PATH ".hydrogen/data") @@ -42,10 +42,10 @@ index 96dbf47a..2caab298 100644 - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") - INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps") - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/appdata") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/applications") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/pixmaps") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_FULL_INSTALL_MANDIR}/man1") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") ENDIF() # @@ -76,7 +76,7 @@ diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt IF(NOT APPLE AND NOT WIN32) INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" ) -+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_FULL_INSTALL_INCLUDEDIR}/hydrogen" ) ++ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) ENDIF() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt --- a/src/gui/CMakeLists.txt diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild index c54815796c43..61d6269e79d3 100644 --- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild +++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild @@ -42,7 +42,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) -PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" ) +PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" ) src_configure() { local mycmakeargs=( diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index 3d14fb4a6533..c5712d4665c7 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-9999.ebuild @@ -41,7 +41,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) -PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.0.0_pre20180301-gnuinstalldirs.patch" ) src_configure() { local mycmakeargs=( |