[PR PATCH] solvespace: update to 3.0

[PR PATCH] solvespace: update to 3.0

[rmc0]

[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]

There is a new pull request by rmc0 against master on the void-packages repository

https://github.com/rmc0/void-packages patch-1
https://github.com/void-linux/void-packages/pull/33126

solvespace: update to 3.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-33126.patch --]
[-- Type: text/x-diff, Size: 1196 bytes --]

From 3084e96c320c6fee5dd0db6e300220d8915321cb Mon Sep 17 00:00:00 2001
From: rmc0 <43262918+rmc0@users.noreply.github.com>
Date: Sun, 26 Sep 2021 10:06:07 +0200
Subject: [PATCH] solvespace: update to 3.0

---
 srcpkgs/solvespace/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 377c0e4cbd15..490536adbb3d 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
 # Template file for 'solvespace'
 pkgname=solvespace
-version=2.3
-revision=3
+version=3.0
+revision=
 wrksrc=solvespace
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,6 +10,6 @@ short_desc="Parametric 2d/3d CAD"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://solvespace.com/index.pl"
-distfiles="https://github.com/solvespace/solvespace/releases/download/v${version}/solvespace-source.tar.gz"
-checksum=0be0b2100c0b01eddded2a4dc60455d61cf67816189905af0e73082bfef96000
+distfiles="https://github.com/solvespace/solvespace/archive/refs/tags/v${version}.tar.gz"
+checksum=
 nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265"

Re: solvespace: update to 3.0

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/33126#issuecomment-927263772

Comment:
Fix lint: missing revision number, new version resets revision to 1

Re: solvespace: update to 3.0

[paper42]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33126#issuecomment-927264115

Comment:
@rmc0 If you tested this package update on your computer, could you fill out the PR template? 

Re: [PR PATCH] [Updated] solvespace: update to 3.0

[rmc0]

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

There is an updated pull request by rmc0 against master on the void-packages repository

https://github.com/rmc0/void-packages patch-1
https://github.com/void-linux/void-packages/pull/33126

solvespace: update to 3.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33126.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-33126.patch --]
[-- Type: text/x-diff, Size: 1839 bytes --]

From 3084e96c320c6fee5dd0db6e300220d8915321cb Mon Sep 17 00:00:00 2001
From: rmc0 <43262918+rmc0@users.noreply.github.com>
Date: Sun, 26 Sep 2021 10:06:07 +0200
Subject: [PATCH 1/2] solvespace: update to 3.0

---
 srcpkgs/solvespace/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 377c0e4cbd15..490536adbb3d 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
 # Template file for 'solvespace'
 pkgname=solvespace
-version=2.3
-revision=3
+version=3.0
+revision=
 wrksrc=solvespace
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,6 +10,6 @@ short_desc="Parametric 2d/3d CAD"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://solvespace.com/index.pl"
-distfiles="https://github.com/solvespace/solvespace/releases/download/v${version}/solvespace-source.tar.gz"
-checksum=0be0b2100c0b01eddded2a4dc60455d61cf67816189905af0e73082bfef96000
+distfiles="https://github.com/solvespace/solvespace/archive/refs/tags/v${version}.tar.gz"
+checksum=
 nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265"

From bacdd9e2549070c33ba3122797e47e019b9c9a2b Mon Sep 17 00:00:00 2001
From: rmc0 <43262918+rmc0@users.noreply.github.com>
Date: Sun, 26 Sep 2021 11:28:35 +0200
Subject: [PATCH 2/2] revision to 1

---
 srcpkgs/solvespace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 490536adbb3d..300ca8b05ce5 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
 # Template file for 'solvespace'
 pkgname=solvespace
 version=3.0
-revision=
+revision=1
 wrksrc=solvespace
 build_style=cmake
 hostmakedepends="pkg-config"

Re: solvespace: update to 3.0

[rmc0]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

New comment by rmc0 on void-packages repository

https://github.com/void-linux/void-packages/pull/33126#issuecomment-927269804

Comment:
> @rmc0 If you tested this package update on your computer, could you fill out the PR template?

Sorry, I would just help by starting this PR and not just ask an update

 but it's new for me 

I haven't test or install, I will search more..

Re: solvespace: update to 3.0

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/33126#issuecomment-927297610

