Date: Wed, 13 Jan 2021 23:17:51 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561521 - in head/net/libarcus: . files Message-ID: <202101132317.10DNHpeB072239@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Wed Jan 13 23:17:51 2021 New Revision: 561521 URL: https://svnweb.freebsd.org/changeset/ports/561521 Log: Really update libarcus to 4.8 N.B. the wrinkle in cmake build here. find_package(Pythoninterp 3.4 REQUIRED) can find your install Python 3.9 instead of the DEFAULT Python. Force the correct one with a few patches. PR: ports/251236 Submitted by: sko@rostwald.de Reported by: trombik1973@gmail.com Modified: head/net/libarcus/Makefile head/net/libarcus/distinfo head/net/libarcus/files/patch-CMakeLists.txt (contents, props changed) Modified: head/net/libarcus/Makefile ============================================================================== --- head/net/libarcus/Makefile Wed Jan 13 23:03:31 2021 (r561520) +++ head/net/libarcus/Makefile Wed Jan 13 23:17:51 2021 (r561521) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libArcus -PORTVERSION= 4.7.1 -PORTREVISION= 2 +PORTVERSION= 4.8.0 PORTEPOCH= 1 CATEGORIES= net cad DIST_SUBDIR= Ultimaker @@ -20,6 +19,8 @@ USE_PYQT= sip pysip USE_GITHUB= yes GH_ACCOUNT= Ultimaker USE_LDCONFIG= yes -GH_TAGNAME= 6a68d7e0 +#GH_TAGNAME= 3afb644 +CMAKE_ARGS+= -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} \ + -DPYTHON_INCLUDEDIR:STRING=${PYTHON_INCLUDEDIR} .include <bsd.port.mk> Modified: head/net/libarcus/distinfo ============================================================================== --- head/net/libarcus/distinfo Wed Jan 13 23:03:31 2021 (r561520) +++ head/net/libarcus/distinfo Wed Jan 13 23:17:51 2021 (r561521) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600556808 -SHA256 (Ultimaker/Ultimaker-libArcus-4.7.1-6a68d7e0_GH0.tar.gz) = c7408c07b1cc79cb17a817b49cba5432a23159082e66efe58776022a31d7541a -SIZE (Ultimaker/Ultimaker-libArcus-4.7.1-6a68d7e0_GH0.tar.gz) = 31948 +TIMESTAMP = 1610493107 +SHA256 (Ultimaker/Ultimaker-libArcus-4.8.0_GH0.tar.gz) = f5a7234506c89a36adccdab2a3c410a75aaaa9e7c7f9533db834881c59001677 +SIZE (Ultimaker/Ultimaker-libArcus-4.8.0_GH0.tar.gz) = 31906 Modified: head/net/libarcus/files/patch-CMakeLists.txt ============================================================================== --- head/net/libarcus/files/patch-CMakeLists.txt Wed Jan 13 23:03:31 2021 (r561520) +++ head/net/libarcus/files/patch-CMakeLists.txt Wed Jan 13 23:17:51 2021 (r561521) @@ -1,6 +1,31 @@ ---- CMakeLists.txt.orig 2020-10-11 05:33:17 UTC +--- CMakeLists.txt.orig 2020-10-09 16:43:28 UTC +++ CMakeLists.txt -@@ -94,7 +94,7 @@ endif() +@@ -28,12 +28,21 @@ if(BUILD_PYTHON) + # However currently on our CI server it finds the wrong Python version and then doesn't find the headers. + find_package(PythonInterp 3.4 REQUIRED) + find_package(PythonLibs 3.4 REQUIRED) +- +- find_package(SIP REQUIRED) ++if(NOT PYTHON_EXECUTABLE STREQUAL "") ++ set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) ++ message("Using given PYTHON_EXECUTABLE") ++endif() ++if(NOT PYTHON_INCLUDE_DIR STREQUAL "") ++ set(PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIR}) ++ message("Using given PYTHON_INCLUDE_DIR") ++endif() ++find_package(SIP REQUIRED) + if(NOT DEFINED LIB_SUFFIX) + set(LIB_SUFFIX "") + endif() +- ++if(NOT PYTHON_INCLUDEDIR STREQUAL "") ++ message("Setting Python3_INCLUDE_DIRS = ${PYTHON_INCLUDEDIR}") ++endif() + include_directories(python/ src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}) + endif() + +@@ -88,7 +97,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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101132317.10DNHpeB072239>