diff options
| author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-12-08 20:03:07 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-12-08 20:03:07 +0000 |
| commit | 47b26d9293f196d71c39ba4d82df23d179884405 (patch) | |
| tree | 3984ac0366432e29f9e1ac47cbac9b18032f7c04 /net/libarcus | |
| parent | 96fd51619a1ebc0b215ab75ccc37ce7ab300ed8b (diff) | |
| download | ports-47b26d9293f196d71c39ba4d82df23d179884405.tar.gz ports-47b26d9293f196d71c39ba4d82df23d179884405.zip | |
Notes
Diffstat (limited to 'net/libarcus')
| -rw-r--r-- | net/libarcus/Makefile | 5 | ||||
| -rw-r--r-- | net/libarcus/files/patch-CMakeLists.txt | 11 | ||||
| -rw-r--r-- | net/libarcus/files/patch-cmake_FindSIP.cmake | 32 |
3 files changed, 46 insertions, 2 deletions
diff --git a/net/libarcus/Makefile b/net/libarcus/Makefile index 7a4b44f7c068..b39e4d783925 100644 --- a/net/libarcus/Makefile +++ b/net/libarcus/Makefile @@ -2,6 +2,7 @@ PORTNAME= libArcus PORTVERSION= 4.7.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net cad DIST_SUBDIR= Ultimaker @@ -12,10 +13,10 @@ COMMENT= Communication library between internal components for Ultimaker LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= sip:devel/py-sip@${PY_FLAVOR} LIB_DEPENDS= libprotobuf.so:devel/protobuf -USES= cmake compiler:c++11-lang python:3.4+ +USES= cmake compiler:c++11-lang python:3.5+ pyqt:5 +USE_PYQT= sip pysip USE_GITHUB= yes GH_ACCOUNT= Ultimaker USE_LDCONFIG= yes diff --git a/net/libarcus/files/patch-CMakeLists.txt b/net/libarcus/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..811f9f88ee3a --- /dev/null +++ b/net/libarcus/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2020-10-11 05:33:17 UTC ++++ CMakeLists.txt +@@ -94,7 +94,7 @@ endif() + if(BUILD_PYTHON) + set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip) + set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp) +- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods. ++ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods. + add_sip_python_module(Arcus python/Socket.sip Arcus) + endif() + diff --git a/net/libarcus/files/patch-cmake_FindSIP.cmake b/net/libarcus/files/patch-cmake_FindSIP.cmake new file mode 100644 index 000000000000..afebfef4de87 --- /dev/null +++ b/net/libarcus/files/patch-cmake_FindSIP.cmake @@ -0,0 +1,32 @@ +--- cmake/FindSIP.cmake.orig 2020-10-11 05:01:30 UTC ++++ cmake/FindSIP.cmake +@@ -68,16 +68,26 @@ endif() + + get_filename_component(_python_binary_path ${Python3_EXECUTABLE} DIRECTORY) + +-find_program(SIP_EXECUTABLE sip ++find_program(SIP_EXECUTABLE sip5 + HINTS ${CMAKE_PREFIX_PATH}/bin ${CMAKE_INSTALL_PATH}/bin ${_python_binary_path} ${Python3_SITELIB}/PyQt5 + ) + ++execute_process( ++ COMMAND sip-module --sip-h --target-dir ${CMAKE_BINARY_DIR} PyQt5.sip ++ RESULT_VARIABLE _process_status ++ OUTPUT_VARIABLE _process_output ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) ++if(NOT ${_process_status} EQUAL 0) ++ message(FATAL_ERROR "Failed to get sip.h. Error: ${_process_output}") ++endif() ++ + find_path(SIP_INCLUDE_DIRS sip.h +- HINTS ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PATH}/include ${Python3_INCLUDE_DIRS} ${Python3_SITELIB}/PyQt5 ++ HINTS ${CMAKE_BINARY_DIR} ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PATH}/include ${Python3_INCLUDE_DIRS} ${Python3_SITELIB}/PyQt5 + ) + + execute_process( +- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" ++ COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE |