commit: c7006791439e1cda9d248a1de9580693c771b853 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 7 15:42:55 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 15:43:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7006791
media-sound/flacon: RESTRICT="!test? ( test )" Package-Manager: Portage-2.3.81, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../flacon/files/flacon-5.5.1-ninja-warning.patch | 63 ++++++++++++++++++++++ .../files/flacon-5.5.1-no-man-compress.patch | 23 ++++++++ media-sound/flacon/flacon-5.5.1.ebuild | 2 + 3 files changed, 88 insertions(+) diff --git a/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch b/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch new file mode 100644 index 00000000000..358e0464c80 --- /dev/null +++ b/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch @@ -0,0 +1,63 @@ +From bc6346175db9f89777141b6d17b52143b3caafeb Mon Sep 17 00:00:00 2001 +From: Alexander Sokolov <[email protected]> +Date: Mon, 21 Oct 2019 22:08:18 +0300 +Subject: [PATCH] Fixed issue #104. Correct CMake policy CMP0058 warnings. + +--- + CMakeLists.txt | 10 +++++++++- + translations/translatorsinfo.cmake | 10 ++-------- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fbbca2..95f25cd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,7 +244,15 @@ include(FindPkgConfig) + pkg_search_module(UCHARDET REQUIRED uchardet) + + include(translations/translatorsinfo.cmake) +-create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations) ++add_custom_target("translators") ++add_custom_command( ++ TARGET "translators" ++ PRE_BUILD ++ BYPRODUCTS ${TRANSLATORS_INFO_FILE} ++ COMMAND create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations) ++) ++ ++ + set(LIBRARIES ${LIBRARIES} ${UCHARDET_LIBRARIES}) + include_directories(${UCHARDET_INCLUDE_DIRS}) + link_directories(${UCHARDET_LIBRARY_DIRS}) +diff --git a/translations/translatorsinfo.cmake b/translations/translatorsinfo.cmake +index b439a05..650174b 100644 +--- a/translations/translatorsinfo.cmake ++++ b/translations/translatorsinfo.cmake +@@ -23,13 +23,11 @@ + # + # END_COMMON_COPYRIGHT_HEADER + ++set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info) + + FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR) + get_filename_component(srcDir ${_DIR}/ ABSOLUTE) + +- +- set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info) +- + file(GLOB IN_FILES ${srcDir}/translators_*.info) + file(WRITE ${TRANSLATORS_INFO_FILE} "") + +@@ -42,11 +40,7 @@ FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR) + + configure_file(${srcDir}/translatorsinfo.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) + +- if(USE_QT4) +- qt4_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) +- else() +- qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) +- endif() ++ qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc) + + set(${_qrcFile} ${__qrcFile} PARENT_SCOPE) + ENDFUNCTION() diff --git a/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch b/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch new file mode 100644 index 00000000000..191d863fb31 --- /dev/null +++ b/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch @@ -0,0 +1,23 @@ +--- a/CMakeLists.txt 2019-12-07 15:55:24.155414989 +0100 ++++ b/CMakeLists.txt 2019-12-07 15:56:38.266998439 +0100 +@@ -341,11 +341,6 @@ + @ONLY + ) + +-add_custom_command(TARGET ${PROJECT_NAME} +- COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz +-) +- +- + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) +@@ -357,7 +352,7 @@ + else() + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) + install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR}) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION share/man/man1) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metadata.xml DESTINATION "share/metainfo") diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-5.5.1.ebuild index 40b359b8d0a..e6310352d35 100644 --- a/media-sound/flacon/flacon-5.5.1.ebuild +++ b/media-sound/flacon/flacon-5.5.1.ebuild @@ -39,6 +39,8 @@ DEPEND="${RDEPEND} ) " +RESTRICT="!test? ( test )" + PATCHES=( "${FILESDIR}/${P}-no-man-compress.patch" "${FILESDIR}/${P}-ninja-warning.patch" # git master
