| 1 |
commit: 8b2d2f9604a554ce399bf80e34857223fe2cba94 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 1 16:22:53 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 1 16:22:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b2d2f96 |
| 7 |
|
| 8 |
media-sound/hydrogen: updated patch for 9999 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/hydrogen-9999-gnuinstalldirs.patch | 29 ++++++++++++++++++++++ |
| 14 |
media-sound/hydrogen/hydrogen-9999.ebuild | 2 +- |
| 15 |
2 files changed, 30 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..9b842975307 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 24 |
+index 04aa6380..e979783e 100644 |
| 25 |
+--- a/CMakeLists.txt |
| 26 |
++++ b/CMakeLists.txt |
| 27 |
+@@ -362,10 +362,10 @@ ELSE() |
| 28 |
+ INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE) |
| 29 |
+ ENDIF() |
| 30 |
+ IF(NOT MINGW AND NOT APPLE) |
| 31 |
+- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata") |
| 32 |
+- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") |
| 33 |
++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo") |
| 34 |
++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications") |
| 35 |
+ 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") |
| 36 |
+- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") |
| 37 |
++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1") |
| 38 |
+ ENDIF() |
| 39 |
+ |
| 40 |
+ # |
| 41 |
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt |
| 42 |
+index cfdc72a7..b7b0dbcb 100644 |
| 43 |
+--- a/src/core/CMakeLists.txt |
| 44 |
++++ b/src/core/CMakeLists.txt |
| 45 |
+@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION} |
| 46 |
+ |
| 47 |
+ IF(NOT APPLE AND NOT WIN32) |
| 48 |
+ INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE) |
| 49 |
+- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" ) |
| 50 |
++ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" ) |
| 51 |
+ ENDIF() |
| 52 |
|
| 53 |
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild |
| 54 |
index 25e3e04fb92..29b288106e0 100644 |
| 55 |
--- a/media-sound/hydrogen/hydrogen-9999.ebuild |
| 56 |
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild |
| 57 |
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}" |
| 58 |
|
| 59 |
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt ) |
| 60 |
|
| 61 |
-PATCHES=( "${FILESDIR}/${PN}-1.0.0_beta2-gnuinstalldirs.patch" ) |
| 62 |
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" ) |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
cmake_src_prepare |
Archives