commit: 42ca400fd2cd38d214a3a849857f579af3edc5ec
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 16:35:48 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 16:35:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ca400f
media-sound/hydrogen-9999: removed gnuinstalldirs patch
it has been applied by upstream
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/hydrogen-9999-gnuinstalldirs.patch | 120 ---------------------
media-sound/hydrogen/hydrogen-9999.ebuild | 2 -
2 files changed, 122 deletions(-)
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
deleted file mode 100644
index 14babedefa5..00000000000
--- a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 64e251765e58b6948953f0bbc2aac05042daaa55 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
-Date: Mon, 1 Jan 2018 11:52:18 +0100
-Subject: [PATCH] Use GNUInstallDirs
-
-Fixes multiarch and deprecated man dir location.
----
- CMakeLists.txt | 19 ++++++++-----------
- src/cli/CMakeLists.txt | 2 +-
- src/core/CMakeLists.txt | 6 +++---
- src/gui/CMakeLists.txt | 2 +-
- src/player/CMakeLists.txt | 2 +-
- 5 files changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b18508a8..76305ea7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,8 @@ ELSE()
- SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
- ENDIF(VERSION_SUFFIX)
-
-+include(GNUInstallDirs)
-+
- SET(LIBSNDFILE_VERSION_PREV "1.0.17")
-
- #
-@@ -144,21 +146,16 @@ IF(APPLE)
- #Without setting this, installation would go into /usr/local, which does
not exist per default
- SET(CMAKE_INSTALL_PREFIX "/usr" )
- ELSE(APPLE)
-- SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib"
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
-+ SET(OSS_LIB_PATHS "${CMAKE_INSTALL_FULL_LIBDIR}/oss/lib"
"/usr/local/lib${LIB_SUFFIX}/oss/lib" )
- ENDIF(APPLE)
-
-
- #Installation paths
- # TODO remove data from path
--SET(H2_SYS_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen")
-+SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen")
- # TODO remove data from path, could be .config/hydrogen
- SET(H2_USR_PATH ".hydrogen")
-
--#Changing this to user writable location will allow successful, non-root,
deployment (e.g: make install).
--IF(NOT MINGW AND NOT APPLE)
-- SET(H2_UNIX_ICON_PATH "/usr/share/pixmaps" CACHE STRING "Freedesktop
default icon path.")
--ENDIF()
--
- SET(MAX_INSTRUMENTS 1000 CACHE STRING "Maximum number of instruments")
- SET(MAX_COMPONENTS 32 CACHE STRING "Maximum number of components")
- SET(MAX_NOTES 192 CACHE STRING "Maximum number of notes")
-@@ -366,10 +363,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/hydrogen.appdata.xml
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
-- 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
"${H2_UNIX_ICON_PATH}")
-- 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_INSTALL_DATAROOTDIR}/appdata")
-+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION
"${CMAKE_INSTALL_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_MANDIR}/man1")
- ENDIF()
-
- #
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
-index f6cd04eb..7725dc83 100644
---- a/src/cli/CMakeLists.txt
-+++ b/src/cli/CMakeLists.txt
-@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
-
- ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
-
--INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE
DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index db1333da..0ab61d96 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
- #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER
"${hydrogen_INCLUDES}" )
-
- INSTALL(TARGETS hydrogen-core-${VERSION}
-- LIBRARY DESTINATION "lib${LIB_SUFFIX}"
-- ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- # do not copy directory hierarchy
- #PUBLIC_HEADER DESTINATION include/hydrogen
- )
-
- 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_INSTALL_INCLUDEDIR}/hydrogen" )
- ENDIF()
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 4030dc9a..2aeb17c2 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -51,4 +51,4 @@ TARGET_LINK_LIBRARIES(hydrogen
- )
- ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
-
--INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE
DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
-index 72c270f3..836fc5b4 100644
---- a/src/player/CMakeLists.txt
-+++ b/src/player/CMakeLists.txt
-@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
-
- ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
-
--INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE
DESTINATION ${CMAKE_INSTALL_BINDIR})
---
-2.19.1
-
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild
b/media-sound/hydrogen/hydrogen-9999.ebuild
index 5bcfaa020fe..db964f61425 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -43,8 +43,6 @@ RDEPEND="${DEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
-
src_configure() {
local mycmakeargs=(
-DWANT_ALSA=$(usex alsa)
