From b48ea774f7195dd29b7815f72cdc5fb964f5a847 Mon Sep 17 00:00:00 2001 From: Ctibor Date: Tue, 24 Nov 2015 21:44:52 +0100 Subject: Fix patch for sci-libs/indilib --- .../indilib/files/indilib-0.9.8.1-symlinks.patch | 22 -------------------- .../indilib/files/indilib-1.1.0-symlinks.patch | 24 ++++++++++++++++++++++ sci-libs/indilib/indilib-1.1.0.ebuild | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 sci-libs/indilib/files/indilib-0.9.8.1-symlinks.patch create mode 100644 sci-libs/indilib/files/indilib-1.1.0-symlinks.patch diff --git a/sci-libs/indilib/files/indilib-0.9.8.1-symlinks.patch b/sci-libs/indilib/files/indilib-0.9.8.1-symlinks.patch deleted file mode 100644 index 51d3223..0000000 --- a/sci-libs/indilib/files/indilib-0.9.8.1-symlinks.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -242,14 +242,11 @@ - - install(TARGETS indi_lx200generic RUNTIME DESTINATION bin ) - --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake --"exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200classic)\n --exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200autostar)\n --exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200_16)\n --exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200gps)\n --exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200ap)\n --") --set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx20gps\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap\" )" ) - ################################################################################# - - ########### LX200 Generic Legacy ########### diff --git a/sci-libs/indilib/files/indilib-1.1.0-symlinks.patch b/sci-libs/indilib/files/indilib-1.1.0-symlinks.patch new file mode 100644 index 0000000..67144ea --- /dev/null +++ b/sci-libs/indilib/files/indilib-1.1.0-symlinks.patch @@ -0,0 +1,24 @@ +--- /var/tmp/portage/sci-libs/indilib-1.1.0/work/libindi_1.1.0/CMakeLists.txt 2015-09-06 15:17:35.000000000 +0200 ++++ /var/tmp/portage/sci-libs/indilib-1.1.0/work/libindi_1.1.0/CMakeLists.txt.new 2015-11-24 21:42:29.563926775 +0100 +@@ -262,16 +262,11 @@ + + install(TARGETS indi_lx200generic RUNTIME DESTINATION bin ) + +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake +-"exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200classic)\n +-exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200autostar)\n +-exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200_16)\n +-exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200gps)\n +-exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200ap)\n +-exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200gemini)\n +-exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200fs2)\n +-") +-set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake) +++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic\" )" ) +++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar\" )" ) +++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16\" )" ) +++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx20gps\" )" ) +++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap\" )" ) + ################################################################################# + + ########### Celestron GPS ############ diff --git a/sci-libs/indilib/indilib-1.1.0.ebuild b/sci-libs/indilib/indilib-1.1.0.ebuild index 77e073e..efe9f56 100644 --- a/sci-libs/indilib/indilib-1.1.0.ebuild +++ b/sci-libs/indilib/indilib-1.1.0.ebuild @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog README TODO ) PATCHES=( - "${FILESDIR}/${PN}-0.9.8.1-symlinks.patch" + "${FILESDIR}/${PN}-1.1.0-symlinks.patch" ) S=${WORKDIR}/${MY_PN}_${PV} -- cgit v1.2.3