Fix patches for sci-libs/libqhy

4 files changed, 30 insertions, 5 deletions

diff --git a/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.1.0_fix_cmake_symlinks.patch
index 87964bd..87964bd 100644
--- a/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch
+++ b/sci-libs/libqhy/files/libqhy-1.1.0_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
new file mode 100644
index 0000000..89d8d49
--- /dev/null
+++ b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
@@ -0,0 +1,25 @@
+--- CMakeLists.txt	2015-11-24 19:51:44.637032421 +0100
++++ CMakeLists.txt.new	2015-11-24 19:54:46.486779641 +0100
+@@ -31,12 +31,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 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,5 +42,9 @@
+ 

+ 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-1.1.0.ebuild b/sci-libs/libqhy/libqhy-1.1.0.ebuild
index e4770a3..5c42ff9 100644
--- a/sci-libs/libqhy/libqhy-1.1.0.ebuild
+++ b/sci-libs/libqhy/libqhy-1.1.0.ebuild
@@ -20,6 +20,6 @@ DEPEND="virtual/libusb:1
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/libqhy-1.0.0_fix_cmake_symlinks.patch" )
+PATCHES=( "${FILESDIR}/libqhy-1.1.0_fix_cmake_symlinks.patch" )
 
-S="${WORKDIR}/libindi_3rdparty-${PV}/${PN}"
\ No newline at end of file
+S="${WORKDIR}/libindi_3rdparty-${PV}/${PN}"
diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild
index b0a21eb..6c8a9f4 100644
--- a/sci-libs/libqhy/libqhy-9999.ebuild
+++ b/sci-libs/libqhy/libqhy-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-LIBQHY_VERSION="0.1.1"
+LIBQHY_VERSION="0.1.7"
 LIBQHY_SOVERSION="0"
 
 inherit cmake-utils subversion eutils
@@ -19,7 +19,7 @@ KEYWORDS=""
 
 SLOT="0"
 
-ESVN_PATCHES=( "${FILESDIR}/libqhy-1.0.0_fix_cmake_symlink.patch" )
+ESVN_PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlinks.patch" )
 
 DEPEND="virtual/libusb:1
 	media-libs/opencv"
@@ -28,4 +28,4 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	subversion_src_unpack
-}
\ No newline at end of file
+}