Comment:
@rmc0 also add changelog="https://github.com/solvespace/solvespace/blob/master/CHANGELOG.md"
There are some outstanding changes in v.3, so this will a bit bumbier ride then a straight update.

Re: solvespace: update to 3.0

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/33126#issuecomment-927297610

Comment:
@rmc0 also add changelog="https://raw.githubusercontent.com/solvespace/solvespace/master/CHANGELOG.md"
There are some outstanding changes in v.3, so this will a bit bumbier ride then a straight update.

Re: solvespace: update to 3.0

[bobertlo]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New comment by bobertlo on void-packages repository

https://github.com/void-linux/void-packages/pull/33126#issuecomment-997217995

Comment:
#34611 should work

sorry i got a little too busy to update this for a while

Re: solvespace: update to 3.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33126#issuecomment-998442242

Comment:
Done in #34611

Re: [PR PATCH] [Closed]: solvespace: update to 3.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

There's a closed pull request on the void-packages repository

solvespace: update to 3.0
https://github.com/void-linux/void-packages/pull/33126

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

[PR PATCH] solvespace: update to 3.0

[bobertlo]

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

There is a new pull request by bobertlo against master on the void-packages repository

https://github.com/bobertlo/void-packages solvespace-30
https://github.com/void-linux/void-packages/pull/34611

solvespace: update to 3.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-solvespace-30-34611.patch --]
[-- Type: text/x-diff, Size: 6182 bytes --]

From 26a7892191357bac501fdc77a5c5c1031384fcf1 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Sat, 18 Dec 2021 09:17:06 -0600
Subject: [PATCH] solvespace: update to 3.0

---
 srcpkgs/solvespace/patches/char_width.patch | 91 ---------------------
 srcpkgs/solvespace/template                 | 30 +++++--
 2 files changed, 23 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/solvespace/patches/char_width.patch

