From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch | 34 ---------- .../uhd/files/uhd_man_pages_optional_compress.diff | 76 ---------------------- 2 files changed, 110 deletions(-) delete mode 100644 net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch delete mode 100644 net-wireless/uhd/files/uhd_man_pages_optional_compress.diff (limited to 'net-wireless/uhd/files') diff --git a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch deleted file mode 100644 index ff9956fee41c..000000000000 --- a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- host/utils/latency/CMakeLists.txt.orig 2017-05-11 19:44:54.824946672 +0300 -+++ host/utils/latency/CMakeLists.txt 2017-05-11 19:45:08.498880360 +0300 -@@ -35,7 +35,8 @@ - GET_FILENAME_COMPONENT(name ${source} NAME_WE) - ADD_EXECUTABLE(${name} ${source} ${latency_lib_path}) - LIBUHD_APPEND_SOURCES(${name}) -- TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES} -+ ${CURSES_LIBRARIES} tinfo) - UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - ENDFOREACH(source) - ---- host/examples/CMakeLists.txt.orig 2017-05-11 19:41:02.322302577 +0300 -+++ host/examples/CMakeLists.txt 2017-05-11 19:44:32.604066325 +0300 -@@ -59,7 +59,7 @@ - IF(CURSES_FOUND) - INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR}) - ADD_EXECUTABLE(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - ENDIF(CURSES_FOUND) - ---- host/CMakeLists.txt.orig 2017-05-11 19:36:38.944798634 +0300 -+++ host/CMakeLists.txt 2017-05-11 19:36:40.819788408 +0300 -@@ -436,6 +436,8 @@ - LIST(APPEND UHD_LINK_LIST_STATIC "usb-1.0") - ENDIF(ENABLE_USB) - -+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") -+ - CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in - ${CMAKE_BINARY_DIR}/cmake/Modules/UHDConfigVersion.cmake diff --git a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff deleted file mode 100644 index 5847d50c66f0..000000000000 --- a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt -index 240a534db..7a7108f00 100644 ---- a/host/docs/CMakeLists.txt -+++ b/host/docs/CMakeLists.txt -@@ -144,34 +144,49 @@ set(man_page_sources - ######################################################################## - # Setup man pages - ######################################################################## --find_package(GZip) -+option(ENABLE_MAN_PAGE_COMPRESSION "Compress man pages if installed." ON) - - # No elegant way in CMake to reverse a boolean - if(NOT WIN32) - set(NOT_WIN32 TRUE) - endif(NOT WIN32) - --LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "GZIP_FOUND;NOT_WIN32" OFF OFF) -+set(MAN_PAGES_DEPS "NOT_WIN32") -+ -+message(STATUS "") -+if(ENABLE_MAN_PAGE_COMPRESSION) -+ message(STATUS "Compress man pages enabled; looking for compression program") -+ find_package(GZip) -+ list(APPEND MAN_PAGES_DEPS "GZIP_FOUND") -+else(ENABLE_MAN_PAGE_COMPRESSION) -+ message(STATUS "Compress man pages disabled") -+endif(ENABLE_MAN_PAGE_COMPRESSION) -+ -+LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "${MAN_PAGES_DEPS}" OFF OFF) - - if(ENABLE_MAN_PAGES) -- #Generate man pages -- foreach(manfile ${man_page_sources}) -- #make the gzip file depend on the text file -- string(REPLACE ".1" "" PROGRAM_NAME "${manfile}") -- set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz") -- set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}") -- add_custom_command( -- OUTPUT ${gzfile} -- DEPENDS ${manfile} -- COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile} -- COMMENT "Generating ${PROGRAM_NAME} man page" -- ) -- -- #make the man page target depend on the gz file -- list(APPEND man_page_gz_files ${gzfile}) -- UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) -- endforeach(manfile ${man_page_sources}) -- -- #make the man pages a build-time dependency -- add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files}) -+ #Generate man pages; either compressed or not -+ if(ENABLE_MAN_PAGE_COMPRESSION) -+ # compress man pages -+ foreach(manfile ${man_page_sources}) -+ #make the gzip file depend on the text file -+ string(REPLACE ".1" "" PROGRAM_NAME "${manfile}") -+ set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz") -+ set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}") -+ add_custom_command( -+ OUTPUT ${gzfile} -+ DEPENDS ${manfile} -+ COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile} -+ COMMENT "Generating ${PROGRAM_NAME} man page" -+ ) -+ #make the man page target depend on the gz file -+ list(APPEND man_page_gz_files ${gzfile}) -+ endforeach(manfile ${man_page_sources}) -+ #make the man pages a build-time dependency -+ UHD_INSTALL(FILES ${man_page_gz_files} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) -+ add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files}) -+ else(ENABLE_MAN_PAGE_COMPRESSION) -+ # uncompressed man pages; just install them -+ UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) -+ endif(ENABLE_MAN_PAGE_COMPRESSION) - endif(ENABLE_MAN_PAGES) -- cgit v1.2.3