Mon May 23 19:02:59 2022 UTC ()
update solvespace to 3.0, with changes since 2016

New sketch features:

    New intersection boolean operation for solid models.
    New groups, revolution and helical extrusion.
    Extrude, lathe, translate and rotate groups can use the "assembly"
      boolean operation, to increase performance.
    The solid model of extrude and lathe groups can be suppressed, for
      splitting a single model in multiple parts to export, or if only
      the generated entities are desired, without the mesh.
    Translate and rotate groups can create n-dimensional arrays using
      the "difference" and "assembly" boolean operations.
    A new sketch in workplane group can be created based on existing workplane.
    TTF text request has two additional points on the right side, which
      allow constraining the width of text.
    Image requests can now be created, similar to TTF text requests. This
      replaces the "style → background image" feature.
    Irrelevant points (e.g. arc center point) are not counted when estimating
      the bounding box used to compute chord tolerance.
    When adding a constraint which has a label and is redundant with another
      constraint, the constraint is added as a reference, avoiding an error.
    Datum points can be copied and pasted.
    "Split Curves at Intersection" can now split curves at point lying on
      curve, not just at intersection of two curves.
    Property browser now shows amount of degrees of freedom in group list. It
      also shows a yellow "err" if the sketch has problems (e.g. self
      intersecting) that would propagate in subsequent groups.
    It is now possible to press "g" to toggle construction on new objects
      while they are still being drawn.
    Allow right click to end sketching of all entities.

New constraint features:

    When dragging an arc or rectangle point, it will be automatically
      constrained to other points with a click.
    When selecting a constraint, the requests it constraints can be
      selected in the text window.
    When selecting an entity, the constraints applied to it can be
      selected in the text window.
    Distance constraint labels can now be formatted to use SI prefixes.
      Values are edited in the configured unit regardless of label format.
    When creating a constraint, if an exactly identical constraint already
      exists, it is now selected instead of adding a redundant constraint.
    It is now possible to turn off automatic creation of horizontal/vertical
      constraints on line segments.
    Automatic creation of constraints no longer happens if the constraint
      would have been redundant with other ones.
    New option to open the constraint editor for newly created constraints
      with a value.
    New "redundant constraint timeout (in ms)" option to prevent UI freeze
      when looking for redundant constraints.
    Swap vertical and horizontal constraints when pasting rotated by 90/270
      degrees.

New export/import features:

    Link IDF circuit boards in an assembly (.emn files)
    Three.js: allow configuring projection for exported model, and initially
      use the current viewport projection.
    Wavefront OBJ: a material file is exported alongside the model, containing
      mesh color information.
    DXF/DWG: 3D DXF files are imported as construction entities, in 3d.
    VRML (WRL) triangle meshes can now be exported, useful for e.g. KiCAD.
    Export 2d section: custom styled entities that lie in the same plane as
      the exported section are included.
    Added ExportBackgroundColor in configuration for EPS, PDF, and SVG files.
    STEP export includes object colors and transparency.
    Default "line styles" have a new "export these objects" option.