diff --git a/srcpkgs/solvespace/patches/char_width.patch b/srcpkgs/solvespace/patches/char_width.patch
deleted file mode 100644
index 2a52a9feb534..000000000000
--- a/srcpkgs/solvespace/patches/char_width.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- a/src/textwin.cpp	2017-04-16 04:00:21.000000000 -0500
-+++ b/src/textwin.cpp	2019-02-01 00:47:55.270922800 -0600
-@@ -85,7 +85,7 @@
-     editControl.halfRow = halfRow;
-     editControl.col = col;
- 
--    int x = LEFT_MARGIN + CHAR_WIDTH*col;
-+    int x = LEFT_MARGIN + CHAR_WIDTH_*col;
-     int y = (halfRow - SS.TW.scrollPos)*(LINE_HEIGHT/2);
- 
-     ShowTextEditControl(x, y + 18, str);
-@@ -447,7 +447,7 @@
-             double ox = oldMousePos.x, oy = oldMousePos.y - LINE_HEIGHT;
-             ox += 3;
-             oy -= 3;
--            int tw = (str.length() + 1)*(CHAR_WIDTH - 1);
-+            int tw = (str.length() + 1)*(CHAR_WIDTH_ - 1);
-             ox = min(ox, (double) (width - 25) - tw);
-             oy = max(oy, 5.0);
- 
-@@ -583,7 +583,7 @@
-     int width, height;
-     GetTextWindowSize(&width, &height);
- 
--    int px = LEFT_MARGIN + CHAR_WIDTH*editControl.col;
-+    int px = LEFT_MARGIN + CHAR_WIDTH_*editControl.col;
-     int py = (editControl.halfRow - SS.TW.scrollPos)*(LINE_HEIGHT/2);
- 
-     py += LINE_HEIGHT + 5;
-@@ -842,8 +842,8 @@
-             if(ltop < (scrollPos-1)) continue;
-             if(ltop > scrollPos+halfRows) break;
- 
--            for(c = 0; c < min((width/CHAR_WIDTH)+1, (int) MAX_COLS); c++) {
--                int x = LEFT_MARGIN + c*CHAR_WIDTH;
-+            for(c = 0; c < min((width/CHAR_WIDTH_)+1, (int) MAX_COLS); c++) {
-+                int x = LEFT_MARGIN + c*CHAR_WIDTH_;
-                 int y = (ltop-scrollPos)*(LINE_HEIGHT/2) + 4;
- 
-                 int fg = meta[r][c].fg;
-@@ -866,7 +866,7 @@
-                         // Move the quad down a bit, so that the descenders
-                         // still have the correct background.
-                         y += adj;
--                        ssglAxisAlignedQuad(x, x + CHAR_WIDTH, y, y + bh, false);
-+                        ssglAxisAlignedQuad(x, x + CHAR_WIDTH_, y, y + bh, false);
-                         y -= adj;
-                     }
-                 } else if(a == 1) {
-@@ -912,8 +912,8 @@
-                         glLineWidth(1);
-                         glBegin(GL_LINES);
-                             int yp = y + CHAR_HEIGHT;
--                            glVertex2d(LEFT_MARGIN + cs*CHAR_WIDTH, yp);
--                            glVertex2d(LEFT_MARGIN + cf*CHAR_WIDTH, yp);
-+                            glVertex2d(LEFT_MARGIN + cs*CHAR_WIDTH_, yp);
-+                            glVertex2d(LEFT_MARGIN + cf*CHAR_WIDTH_, yp);
-                         glEnd();
- 
-                         glEnable(GL_TEXTURE_2D);
-@@ -979,7 +979,7 @@
-     hoveredCol = 0;
- 
-     // Find the corresponding character in the text buffer
--    int c = (int)((x - LEFT_MARGIN) / CHAR_WIDTH);
-+    int c = (int)((x - LEFT_MARGIN) / CHAR_WIDTH_);
-     int hh = (LINE_HEIGHT)/2;
-     y += scrollPos*hh;
-     int r;
---- a/src/toolbar.cpp	2017-04-16 03:56:19.000000000 -0500
-+++ b/src/toolbar.cpp	2019-02-01 00:47:55.270922800 -0600
-@@ -218,7 +218,7 @@
-                 }
-             }
- 
--            int tw = str.length() * (SS.TW.CHAR_WIDTH - 1) + 10,
-+            int tw = str.length() * (SS.TW.CHAR_WIDTH_ - 1) + 10,
-                 th = SS.TW.LINE_HEIGHT + 2;
- 
-             double ox = toolbarMouseX + 3, oy = toolbarMouseY + 3;
---- a/src/ui.h	2017-04-16 04:00:07.000000000 -0500
-+++ b/src/ui.h	2019-02-01 00:47:55.270922800 -0600
-@@ -27,7 +27,7 @@
-     float fgColorTable[256*3];
- 
-     enum {
--        CHAR_WIDTH     = 9,
-+        CHAR_WIDTH_     = 9,
-         CHAR_HEIGHT    = 16,
-         LINE_HEIGHT    = 20,
-         LEFT_MARGIN    = 6,
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 377c0e4cbd15..1b35dc15b042 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,15 +1,31 @@
 # Template file for 'solvespace'
 pkgname=solvespace
-version=2.3
-revision=3
-wrksrc=solvespace
+version=3.0
+revision=1
+_libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
+_mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
 build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="glew-devel gtkmm2-devel json-c-devel"
+hostmakedepends="pkg-config git"
+makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel"
 short_desc="Parametric 2d/3d CAD"
 maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://solvespace.com/index.pl"
-distfiles="https://github.com/solvespace/solvespace/releases/download/v${version}/solvespace-source.tar.gz"
-checksum=0be0b2100c0b01eddded2a4dc60455d61cf67816189905af0e73082bfef96000
+distfiles="https://github.com/solvespace/solvespace/archive/refs/tags/v${version}.tar.gz
+ https://github.com/solvespace/libdxfrw/archive/${_libdxfrw_hash}.tar.gz
+ https://github.com/microsoft/mimalloc/archive/${_mimalloc_hash}.tar.gz"
+checksum="04cda618fbbbe2db92713adf2fff4264017f858bac6f737c9da11efab693be4f
+ 3f7d37ee63f85219da3c63a266023008b8df993965a355739a3fdff3bfb2f932
+ 448ac898c72468c4f632a0818cc4b8ec83a4669402ee059d74df35f94f3e2f34"
 nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265"
+
+post_extract() {
+	rm -r "${wrksrc}/extlib/libdxfrw"
+	mv "${XBPS_BUILDDIR}/libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
+	rm -r "${wrksrc}/extlib/mimalloc"
+	mv "${XBPS_BUILDDIR}/mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
+}
+
+pre_configure() {
+	vsed -i 's/include(GetGitCommitHash)/#include(GetGitCommitHash)/g' CMakeLists.txt
+}