CVS commit: pkgsrc/cad/solvespace

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Feb 15 09:38:47 UTC 2025

Modified Files:
        pkgsrc/cad/solvespace: Makefile PLIST distinfo
        pkgsrc/cad/solvespace/patches: patch-CMakeLists.txt

Log Message:
(cad/solvespace) Updated 3.0 to 3.1

(You may see RC1, bellow, but code is Release 3.1)
Changelog
=========

3.1  - Release Candidate 1
---

Constraints:

* Arcs length ratio and difference.
* Arc & Line length ratio and difference.
* Allow comments to be associated with point entities.

Sketching:

* Support for pan, zoom and rotate trackpad gestures on macOS
* Add "exploded view" to sketches via "\\" key. Shows sketch elements separated
  by a configurable distance perpendicular to the sketch plane.
* Added Feet-Inches as a unit of measure. Inputs are still in inches.
  But the display shows feet, inches, and fraction of an inch.
* Added an optional "pitch" parameter to helix extrusions (in the text window)
* Allow use of Point & Normal to define "sketch-in-new-workplane".
* Update "Property Browser" live while dragging the sketch.

MISC:

* Add a link to the GitHub commit from which SolveSpace was built in the Help
  menu.
* Make all points, vectors and normals shown in the Property Browser into
  active links. This makes them explorable and selectable.
* Load 16bit PNG images correctly by re-scaling to 8bit.
* Fixed hang when trying to display characters missing from the embedded font.
* The main window vertical size can be as small as the toolbar.
* Configurable "SafeHeight" parameter instead of the fixed 5mm for G-code export.
* Add Spanish / Argentina translation.
* Move "perspective factor", "lighting direction" and "explode distance" from
  the "configuration" screen to the "view" screen.
* Add a "∆" suffix to groups which have "force to triangle mesh" ticked
* Gray the group name in the text window for groups with suppressed solid model.
* Added the ability to Link STL files.
* When linking circuit boards (IDF .emn files) show keepout regions as construction entities.

Performance:

* Speed up sketches with many constraints by roughly 8x by using the Eigen
  library in the solver. The maximum unknowns increased from 1024 to 2048.
* Add a "suppress dof calculation" setting to groups - increases performance for
  complex sketches.
* More changes to the ID list implementation.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/cad/solvespace/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/solvespace/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cad/solvespace/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/solvespace/Makefile
diff -u pkgsrc/cad/solvespace/Makefile:1.36 pkgsrc/cad/solvespace/Makefile:1.37
--- pkgsrc/cad/solvespace/Makefile:1.36 Fri Dec 27 08:19:26 2024
+++ pkgsrc/cad/solvespace/Makefile      Sat Feb 15 09:38:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/12/27 08:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2025/02/15 09:38:47 mef Exp $
 #
 #
 # Both of these hashes need to be updated when the solvespace version
@@ -9,11 +9,12 @@
 # Solvespace has a private fork of libdxfrw which is stored in github
 # as a submodule, which is not included in the v2.3 archive.
 #
+# [2020-06-06 18:32:46 +0200]
 LIBDXF_HASH=           0b7b7b709d9299565db603f878214656ef5e9ddf
-SOLVESPACE_HASH=       0e0b0252e23dd5bd4ae82ababcc54c44aee036d6
+# [2022-05-13 17:06:20 -0500] (tag: v3.1)
+SOLVESPACE_HASH=       70bde63cb32a7f049fa56cbdf924e2695fcb2916
 
-DISTNAME=              solvespace-3.0
-PKGREVISION=           18
+DISTNAME=              solvespace-3.1
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=solvespace/solvespace/archive/}
 DIST_SUBDIR=           ${PKGNAME_NOREV}
@@ -33,7 +34,6 @@ EXTRACT_DIR.${LIBDXF_HASH}.tar.gz= \
 
 USE_TOOLS+=            pkg-config
 USE_LANGUAGES=         c c++
-USE_CMAKE=             yes
 
 CMAKE_CONFIGURE_ARGS+=         -DGIT_COMMIT_HASH=${SOLVESPACE_HASH}
 
@@ -49,6 +49,7 @@ CMAKE_ARG_PATH=               ..
 pre-configure:
        cd ${WRKSRC} && ${MKDIR} ${CONFIGURE_DIRS}
 
+.include "../../devel/cmake/build.mk"
 .include "../../devel/mimalloc/buildlink3.mk"
 .include "../../devel/pangomm/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -59,6 +60,7 @@ pre-configure:
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/json-c/buildlink3.mk"
 .include "../../x11/gtkmm3/buildlink3.mk"

Index: pkgsrc/cad/solvespace/PLIST
diff -u pkgsrc/cad/solvespace/PLIST:1.2 pkgsrc/cad/solvespace/PLIST:1.3
--- pkgsrc/cad/solvespace/PLIST:1.2     Mon May 23 19:02:59 2022
+++ pkgsrc/cad/solvespace/PLIST Sat Feb 15 09:38:47 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/05/23 19:02:59 plunky Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/02/15 09:38:47 mef Exp $
 bin/solvespace
 bin/solvespace-cli
 include/slvs.h
@@ -7,20 +7,17 @@ lib/libslvs.so.1
 lib/libslvs.so.${PKGVERSION}
 share/applications/solvespace.desktop
 share/icons/hicolor/16x16/apps/solvespace.png
