diff --git a/cad/solvespace/Makefile b/cad/solvespace/Makefile index cafc3789ead9..f4b95add7179 100644 --- a/cad/solvespace/Makefile +++ b/cad/solvespace/Makefile @@ -1,37 +1,33 @@ PORTNAME= solvespace -PORTVERSION= 3.1 +PORTVERSION= 3.2 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= cad -PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ -PATCHFILES= 6b9e7b2e.patch:-p1 - MAINTAINER= lbartoletti@FreeBSD.org COMMENT= Parametric 2d/3d CAD WWW= https://solvespace.com/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libpng.so:graphics/png \ libjson-c.so:devel/json-c \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= cmake compiler:c++11-lang eigen:3 gl gnome pkgconfig xorg USE_GL= gl glu glew USE_GNOME= gtkmm30 pangomm USE_XORG= x11 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= microsoft:mimalloc GH_PROJECT= libdxfrw:libdxfrw mimalloc:mimalloc -GH_TAGNAME= 0b7b7b7:libdxfrw 38a0322:mimalloc +GH_TAGNAME= 8359399:libdxfrw f81bf1b:mimalloc GH_SUBDIR= extlib/libdxfrw:libdxfrw extlib/mimalloc:mimalloc post-patch: ${REINPLACE_CMD} -e '/-stdlib=libc++/d' ${WRKSRC}/CMakeLists.txt .include diff --git a/cad/solvespace/distinfo b/cad/solvespace/distinfo index de6a1ce42b33..c006d99012fe 100644 --- a/cad/solvespace/distinfo +++ b/cad/solvespace/distinfo @@ -1,9 +1,7 @@ -TIMESTAMP = 1666849226 -SHA256 (solvespace-solvespace-v3.1_GH0.tar.gz) = ab4b3a5fecb1800f8eab82a92138a70227e869d2066ee881441b1e13035786dc -SIZE (solvespace-solvespace-v3.1_GH0.tar.gz) = 2764243 -SHA256 (microsoft-mimalloc-38a0322_GH0.tar.gz) = 6c55dd5a42e1fd49ec8c765163731f68072b7311a2ee021499bba3f9c92bf78d -SIZE (microsoft-mimalloc-38a0322_GH0.tar.gz) = 908347 -SHA256 (solvespace-libdxfrw-0b7b7b7_GH0.tar.gz) = 4a7e6fc588b9c9846a24452677873a5ea5a91c4ef663d089169376bb88dc2b61 -SIZE (solvespace-libdxfrw-0b7b7b7_GH0.tar.gz) = 691514 -SHA256 (6b9e7b2e.patch) = 8372afe552f834aa1f080c629503e4cb288077928b3c98d2e73a3f4da14ced52 -SIZE (6b9e7b2e.patch) = 4129 +TIMESTAMP = 1778104753 +SHA256 (solvespace-solvespace-v3.2_GH0.tar.gz) = c226ef1135dcdc7a570c9fd735783e5e407350e3fed59e27dbadbabed2e711eb +SIZE (solvespace-solvespace-v3.2_GH0.tar.gz) = 3492189 +SHA256 (microsoft-mimalloc-f81bf1b_GH0.tar.gz) = 7d737d9c4d8d1886911a1f748338ff59585636402d635d59bc4e85c9788c5c97 +SIZE (microsoft-mimalloc-f81bf1b_GH0.tar.gz) = 1292289 +SHA256 (solvespace-libdxfrw-8359399_GH0.tar.gz) = 0b6876a058bbf304c5ce609124ba4e355b58f15c90afd0a80bcfdb5ceff5f581 +SIZE (solvespace-libdxfrw-8359399_GH0.tar.gz) = 697969 diff --git a/cad/solvespace/files/patch-src_CMakeLists.txt b/cad/solvespace/files/patch-src_CMakeLists.txt deleted file mode 100644 index ed0643e9924e..000000000000 --- a/cad/solvespace/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -Fix build with CMake >= 3.28.0. FREETYPE_LIBRARY has not officially been -part of the user-facing interface of the FindFreetype module since CMake -2.6.0 [1] and has only been coincidentally defined up until this point. - -[1] https://gitlab.kitware.com/cmake/cmake/-/commit/d18fb61c76c720ec5b1ac2cc4f30a5beaf071c33 - ---- src/CMakeLists.txt.orig 2023-12-26 21:03:32 UTC -+++ src/CMakeLists.txt -@@ -33,7 +33,7 @@ target_link_libraries(slvs_deps INTERFACE - dxfrw - ${ZLIB_LIBRARY} - ${PNG_LIBRARY} -- ${FREETYPE_LIBRARY} -+ ${FREETYPE_LIBRARIES} - ${CAIRO_LIBRARIES} - mimalloc-static) - diff --git a/cad/solvespace/pkg-plist b/cad/solvespace/pkg-plist index 549eeb769086..3cf367ee8423 100644 --- a/cad/solvespace/pkg-plist +++ b/cad/solvespace/pkg-plist @@ -1,105 +1,110 @@ bin/solvespace bin/solvespace-cli include/slvs.h lib/libslvs.so lib/libslvs.so.1 -lib/libslvs.so.3.1 +lib/libslvs.so.3.2 share/applications/solvespace.desktop share/icons/hicolor/16x16/apps/solvespace.png share/icons/hicolor/16x16/mimetypes/application-x-solvespace.png share/icons/hicolor/24x24/apps/solvespace.png share/icons/hicolor/24x24/mimetypes/application-x-solvespace.png share/icons/hicolor/32x32/apps/solvespace.png share/icons/hicolor/32x32/mimetypes/application-x-solvespace.png share/icons/hicolor/48x48/apps/solvespace.png share/icons/hicolor/48x48/mimetypes/application-x-solvespace.png share/icons/hicolor/scalable/apps/solvespace.svg share/icons/hicolor/scalable/mimetypes/application-x-solvespace.svg share/metainfo/com.solvespace.SolveSpace.metainfo.xml share/mime/packages/solvespace-slvs.xml +share/thumbnailers/solvespace.thumbnailer %%DATADIR%%/banner.txt %%DATADIR%%/fonts/BitstreamVeraSans-Roman-builtin.ttf %%DATADIR%%/fonts/private/0-check-false.png %%DATADIR%%/fonts/private/1-check-true.png %%DATADIR%%/fonts/private/2-radio-false.png %%DATADIR%%/fonts/private/3-radio-true.png %%DATADIR%%/fonts/private/4-stipple-dot.png %%DATADIR%%/fonts/private/5-stipple-dash-long.png %%DATADIR%%/fonts/private/6-stipple-dash.png %%DATADIR%%/fonts/private/7-stipple-zigzag.png %%DATADIR%%/fonts/unicode.lff.gz %%DATADIR%%/fonts/unifont.hex.gz %%DATADIR%%/freedesktop/solvespace-48x48.png %%DATADIR%%/icons/graphics-window/angle.png %%DATADIR%%/icons/graphics-window/arc.png %%DATADIR%%/icons/graphics-window/assemble.png %%DATADIR%%/icons/graphics-window/bezier.png %%DATADIR%%/icons/graphics-window/circle.png %%DATADIR%%/icons/graphics-window/construction.png %%DATADIR%%/icons/graphics-window/equal.png %%DATADIR%%/icons/graphics-window/extrude.png %%DATADIR%%/icons/graphics-window/helix.png %%DATADIR%%/icons/graphics-window/horiz.png %%DATADIR%%/icons/graphics-window/image.png %%DATADIR%%/icons/graphics-window/in3d.png %%DATADIR%%/icons/graphics-window/lathe.png %%DATADIR%%/icons/graphics-window/length.png %%DATADIR%%/icons/graphics-window/line.png %%DATADIR%%/icons/graphics-window/ontoworkplane.png %%DATADIR%%/icons/graphics-window/other-supp.png %%DATADIR%%/icons/graphics-window/parallel.png %%DATADIR%%/icons/graphics-window/perpendicular.png %%DATADIR%%/icons/graphics-window/point.png %%DATADIR%%/icons/graphics-window/pointonx.png %%DATADIR%%/icons/graphics-window/rectangle.png %%DATADIR%%/icons/graphics-window/ref.png %%DATADIR%%/icons/graphics-window/revolve.png %%DATADIR%%/icons/graphics-window/same-orientation.png %%DATADIR%%/icons/graphics-window/sketch-in-3d.png %%DATADIR%%/icons/graphics-window/sketch-in-plane.png %%DATADIR%%/icons/graphics-window/step-rotate.png %%DATADIR%%/icons/graphics-window/step-translate.png %%DATADIR%%/icons/graphics-window/symmetric.png %%DATADIR%%/icons/graphics-window/tangent-arc.png %%DATADIR%%/icons/graphics-window/text.png %%DATADIR%%/icons/graphics-window/trim.png %%DATADIR%%/icons/graphics-window/vert.png +%%DATADIR%%/icons/text-window/constraint-dimo.png +%%DATADIR%%/icons/text-window/constraint-wo.png %%DATADIR%%/icons/text-window/constraint.png %%DATADIR%%/icons/text-window/construction.png %%DATADIR%%/icons/text-window/edges.png %%DATADIR%%/icons/text-window/faces.png %%DATADIR%%/icons/text-window/mesh.png %%DATADIR%%/icons/text-window/normal.png %%DATADIR%%/icons/text-window/occluded-invisible.png %%DATADIR%%/icons/text-window/occluded-stippled.png %%DATADIR%%/icons/text-window/occluded-visible.png %%DATADIR%%/icons/text-window/outlines.png %%DATADIR%%/icons/text-window/point.png %%DATADIR%%/icons/text-window/shaded.png %%DATADIR%%/icons/text-window/workplane.png %%DATADIR%%/locales.txt +%%DATADIR%%/locales/cs_CZ.po %%DATADIR%%/locales/de_DE.po %%DATADIR%%/locales/en_US.po %%DATADIR%%/locales/es_AR.po %%DATADIR%%/locales/fr_FR.po +%%DATADIR%%/locales/ja_JP.po %%DATADIR%%/locales/ru_RU.po %%DATADIR%%/locales/tr_TR.po %%DATADIR%%/locales/uk_UA.po %%DATADIR%%/locales/zh_CN.po %%DATADIR%%/shaders/edge.frag %%DATADIR%%/shaders/edge.vert %%DATADIR%%/shaders/imesh.frag %%DATADIR%%/shaders/imesh.vert %%DATADIR%%/shaders/imesh_point.frag %%DATADIR%%/shaders/imesh_point.vert %%DATADIR%%/shaders/imesh_tex.frag %%DATADIR%%/shaders/imesh_tex.vert %%DATADIR%%/shaders/imesh_texa.frag %%DATADIR%%/shaders/mesh.frag %%DATADIR%%/shaders/mesh.vert %%DATADIR%%/shaders/mesh_fill.frag %%DATADIR%%/shaders/mesh_fill.vert %%DATADIR%%/shaders/outline.vert %%DATADIR%%/threejs/SolveSpaceControls.js %%DATADIR%%/threejs/hammer-2.0.8.js.gz %%DATADIR%%/threejs/three-r111.min.js.gz