1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

net/libcharon: Upgrade for cura 5.7

- upgrade need for cura
- N.B. -DPython_VERSION:STRING=${PYTHON_VER} \ Why lower case??
This commit is contained in:
Matthieu Volat 2024-09-04 15:23:20 -04:00 committed by Diane Bruce
parent 6ab10d2e9a
commit ea4068713c
4 changed files with 8 additions and 39 deletions

View File

@ -1,7 +1,5 @@
PORTNAME= libCharon
# XXX there is no 4.13.1
# https://github.com/Ultimaker/libCharon/tags
DISTVERSION= 4.13.0
DISTVERSION= 5.0.0
CATEGORIES= net devel cad
DIST_SUBDIR= Ultimaker
@ -18,8 +16,11 @@ STRIP=
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
# Python_VERSION in CMakeFile.txt WHY!?
CMAKE_ARGS+= -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} \
-DPYTHONPREFIX_SITELIBDIR:STRING=${PYTHONPREFIX_SITELIBDIR}
-DPython_VERSION:STRING=${PYTHON_VER} \
-DPYTHONPREFIX_SITELIBDIR:STRING=${PYTHONPREFIX_SITELIBDIR} \
-DINSTALL_SERVICE:BOOL=OFF
NO_ARCH= yes
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1645699385
SHA256 (Ultimaker/Ultimaker-libCharon-4.13.0_GH0.tar.gz) = efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec
SIZE (Ultimaker/Ultimaker-libCharon-4.13.0_GH0.tar.gz) = 151775
TIMESTAMP = 1713945967
SHA256 (Ultimaker/Ultimaker-libCharon-5.0.0_GH0.tar.gz) = 7b58b921c6fd78329badc83de4b9987c058d048b6a450313be23756415372fbf
SIZE (Ultimaker/Ultimaker-libCharon-5.0.0_GH0.tar.gz) = 151686

View File

@ -1,30 +0,0 @@
--- CMakeLists.txt.orig 2020-04-16 10:34:42 UTC
+++ CMakeLists.txt
@@ -15,13 +15,27 @@ else()
find_package(Python3 3.4 REQUIRED COMPONENTS Interpreter)
endif()
+if (NOT PYTHON_EXECUTABLE STREQUAL "" )
+ set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
+ message("Using given PYTHON_EXECUTABLE")
+endif()
+if (NOT PYTHONPREFIX_SITELIBDIR STREQUAL "")
+ set(PYTHONPREFIX_SITELIBDIR ${PYTHONPREFIX_SITELIBDIR})
+ message("Using given PYTHONPREFIX_SITELIBDIR")
+endif()
+
option(INSTALL_SERVICE "Install the Charon DBus-service" ON)
option(INSTALL_CLIENT "Install the Charon Client library" ON)
+if ( NOT PYTHONPREFIX_SITELIBDIR STREQUAL "")
+ message("Using given PYTHONPREFIX_SITELIBDIR for CHARON_INSTALL_PATH")
+ set(CHARON_INSTALL_PATH ${PYTHONPREFIX_SITELIBDIR})
+else()
if(EXISTS /etc/debian_version)
set(CHARON_INSTALL_PATH lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages)
else()
set(CHARON_INSTALL_PATH lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages)
+endif()
endif()
set(_excludes PATTERN __pycache__ EXCLUDE)

View File

@ -19,5 +19,3 @@
%%PYTHON_SITELIBDIR%%/Charon/filetypes/OpenPackagingConvention.py
%%PYTHON_SITELIBDIR%%/Charon/filetypes/UltimakerFormatPackage.py
%%PYTHON_SITELIBDIR%%/Charon/filetypes/__init__.py
@comment lib/systemd/system/charon.service
share/dbus-1/system.d/nl.ultimaker.charon.conf