-share/icons/hicolor/16x16/mimetypes/application.x-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/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/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/48x48/mimetypes/application-x-solvespace.png
 share/icons/hicolor/scalable/apps/solvespace.svg
-share/icons/hicolor/scalable/mimetypes/application.x-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/pixmaps/solvespace-16x16.xpm
-share/pixmaps/solvespace-24x24.xpm
-share/pixmaps/solvespace-32x32.xpm
-share/pixmaps/solvespace-48x48.xpm
 share/solvespace/banner.txt
 share/solvespace/fonts/BitstreamVeraSans-Roman-builtin.ttf
 share/solvespace/fonts/private/0-check-false.png
@@ -84,6 +81,7 @@ share/solvespace/icons/text-window/workp
 share/solvespace/locales.txt
 share/solvespace/locales/de_DE.po
 share/solvespace/locales/en_US.po
+share/solvespace/locales/es_AR.po
 share/solvespace/locales/fr_FR.po
 share/solvespace/locales/ru_RU.po
 share/solvespace/locales/tr_TR.po

Index: pkgsrc/cad/solvespace/distinfo
diff -u pkgsrc/cad/solvespace/distinfo:1.4 pkgsrc/cad/solvespace/distinfo:1.5
--- pkgsrc/cad/solvespace/distinfo:1.4  Mon May 23 19:02:59 2022
+++ pkgsrc/cad/solvespace/distinfo      Sat Feb 15 09:38:47 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2022/05/23 19:02:59 plunky Exp $
+$NetBSD: distinfo,v 1.5 2025/02/15 09:38:47 mef Exp $
 
-BLAKE2s (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 868d7f5b2086dac96d8d3d7e81b5c8f4dd825fa79dbec16c24e092f842d07aed
-SHA512 (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 
9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
-Size (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 691804 bytes
-BLAKE2s (solvespace-3.0/v3.0.tar.gz) = 113a7b47f4492fc436f4459222791e9e5d50edfc886c07fcde2a24e65bd7f9b8
-SHA512 (solvespace-3.0/v3.0.tar.gz) = b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
-Size (solvespace-3.0/v3.0.tar.gz) = 2734860 bytes
-SHA1 (patch-CMakeLists.txt) = c5fa324ea481850b5ce8933e976d80e04ddcdf80
+BLAKE2s (solvespace-3.1/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 868d7f5b2086dac96d8d3d7e81b5c8f4dd825fa79dbec16c24e092f842d07aed
+SHA512 (solvespace-3.1/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 
9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
+Size (solvespace-3.1/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 691804 bytes
+BLAKE2s (solvespace-3.1/v3.1.tar.gz) = 9fc1c5f6a6ff216300bfc9baf71cd109422425116c71d0a70050f60fb7144e76
+SHA512 (solvespace-3.1/v3.1.tar.gz) = 76794c4b103036f423471c72209521c273b40edcf9a725d2407e757b8dded033863f58640f1bcdf19d7dd1b296334f8745a632875e06604fa4d5b261dd23ba98
+Size (solvespace-3.1/v3.1.tar.gz) = 2764243 bytes
+SHA1 (patch-CMakeLists.txt) = 03d3f4d7bc40755b8855688f5bcd666d93785189

Index: pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt
diff -u pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt:1.2 pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt:1.2      Mon May 23 19:02:59 2022
+++ pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt  Sat Feb 15 09:38:47 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2022/05/23 19:02:59 plunky Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/02/15 09:38:47 mef Exp $
 
 disable finding the commit hash: we provide it in the Makefile
 
 use pkgsrc mimalloc directly
 
---- CMakeLists.txt.orig        2021-04-18 09:48:36.000000000 +0000
-+++ CMakeLists.txt
-@@ -30,7 +30,6 @@ endif()
+--- CMakeLists.txt.orig        2022-05-18 12:09:48.000000000 +0900
++++ CMakeLists.txt     2025-02-15 17:37:23.398344272 +0900
+@@ -34,7 +34,6 @@ endif()
  # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
  # can come from a variety of sources. If you are mirroring the sources or otherwise build when
  # the .git directory is not present, please comment the following line:
@@ -14,7 +14,7 @@ use pkgsrc mimalloc directly
  # and instead uncomment the following, adding the complete git hash of the checkout you are using:
  # set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
  
-@@ -173,13 +172,6 @@ endif()
+@@ -185,14 +184,6 @@ endif()
  message(STATUS "Using in-tree libdxfrw")
  add_subdirectory(extlib/libdxfrw)
  
@@ -25,10 +25,11 @@ use pkgsrc mimalloc directly
 -set(MI_BUILD_TESTS OFF CACHE BOOL "")
 -add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL)
 -set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
- 
- if(WIN32 OR APPLE)
-     # On Win32 and macOS we use vendored packages, since there is little to no benefit
-@@ -242,6 +234,7 @@ else()
+-
+ if(NOT FORCE_VENDORED_Eigen3)
+     find_package(Eigen3 CONFIG)
+ endif()
+@@ -269,6 +260,7 @@ else()
      find_package(ZLIB REQUIRED)
      find_package(PNG REQUIRED)
      find_package(Freetype REQUIRED)