From 52ca9cf86828923e5dfdac7e2bc2e82f533fd264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ctibor=20Bran=C4=8D=C3=ADk?= Date: Wed, 27 Dec 2017 18:19:15 +0100 Subject: Remove unneeded patches for libqhy and libsbig --- .../files/libqhy-9999_fix_cmake_symlinks.patch | 25 ---------------------- sci-libs/libqhy/libqhy-9999.ebuild | 2 -- .../files/libsbig-9999_fix_cmake_symlinks.patch | 20 ----------------- sci-libs/libsbig/libsbig-9999.ebuild | 2 -- 4 files changed, 49 deletions(-) delete mode 100644 sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch delete mode 100644 sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch deleted file mode 100644 index 39fc0f1..0000000 --- a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- CMakeLists.txt 2016-11-05 13:55:27.257074822 +0100 -+++ CMakeLists.txt.new 2016-11-05 13:56:06.675022408 +0100 -@@ -33,12 +33,6 @@ - ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") - ENDIF(UNIX AND NOT WIN32) - --# Make sure symbolic links are installed --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake " --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n --") -- - install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h DESTINATION include/libqhy) - install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) - install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) -@@ -48,6 +42,8 @@ - file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})" - ) - --install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake) -+# Make sure symbolic links are installed -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_VERSION}\" \"libqhy.so.${LIBQHY_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_SOVERSION}\" \"libqhy.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) - - ENDIF (APPLE) diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild index fba661f..29799d8 100644 --- a/sci-libs/libqhy/libqhy-9999.ebuild +++ b/sci-libs/libqhy/libqhy-9999.ebuild @@ -18,8 +18,6 @@ KEYWORDS="" SLOT="0" -PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlinks.patch" ) - DEPEND="virtual/libusb:1 media-libs/opencv" diff --git a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch deleted file mode 100644 index 5f7946b..0000000 --- a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt 2015-04-15 21:50:44.060806200 +0200 -+++ CMakeLists.txt.new 2015-04-15 21:52:22.257882425 +0200 -@@ -22,14 +22,10 @@ - ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") - ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) - --# Make sure symbolic links are installed --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake " --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n --") -- - install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) - install( FILES sbigudrv.h DESTINATION include/libsbig) - install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR}) - install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) --install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake) -+# Make sure symbolic links are installed -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) diff --git a/sci-libs/libsbig/libsbig-9999.ebuild b/sci-libs/libsbig/libsbig-9999.ebuild index 7e89426..99bbb26 100644 --- a/sci-libs/libsbig/libsbig-9999.ebuild +++ b/sci-libs/libsbig/libsbig-9999.ebuild @@ -20,6 +20,4 @@ KEYWORDS="" SLOT="0" -PATCHES=( "${FILESDIR}/libsbig-9999_fix_cmake_symlinks.patch" ) - S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}" -- cgit v1.2.3