New rendering features:

    The "Show/hide hidden lines" button is now a tri-state button that
      allows showing all lines (on top of shaded mesh), stippling occluded
      lines or not drawing them at all.
    The "Show/hide outlines" button is now independent from "Show/hide edges".
    "View | Darken Inactive Solids" added. When turned off and a "sketch in
      plane" group is active solids form previous groups will not be "darkened"
      (have the s000d-#def-dim-solid style applied to them).

New measurement/analysis features:

    New choice for base unit, meters.
    New command for measuring total length of selected entities,
      "Analyze → Measure Perimeter".
    New command for measuring center of mass, with live updates as the
      sketch changes, "Analyze → Center of Mass".
    New option for displaying areas of closed contours.
    When calculating volume of the mesh, volume of the solid from the current
      group is now shown alongside total volume of all solids.
    When calculating area, and faces are selected, calculate area of those
      faces instead of the closed contour in the sketch.
    When selecting a point and a line, projected distance to current
      workplane is displayed.

Other new features:

    Improvements to the text window for selected entities and constraints.
    Ambient light source added in text window to allow flat shaded
      renderings.
    New command-line interface, for batch exporting and more.
    The graphical interface now supports HiDPI screens on every OS.
    New option to lock Z axis to be always vertical when rotating the
      view, a.k.a. "turntable navigation".
    New button to hide all construction entities.
    New link to match the on-screen size of the sketch with its actual
      size, "view → set to full scale".
    When zooming to fit, constraints are also considered.
    Ctrl-clicking entities now deselects them, as the inverse of clicking.
    When clicking on an entity that shares a place with other entities,
      the entity from the current group is selected.
    When dragging an entity that shares a place with other entities, the
      entity from a request is selected. For example, dragging a point on
      a face of an extrusion coincident with the source sketch plane will
      drag the point from the source sketch.
    The default font for TTF text is now Bitstream Vera Sans, which is
      included in the resources such that it is available on any OS.
    In expressions, numbers can contain the digit group separator, "_".
    The "=" key is bound to "Zoom In", like "+" key.
    The numpad decimal separator key is bound to "." regardless of locale.
    On Windows, full-screen mode is implemented.
    On Linux, native file chooser dialog can be used.
    New edit menu items "Line Styles", "View Projection" and "Configuration"
      that are shortcuts to the respective configuration screens.
    New cmake build options using -DENABLE_OPENMP=yes and -DENABLE_LTO=yes
      to enable support for multi-threading and link-time optimization.
    "Shift+Scroll" for ten times finer zoom.
    Translations: Chinese, French, German, Russian, Turkish, Ukrainian.

Bugs fixed:

    Fixed broken --view options for command line thumbnail image creation.
    Some errors in Triangulation of surfaces.
    Some NURNS boolean operations that failed particularly on surfaces
      created with Lathe, Revolve, or Helix.
    Segfault in Remove Spline Point context menu.
    A point in 3d constrained to any line whose length is free no longer
      causes the line length to collapse.
    Curve-line constraints (in 3d), parallel constraints (in 3d), and
      same orientation constraints are more robust.
    Adding some constraints (vertical, midpoint, etc) twice errors out
      immediately, instead of later and in a confusing way.
    Constraining a newly placed point to a hovered entity does not cause
      spurious changes in the sketch.
    Points highlighted with "Analyze → Show Degrees of Freedom" are drawn
      on top of all other geometry.
    A step rotate/translate group using a group forced to triangle mesh as
      a source group also gets forced to triangle mesh.
    Paste Transformed with a negative scale does not invert arcs.
    The tangent arc now modifies the original entities instead of deleting
      them, such that their constraints are retained.
    When linking a sketch file, missing custom styles are now imported
      from the linked file.
    3Dconnexion SpaceMouse should now work (on Windows and macOS X).
    Improved NURBS boolean operations on curved surfaces in some cases.
    Show only usable fonts in the font selector.


(plunky)
diff -r1.15 -r1.16 pkgsrc/cad/solvespace/Makefile
diff -r1.1 -r1.2 pkgsrc/cad/solvespace/PLIST
diff -r1.3 -r1.4 pkgsrc/cad/solvespace/distinfo
diff -r1.1 -r1.2 pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt

cvs diff -r1.15 -r1.16 pkgsrc/cad/solvespace/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/solvespace/Makefile 2021/12/08 16:03:25 1.15
+++ pkgsrc/cad/solvespace/Makefile 2022/05/23 19:02:59 1.16
@@ -1,64 +1,64 @@ @@ -1,64 +1,64 @@
1# $NetBSD: Makefile,v 1.15 2021/12/08 16:03:25 adam Exp $ 1# $NetBSD: Makefile,v 1.16 2022/05/23 19:02:59 plunky Exp $
2# 2#
3# 3#
4# Both of these hashes need to be updated when the solvespace version 4# Both of these hashes need to be updated when the solvespace version
5# is bumped. 5# is bumped.
6# 6#
7# The solvespace hash is used to identify the build version 7# The solvespace hash is used to identify the build version
8# 8#
9# Solvespace has a private fork of libdxfrw which is stored in github 9# Solvespace has a private fork of libdxfrw which is stored in github
10# as a submodule, which is not included in the v2.3 archive. 10# as a submodule, which is not included in the v2.3 archive.
11# 11#
12LIBDXF_HASH= 8f958955f54668c142ded760dc951ffd16d9c71b 12LIBDXF_HASH= 0b7b7b709d9299565db603f878214656ef5e9ddf
13SOLVESPACE_HASH= 7c1ca460769fc8cbef26d296338d4bbc6f2ef6d0 13SOLVESPACE_HASH= 0e0b0252e23dd5bd4ae82ababcc54c44aee036d6
14 14
15DISTNAME= solvespace-2.3 15DISTNAME= solvespace-3.0
16PKGREVISION= 12 
17CATEGORIES= cad 16CATEGORIES= cad
18MASTER_SITES= http://github.com/solvespace/solvespace/archive/ 17MASTER_SITES= ${MASTER_SITE_GITHUB:=solvespace/solvespace/archive/}
19DIST_SUBDIR= ${PKGNAME_NOREV} 18DIST_SUBDIR= ${PKGNAME_NOREV}
20DISTFILES= v${PKGVERSION_NOREV}.tar.gz 19DISTFILES= v${PKGVERSION_NOREV}.tar.gz
21DISTFILES+= ${LIBDXF_HASH}.tar.gz 20DISTFILES+= ${LIBDXF_HASH}.tar.gz
22SITES.${LIBDXF_HASH}.tar.gz= \ 21SITES.${LIBDXF_HASH}.tar.gz= \
23 http://github.com/solvespace/libdxfrw/archive/ 22 ${MASTER_SITE_GITHUB:=solvespace/libdxfrw/archive/}
24 23
25MAINTAINER= pkgsrc-users@NetBSD.org 24MAINTAINER= pkgsrc-users@NetBSD.org
26HOMEPAGE= http://www.solvespace.com/ 25HOMEPAGE= https://www.solvespace.com/
27COMMENT= Parametric 2D/3D CAD 26COMMENT= Parametric 2D/3D CAD
28LICENSE= gnu-gpl-v3 27LICENSE= gnu-gpl-v3
29 28
30EXTRACT_USING= bsdtar 29EXTRACT_USING= bsdtar
31EXTRACT_DIR.${LIBDXF_HASH}.tar.gz= \ 30EXTRACT_DIR.${LIBDXF_HASH}.tar.gz= \
32 ${WRKSRC}/extlib 31 ${WRKSRC}/extlib
33 32
34USE_TOOLS+= pkg-config 33USE_TOOLS+= pkg-config
35USE_LANGUAGES= c c++ 34USE_LANGUAGES= c c++
36USE_CMAKE= yes 35USE_CMAKE= yes
37 36
38CMAKE_ARGS+= -DGIT_COMMIT_HASH=${SOLVESPACE_HASH} 37CMAKE_ARGS+= -DGIT_COMMIT_HASH=${SOLVESPACE_HASH}
39 38
40SUBST_CLASSES+= desktop 
41SUBST_STAGE.desktop= pre-configure 
42SUBST_MESSAGE.desktop= Fixing absolute path in desktop file 
43SUBST_FILES.desktop= src/unix/solvespace.desktop 
44SUBST_SED.desktop= -e "s,/usr/bin,${PREFIX}/bin," 
45 
46SUBST_CLASSES+= libdxfrw 39SUBST_CLASSES+= libdxfrw
47SUBST_STAGE.libdxfrw= pre-configure 40SUBST_STAGE.libdxfrw= pre-configure
48SUBST_MESSAGE.libdxfrw= Set libdxfrw directory 41SUBST_MESSAGE.libdxfrw= Set libdxfrw directory
49SUBST_FILES.libdxfrw= CMakeLists.txt 42SUBST_FILES.libdxfrw= CMakeLists.txt
50SUBST_SED.libdxfrw= -e "s,extlib/libdxfrw,extlib/libdxfrw-${LIBDXF_HASH}," 43SUBST_SED.libdxfrw= -e "s,extlib/libdxfrw,extlib/libdxfrw-${LIBDXF_HASH},"
51 44
 45CONFIGURE_DIRS= build
 46CMAKE_ARG_PATH= ..
 47
 48pre-configure:
 49 cd ${WRKSRC} && ${MKDIR} ${CONFIGURE_DIRS}
 50
 51.include "../../devel/mimalloc/buildlink3.mk"
52.include "../../devel/pangomm/buildlink3.mk" 52.include "../../devel/pangomm/buildlink3.mk"
53.include "../../devel/zlib/buildlink3.mk" 53.include "../../devel/zlib/buildlink3.mk"
54.include "../../fonts/fontconfig/buildlink3.mk" 54.include "../../fonts/fontconfig/buildlink3.mk"
55.include "../../graphics/cairo/buildlink3.mk" 55.include "../../graphics/cairo/buildlink3.mk"
56.include "../../graphics/freetype2/buildlink3.mk" 56.include "../../graphics/freetype2/buildlink3.mk"
57.include "../../graphics/glew/buildlink3.mk" 57.include "../../graphics/glew/buildlink3.mk"
58.include "../../graphics/glu/buildlink3.mk" 58.include "../../graphics/glu/buildlink3.mk"
59.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 59.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
60.include "../../graphics/png/buildlink3.mk" 60.include "../../graphics/png/buildlink3.mk"
61.include "../../sysutils/desktop-file-utils/desktopdb.mk" 61.include "../../sysutils/desktop-file-utils/desktopdb.mk"
62.include "../../textproc/json-c/buildlink3.mk" 62.include "../../textproc/json-c/buildlink3.mk"
63.include "../../x11/gtkmm/buildlink3.mk" 63.include "../../x11/gtkmm3/buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/cad/solvespace/PLIST (expand / switch to unified diff)

--- pkgsrc/cad/solvespace/PLIST 2017/02/21 20:36:39 1.1
+++ pkgsrc/cad/solvespace/PLIST 2022/05/23 19:02:59 1.2
@@ -1,19 +1,108 @@ @@ -1,19 +1,108 @@
1@comment $NetBSD: PLIST,v 1.1 2017/02/21 20:36:39 plunky Exp $ 1@comment $NetBSD: PLIST,v 1.2 2022/05/23 19:02:59 plunky Exp $
2bin/solvespace 2bin/solvespace
 3bin/solvespace-cli
3include/slvs.h 4include/slvs.h
4lib/libslvs.so 5lib/libslvs.so
5lib/libslvs.so.1 6lib/libslvs.so.1
6lib/libslvs.so.${PKGVERSION} 7lib/libslvs.so.${PKGVERSION}
7share/applications/solvespace.desktop 8share/applications/solvespace.desktop
8share/icons/hicolor/16x16/apps/solvespace.png 9share/icons/hicolor/16x16/apps/solvespace.png
9share/icons/hicolor/16x16/mimetypes/application.x-solvespace.png 10share/icons/hicolor/16x16/mimetypes/application.x-solvespace.png
10share/icons/hicolor/24x24/apps/solvespace.png 11share/icons/hicolor/24x24/apps/solvespace.png
11share/icons/hicolor/24x24/mimetypes/application.x-solvespace.png 12share/icons/hicolor/24x24/mimetypes/application.x-solvespace.png
12share/icons/hicolor/32x32/apps/solvespace.png 13share/icons/hicolor/32x32/apps/solvespace.png
13share/icons/hicolor/32x32/mimetypes/application.x-solvespace.png 14share/icons/hicolor/32x32/mimetypes/application.x-solvespace.png
14share/icons/hicolor/48x48/apps/solvespace.png 15share/icons/hicolor/48x48/apps/solvespace.png
15share/icons/hicolor/48x48/mimetypes/application.x-solvespace.png 16share/icons/hicolor/48x48/mimetypes/application.x-solvespace.png
 17share/icons/hicolor/scalable/apps/solvespace.svg
 18share/icons/hicolor/scalable/mimetypes/application.x-solvespace.svg
 19share/mime/packages/solvespace-slvs.xml
16share/pixmaps/solvespace-16x16.xpm 20share/pixmaps/solvespace-16x16.xpm
17share/pixmaps/solvespace-24x24.xpm 21share/pixmaps/solvespace-24x24.xpm
18share/pixmaps/solvespace-32x32.xpm 22share/pixmaps/solvespace-32x32.xpm
19share/pixmaps/solvespace-48x48.xpm 23share/pixmaps/solvespace-48x48.xpm
 24share/solvespace/banner.txt
 25share/solvespace/fonts/BitstreamVeraSans-Roman-builtin.ttf
 26share/solvespace/fonts/private/0-check-false.png
 27share/solvespace/fonts/private/1-check-true.png
 28share/solvespace/fonts/private/2-radio-false.png
 29share/solvespace/fonts/private/3-radio-true.png
 30share/solvespace/fonts/private/4-stipple-dot.png
 31share/solvespace/fonts/private/5-stipple-dash-long.png
 32share/solvespace/fonts/private/6-stipple-dash.png
 33share/solvespace/fonts/private/7-stipple-zigzag.png
 34share/solvespace/fonts/unicode.lff.gz
 35share/solvespace/fonts/unifont.hex.gz
 36share/solvespace/freedesktop/solvespace-48x48.png
 37share/solvespace/icons/graphics-window/angle.png
 38share/solvespace/icons/graphics-window/arc.png
 39share/solvespace/icons/graphics-window/assemble.png
 40share/solvespace/icons/graphics-window/bezier.png
 41share/solvespace/icons/graphics-window/circle.png
 42share/solvespace/icons/graphics-window/construction.png
 43share/solvespace/icons/graphics-window/equal.png
 44share/solvespace/icons/graphics-window/extrude.png
 45share/solvespace/icons/graphics-window/helix.png
 46share/solvespace/icons/graphics-window/horiz.png
 47share/solvespace/icons/graphics-window/image.png
 48share/solvespace/icons/graphics-window/in3d.png
 49share/solvespace/icons/graphics-window/lathe.png
 50share/solvespace/icons/graphics-window/length.png
 51share/solvespace/icons/graphics-window/line.png
 52share/solvespace/icons/graphics-window/ontoworkplane.png
 53share/solvespace/icons/graphics-window/other-supp.png
 54share/solvespace/icons/graphics-window/parallel.png
 55share/solvespace/icons/graphics-window/perpendicular.png
 56share/solvespace/icons/graphics-window/point.png
 57share/solvespace/icons/graphics-window/pointonx.png
 58share/solvespace/icons/graphics-window/rectangle.png
 59share/solvespace/icons/graphics-window/ref.png
 60share/solvespace/icons/graphics-window/revolve.png
 61share/solvespace/icons/graphics-window/same-orientation.png
 62share/solvespace/icons/graphics-window/sketch-in-3d.png
 63share/solvespace/icons/graphics-window/sketch-in-plane.png
 64share/solvespace/icons/graphics-window/step-rotate.png
 65share/solvespace/icons/graphics-window/step-translate.png
 66share/solvespace/icons/graphics-window/symmetric.png
 67share/solvespace/icons/graphics-window/tangent-arc.png
 68share/solvespace/icons/graphics-window/text.png
 69share/solvespace/icons/graphics-window/trim.png
 70share/solvespace/icons/graphics-window/vert.png
 71share/solvespace/icons/text-window/constraint.png
 72share/solvespace/icons/text-window/construction.png
 73share/solvespace/icons/text-window/edges.png
 74share/solvespace/icons/text-window/faces.png
 75share/solvespace/icons/text-window/mesh.png
 76share/solvespace/icons/text-window/normal.png
 77share/solvespace/icons/text-window/occluded-invisible.png
 78share/solvespace/icons/text-window/occluded-stippled.png
 79share/solvespace/icons/text-window/occluded-visible.png
 80share/solvespace/icons/text-window/outlines.png
 81share/solvespace/icons/text-window/point.png
 82share/solvespace/icons/text-window/shaded.png
 83share/solvespace/icons/text-window/workplane.png
 84share/solvespace/locales.txt
 85share/solvespace/locales/de_DE.po
 86share/solvespace/locales/en_US.po
 87share/solvespace/locales/fr_FR.po
 88share/solvespace/locales/ru_RU.po
 89share/solvespace/locales/tr_TR.po
 90share/solvespace/locales/uk_UA.po
 91share/solvespace/locales/zh_CN.po
 92share/solvespace/shaders/edge.frag
 93share/solvespace/shaders/edge.vert
 94share/solvespace/shaders/imesh.frag
 95share/solvespace/shaders/imesh.vert
 96share/solvespace/shaders/imesh_point.frag
 97share/solvespace/shaders/imesh_point.vert
 98share/solvespace/shaders/imesh_tex.frag
 99share/solvespace/shaders/imesh_tex.vert
 100share/solvespace/shaders/imesh_texa.frag
 101share/solvespace/shaders/mesh.frag
 102share/solvespace/shaders/mesh.vert
 103share/solvespace/shaders/mesh_fill.frag
 104share/solvespace/shaders/mesh_fill.vert
 105share/solvespace/shaders/outline.vert
 106share/solvespace/threejs/SolveSpaceControls.js
 107share/solvespace/threejs/hammer-2.0.8.js.gz
 108share/solvespace/threejs/three-r111.min.js.gz

cvs diff -r1.3 -r1.4 pkgsrc/cad/solvespace/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/solvespace/distinfo 2021/10/26 10:04:16 1.3
+++ pkgsrc/cad/solvespace/distinfo 2022/05/23 19:02:59 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.3 2021/10/26 10:04:16 nia Exp $ 1$NetBSD: distinfo,v 1.4 2022/05/23 19:02:59 plunky Exp $
2 2
3BLAKE2s (solvespace-2.3/8f958955f54668c142ded760dc951ffd16d9c71b.tar.gz) = eae48ae5b7b8726f52a4ad72aa10647e0b83d0b4206ce36376a2521f0617bfcb 3BLAKE2s (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 868d7f5b2086dac96d8d3d7e81b5c8f4dd825fa79dbec16c24e092f842d07aed
4SHA512 (solvespace-2.3/8f958955f54668c142ded760dc951ffd16d9c71b.tar.gz) = 40f27cf32c1a2be1f654d82406c2f7d765cf350d3ceb134e3e1a82b17443f7a12dfda1102fe8438b70f13982af675f97fb1a62ad892acb3ed3d2e19b89a7c013 4SHA512 (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
5Size (solvespace-2.3/8f958955f54668c142ded760dc951ffd16d9c71b.tar.gz) = 691686 bytes 5Size (solvespace-3.0/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz) = 691804 bytes
6BLAKE2s (solvespace-2.3/v2.3.tar.gz) = cbe152ac56baecc001f755a3858780ed8bc9e05ba393f9716c9428d66248ed03 6BLAKE2s (solvespace-3.0/v3.0.tar.gz) = 113a7b47f4492fc436f4459222791e9e5d50edfc886c07fcde2a24e65bd7f9b8
7SHA512 (solvespace-2.3/v2.3.tar.gz) = 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56 7SHA512 (solvespace-3.0/v3.0.tar.gz) = b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
8Size (solvespace-2.3/v2.3.tar.gz) = 2115940 bytes 8Size (solvespace-3.0/v3.0.tar.gz) = 2734860 bytes
9SHA1 (patch-CMakeLists.txt) = c3716d2317b606e7e4367cef4b781f3ab2854c4f 9SHA1 (patch-CMakeLists.txt) = c5fa324ea481850b5ce8933e976d80e04ddcdf80

cvs diff -r1.1 -r1.2 pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt 2017/02/21 20:36:39 1.1
+++ pkgsrc/cad/solvespace/patches/patch-CMakeLists.txt 2022/05/23 19:02:59 1.2
@@ -1,15 +1,38 @@ @@ -1,15 +1,38 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2017/02/21 20:36:39 plunky Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2022/05/23 19:02:59 plunky Exp $
2 2
3disable finding the commit hash: we provide it in the Makefile 3disable finding the commit hash: we provide it in the Makefile
4 4
5--- CMakeLists.txt.orig 2016-12-24 02:09:48.000000000 +0000 5use pkgsrc mimalloc directly
 6
 7--- CMakeLists.txt.orig 2021-04-18 09:48:36.000000000 +0000
6+++ CMakeLists.txt 8+++ CMakeLists.txt
7@@ -20,7 +20,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX 9@@ -30,7 +30,6 @@ endif()
8 # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds 10 # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
9 # can come from a variety of sources. If you are mirroring the sources or otherwise build when 11 # can come from a variety of sources. If you are mirroring the sources or otherwise build when
10 # the .git directory is not present, please comment the following line: 12 # the .git directory is not present, please comment the following line:
11-include(GetGitCommitHash) 13-include(GetGitCommitHash)
12+# include(GetGitCommitHash) 
13 # and instead uncomment the following, adding the complete git hash of the checkout you are using: 14 # and instead uncomment the following, adding the complete git hash of the checkout you are using:
14 # set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000) 15 # set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
15  16
 17@@ -173,13 +172,6 @@ endif()
 18 message(STATUS "Using in-tree libdxfrw")
 19 add_subdirectory(extlib/libdxfrw)
 20
 21-message(STATUS "Using in-tree mimalloc")
 22-set(MI_OVERRIDE OFF CACHE BOOL "")
 23-set(MI_BUILD_SHARED OFF CACHE BOOL "")
 24-set(MI_BUILD_OBJECT OFF CACHE BOOL "")
 25-set(MI_BUILD_TESTS OFF CACHE BOOL "")
 26-add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL)
 27-set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
 28
 29 if(WIN32 OR APPLE)
 30 # On Win32 and macOS we use vendored packages, since there is little to no benefit
 31@@ -242,6 +234,7 @@ else()
 32 find_package(ZLIB REQUIRED)
 33 find_package(PNG REQUIRED)
 34 find_package(Freetype REQUIRED)
 35+ find_package(mimalloc REQUIRED)
 36 pkg_check_modules(CAIRO REQUIRED cairo)
 37 endif()
 38