From owner-svn-ports-head@freebsd.org Wed Jan 13 23:17:52 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 975D24EB6A4; Wed, 13 Jan 2021 23:17:52 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGNdr3ppnz3vVp; Wed, 13 Jan 2021 23:17:52 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75E671F8E4; Wed, 13 Jan 2021 23:17:52 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10DNHq43072242; Wed, 13 Jan 2021 23:17:52 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10DNHpeB072239; Wed, 13 Jan 2021 23:17:51 GMT (envelope-from db@FreeBSD.org) Message-Id: <202101132317.10DNHpeB072239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Wed, 13 Jan 2021 23:17:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561521 - in head/net/libarcus: . files X-SVN-Group: ports-head X-SVN-Commit-Author: db X-SVN-Commit-Paths: in head/net/libarcus: . files X-SVN-Commit-Revision: 561521 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2021 23:17:52 -0000 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 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)