[PR PATCH] New package: triangle-1.6

[PR PATCH] New package: triangle-1.6

[olafmersmann]

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

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

https://github.com/olafmersmann/void-packages newpkg-triangle
https://github.com/void-linux/void-packages/pull/25280

New package: triangle-1.6
Add package triangle, a 2d mesh generation utility.

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

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

From 6cb74d292946f6303ccc791125393985eaac3d4c Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 10:37:40 +0200
Subject: [PATCH 1/6] New package: triangle-1.6

---
 srcpkgs/triangle/files/LICENSE | 19 +++++++++++++++++++
 srcpkgs/triangle/template      | 31 +++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/triangle/files/LICENSE
 create mode 100644 srcpkgs/triangle/template

diff --git a/srcpkgs/triangle/files/LICENSE b/srcpkgs/triangle/files/LICENSE
new file mode 100644
index 00000000000..e5f4deb24be
--- /dev/null
+++ b/srcpkgs/triangle/files/LICENSE
@@ -0,0 +1,19 @@
+Copyright 1993, 1995, 1997, 1998, 2002, 2005
+Jonathan Richard Shewchuk
+2360 Woolsey #H
+Berkeley, California  94705-1927
+jrs@cs.berkeley.edu
+
+This program may be freely redistributed under the condition that the
+copyright notices (including this entire header and the copyright    
+notice printed when the `-h' switch is selected) are not removed, and 
+no compensation is received.  Private, research, and institutional   
+use is free.  You may distribute modified versions of this code UNDER
+THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
+SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE  
+AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR  
+NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as 
+part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
+WITH THE AUTHOR.  (If you are not directly supplying this code to a 
+customer, and you are instead telling them how they can obtain it for 
+free, then you are not required to make any arrangement with me.)  
diff --git a/srcpkgs/triangle/template b/srcpkgs/triangle/template
new file mode 100644
index 00000000000..7ae404a1b2d
--- /dev/null
+++ b/srcpkgs/triangle/template
@@ -0,0 +1,31 @@
+# Template file for 'triangle'
+# vim: set noet ci pi sts=0 sw=4 ts=4 :
+pkgname=triangle
+version=1.6
+revision=1
+create_wrksrc=yes
+hostmakedepends="unzip"
+short_desc="Two-Dimensional Quality Mesh Generator and Delaunay Triangulator"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="custom:Triangle"
+homepage="http://www.cs.cmu.edu/~quake/triangle.html"
+distfiles="http://www.netlib.org/voronoi/triangle.zip"
+checksum=1766327add038495fa3499e9b7cc642179229750f7201b94f8e1b7bee76f8480
+
+do_extract() {
+	mkdir -p ${wrksrc}
+	unzip "${XBPS_SRCDISTDIR}/${pkgname}-${version}/triangle.zip" -d ${wrksrc}
+	cd ${wrksrc}
+}
+
+do_build() {
+	make triangle
+}
+
+do_install() {
+	vbin triangle
+}
+
+post_install() {
+	vlicense ${FILESDIR}/LICENSE
+}

From 4322274a44b21343c4f27e6f92275c9fe0b65329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 1 Oct 2020 23:01:02 +0700
Subject: [PATCH 2/6] numlockx: released under MIT not JSON

JSON is non-free-license.
---
 srcpkgs/numlockx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/numlockx/template b/srcpkgs/numlockx/template
index c219eb2e32a..12669f492c4 100644
--- a/srcpkgs/numlockx/template
+++ b/srcpkgs/numlockx/template
@@ -1,12 +1,12 @@
 # Template file for 'numlockx'
 pkgname=numlockx
 version=1.2
-revision=4
+revision=5
 build_style=gnu-configure
 makedepends="libX11-devel libSM-devel libXext-devel libXtst-devel"
 short_desc="Activate NumLock at startup"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-license="JSON"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+license="MIT"
 homepage="http://www.mike-devlin.com/linux/README-numlockx.htm"
 distfiles="${DEBIAN_SITE}/main/n/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4

From 3f5933dde609e1a055829d1501481c15a6a1ebc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 1 Oct 2020 23:07:45 +0700
Subject: [PATCH 3/6] rapidjson: clear all JSON licensed code

---
 srcpkgs/rapidjson/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template
index 6bc0b221f88..84a5e608777 100644
--- a/srcpkgs/rapidjson/template
+++ b/srcpkgs/rapidjson/template
@@ -1,18 +1,25 @@
-# Template build file for 'rapidjson'.
+# Template file for 'rapidjson'
 pkgname=rapidjson
 version=1.1.0
-revision=2
+revision=3
 build_style=cmake
-archs=noarch
-short_desc="A fast JSON parser/generator for C++ with both SAX/DOM style API"
+short_desc="Fast JSON parser/generator for C++ with both SAX/DOM style API"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
-license="BSD, MIT"
+license="BSD-3-Clause, MIT"
 homepage="https://github.com/miloyip/rapidjson"
 distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz"
 checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
 
 CXXFLAGS="-Wno-type-limits"
 
+post_patch() {
+	# Remove bin/jsonchecker, which is the JSON licensed files
+	rm -rf bin/jsonchecker
+	vsed -i license.txt \
+		-e 's/To avoid the problematic JSON.*//' \
+		-e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d'
+}
+
 post_install() {
 	vlicense license.txt
 }

From a3a3b29a1b17b0c0bfcd867ee3b5874675e2371f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 1 Oct 2020 23:18:37 +0700
Subject: [PATCH 4/6] rlottie: clear JSON license mention

The tarball never contains any non-free JSON licensed code.
---
 srcpkgs/rlottie/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rlottie/template b/srcpkgs/rlottie/template
index c4c9b65ff1e..8902680b215 100644
--- a/srcpkgs/rlottie/template
+++ b/srcpkgs/rlottie/template
@@ -2,19 +2,23 @@
 pkgname=rlottie
 _commit=f6fc61f214945ac9961ba49fdfc9a3d3336e999b
 version=0.0.20200110
-revision=1
+revision=2
 wrksrc="rlottie-${_commit}"
 build_style=cmake
 configure_args="-DLOTTIE_CACHE=OFF"
 short_desc="Platform independent standalone library that plays Lottie Animation"
 maintainer="John <me@johnnynator.dev>"
-license="LGPL-2.1-or-later, FTL, MIT, JSON, BSD-3-Clause"
+license="LGPL-2.1-or-later, FTL, MIT, BSD-3-Clause"
 homepage="https://github.com/Samsung/rlottie"
 distfiles="https://github.com/Samsung/rlottie/archive/${_commit}.tar.gz"
 checksum=399bb06d8d2120f794eff8bc3e4cbbee13b9f22abcfd9f3f746f595d43ea0b42
 
 post_patch() {
 	vsed -e 's/c++14/c++17/g' -i CMakeLists.txt
+	# No JSON licensed source code included
+	vsed -i licenses/COPYING.RPD \
+		-e 's/To avoid the problematic JSON.*//' \
+		-e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d'
 }
 
 post_install() {

From 28a49572a9899812fd0590aef187c0d2c475d127 Mon Sep 17 00:00:00 2001
From: ndgnuh <ndgnuh@protonmail.com>
Date: Fri, 2 Oct 2020 18:58:21 +0700
Subject: [PATCH 5/6] ibus-bamboo: update to 0.6.7

- Boost typing speed upto 20ms/key in every mode
- Introduce default input mode options
---
 srcpkgs/ibus-bamboo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 9d6b3d8c0ae..3713b014d12 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.6.6
-revision=2
+version=0.6.7
+revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh99@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum="c51651bea965fe66ae89a2f08521ae1840ca5d89b57ab41472ba0ef9fdb9b60d"
+checksum="92d49fe232f241b3e62348c49883aed8a439f256bf6c39034270e069e6c34563"
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {

From 5683c327e7c5d5adcd5a60e603b630206e76afa8 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 14:51:05 +0200
Subject: [PATCH 6/6] Fix cross-compiling errors.

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

diff --git a/srcpkgs/triangle/template b/srcpkgs/triangle/template
index 7ae404a1b2d..6bd7008b001 100644
--- a/srcpkgs/triangle/template
+++ b/srcpkgs/triangle/template
@@ -19,7 +19,7 @@ do_extract() {
 }
 
 do_build() {
-	make triangle
+	LC_ALL=C make CC=${CC} CFLAGS="$CFLAGS $LDFLAGS" triangle
 }
 
 do_install() {

Re: New package: triangle-1.6

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/25280#issuecomment-702742375

Comment:
Please submit each package as a seperate pull reguest.

Re: New package: triangle-1.6

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25280#issuecomment-702744508

Comment:
Please don't open and reopen PRs like this. Maintainers get emails for each of these PRs.

Use git rebase to remove the commits that don't belong to the branch as well.

Re: [PR REVIEW] New package: triangle-1.6

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/25280#discussion_r498909396

Comment:
> MODIFICATIONS ... REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR

If I understand this correctly, this is try to take over rights to modifications from author of modification. Unacceptable even as restricted.

Re: [PR REVIEW] New package: triangle-1.6

[olafmersmann]

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/25280#discussion_r498937862

Comment:
So it should go into nonfree?

P.S.: Sorry for all the noise, still learning.

Re: [PR PATCH] [Updated] New package: triangle-1.6

[olafmersmann]

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

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

https://github.com/olafmersmann/void-packages newpkg-triangle
https://github.com/void-linux/void-packages/pull/25280

New package: triangle-1.6
Add package triangle, a 2d mesh generation utility.

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

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

From 097784aff476708017ee5715800e21b64fbfa4d3 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 10:37:40 +0200
Subject: [PATCH 1/3] New package: triangle-1.6

---
 srcpkgs/triangle/files/LICENSE | 19 +++++++++++++++++++
 srcpkgs/triangle/template      | 30 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/triangle/files/LICENSE
 create mode 100644 srcpkgs/triangle/template

diff --git a/srcpkgs/triangle/files/LICENSE b/srcpkgs/triangle/files/LICENSE
new file mode 100644
index 00000000000..e5f4deb24be
--- /dev/null
+++ b/srcpkgs/triangle/files/LICENSE
@@ -0,0 +1,19 @@
+Copyright 1993, 1995, 1997, 1998, 2002, 2005
+Jonathan Richard Shewchuk
+2360 Woolsey #H
+Berkeley, California  94705-1927
+jrs@cs.berkeley.edu
+
+This program may be freely redistributed under the condition that the
+copyright notices (including this entire header and the copyright    
+notice printed when the `-h' switch is selected) are not removed, and 
+no compensation is received.  Private, research, and institutional   
+use is free.  You may distribute modified versions of this code UNDER
+THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
+SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE  
+AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR  
+NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as 
+part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
+WITH THE AUTHOR.  (If you are not directly supplying this code to a 
+customer, and you are instead telling them how they can obtain it for 
+free, then you are not required to make any arrangement with me.)  
diff --git a/srcpkgs/triangle/template b/srcpkgs/triangle/template
new file mode 100644
index 00000000000..5f9d06a494c
--- /dev/null
+++ b/srcpkgs/triangle/template
@@ -0,0 +1,30 @@
+# Template file for 'triangle'
+pkgname=triangle
+version=1.6
+revision=1
+hostmakedepends="unzip"
+short_desc="A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="custom:Triangle"
+homepage="http://www.cs.cmu.edu/~quake/triangle.html"
+distfiles="http://www.netlib.org/voronoi/triangle.zip"
+checksum=1766327add038495fa3499e9b7cc642179229750f7201b94f8e1b7bee76f8480
+create_wrksrc=yes
+
+do_extract() {
+  mkdir -p ${wrksrc}
+  unzip "${XBPS_SRCDISTDIR}/${pkgname}-${version}/triangle.zip" -d ${wrksrc}
+  cd ${wrksrc}
+}
+
+do_build() {
+	make triangle
+}
+
+do_install() {
+  vbin triangle
+}
+
+post_install() {
+  vlicense ${FILESDIR}/LICENSE
+}

From b4c7d123d8964f6ef12547df3ea28a15d09bc7cb Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 14:51:05 +0200
Subject: [PATCH 2/3] Fix cross-compiling errors.

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

diff --git a/srcpkgs/triangle/template b/srcpkgs/triangle/template
index 5f9d06a494c..e21924284d8 100644
--- a/srcpkgs/triangle/template
+++ b/srcpkgs/triangle/template
@@ -18,7 +18,7 @@ do_extract() {
 }
 
 do_build() {
-	make triangle
+	LC_ALL=C make CC=${CC} CFLAGS="$CFLAGS $LDFLAGS" triangle
 }
 
 do_install() {

From 65f4bc78330da1007563ea1940cfb14469b1435f Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 19:03:42 +0200
Subject: [PATCH 3/3] Undefine LINUX on musl systems because of missing
 fpu_control.h.

---
 srcpkgs/triangle/patches/fpu_control.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/triangle/patches/fpu_control.patch

diff --git a/srcpkgs/triangle/patches/fpu_control.patch b/srcpkgs/triangle/patches/fpu_control.patch
new file mode 100644
index 00000000000..ef4abea8aad
--- /dev/null
+++ b/srcpkgs/triangle/patches/fpu_control.patch
@@ -0,0 +1,15 @@
+--- triangle.c
++++ triangle.c
+@@ -269,6 +269,12 @@
+ /* #define CPU86 */
+ /* #define LINUX */
+ 
++#if defined(__GLIBC__) && defined(__linux__)
++#define LINUX
++#else
++#undef LINUX
++#endif
++
+ #define INEXACT /* Nothing */
+ /* #define INEXACT volatile */
+ 

Re: [PR PATCH] [Updated] New package: triangle-1.6

[olafmersmann]

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

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

https://github.com/olafmersmann/void-packages newpkg-triangle
https://github.com/void-linux/void-packages/pull/25280

New package: triangle-1.6
Add package triangle, a 2d mesh generation utility.

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

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

From 097784aff476708017ee5715800e21b64fbfa4d3 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 10:37:40 +0200
Subject: [PATCH 1/4] New package: triangle-1.6

---
 srcpkgs/triangle/files/LICENSE | 19 +++++++++++++++++++
 srcpkgs/triangle/template      | 30 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/triangle/files/LICENSE
 create mode 100644 srcpkgs/triangle/template

diff --git a/srcpkgs/triangle/files/LICENSE b/srcpkgs/triangle/files/LICENSE
new file mode 100644
index 00000000000..e5f4deb24be
--- /dev/null
+++ b/srcpkgs/triangle/files/LICENSE
@@ -0,0 +1,19 @@
+Copyright 1993, 1995, 1997, 1998, 2002, 2005
+Jonathan Richard Shewchuk
+2360 Woolsey #H
+Berkeley, California  94705-1927
+jrs@cs.berkeley.edu
+
+This program may be freely redistributed under the condition that the
+copyright notices (including this entire header and the copyright    
+notice printed when the `-h' switch is selected) are not removed, and 
+no compensation is received.  Private, research, and institutional   
+use is free.  You may distribute modified versions of this code UNDER
+THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
+SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE  
+AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR  
+NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as 
+part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
+WITH THE AUTHOR.  (If you are not directly supplying this code to a 
+customer, and you are instead telling them how they can obtain it for 
+free, then you are not required to make any arrangement with me.)  
diff --git a/srcpkgs/triangle/template b/srcpkgs/triangle/template
new file mode 100644
index 00000000000..5f9d06a494c
--- /dev/null
+++ b/srcpkgs/triangle/template
@@ -0,0 +1,30 @@
+# Template file for 'triangle'
+pkgname=triangle
+version=1.6
+revision=1
+hostmakedepends="unzip"
+short_desc="A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="custom:Triangle"
+homepage="http://www.cs.cmu.edu/~quake/triangle.html"
+distfiles="http://www.netlib.org/voronoi/triangle.zip"
+checksum=1766327add038495fa3499e9b7cc642179229750f7201b94f8e1b7bee76f8480
+create_wrksrc=yes
+
+do_extract() {
+  mkdir -p ${wrksrc}
+  unzip "${XBPS_SRCDISTDIR}/${pkgname}-${version}/triangle.zip" -d ${wrksrc}
+  cd ${wrksrc}
+}
+
+do_build() {
+	make triangle
+}
+
+do_install() {
+  vbin triangle
+}
+
+post_install() {
+  vlicense ${FILESDIR}/LICENSE
+}

From b4c7d123d8964f6ef12547df3ea28a15d09bc7cb Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 14:51:05 +0200
Subject: [PATCH 2/4] Fix cross-compiling errors.

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

diff --git a/srcpkgs/triangle/template b/srcpkgs/triangle/template
index 5f9d06a494c..e21924284d8 100644
--- a/srcpkgs/triangle/template
+++ b/srcpkgs/triangle/template
@@ -18,7 +18,7 @@ do_extract() {
 }
 
 do_build() {
-	make triangle
+	LC_ALL=C make CC=${CC} CFLAGS="$CFLAGS $LDFLAGS" triangle
 }
 
 do_install() {

From 65f4bc78330da1007563ea1940cfb14469b1435f Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 19:03:42 +0200
Subject: [PATCH 3/4] Undefine LINUX on musl systems because of missing
 fpu_control.h.

---
 srcpkgs/triangle/patches/fpu_control.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/triangle/patches/fpu_control.patch

diff --git a/srcpkgs/triangle/patches/fpu_control.patch b/srcpkgs/triangle/patches/fpu_control.patch
new file mode 100644
index 00000000000..ef4abea8aad
--- /dev/null
+++ b/srcpkgs/triangle/patches/fpu_control.patch
@@ -0,0 +1,15 @@
+--- triangle.c
++++ triangle.c
+@@ -269,6 +269,12 @@
+ /* #define CPU86 */
+ /* #define LINUX */
+ 
++#if defined(__GLIBC__) && defined(__linux__)
++#define LINUX
++#else
++#undef LINUX
++#endif
++
+ #define INEXACT /* Nothing */
+ /* #define INEXACT volatile */
+ 

From 9573644725cf40e83c562ceb3381f9cc4b1f5055 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 2 Oct 2020 19:12:20 +0200
Subject: [PATCH 4/4] Move to nonfree repository (LICENSE).

---
 srcpkgs/triangle/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/triangle/template b/srcpkgs/triangle/template
index e21924284d8..05af0f15ff9 100644
--- a/srcpkgs/triangle/template
+++ b/srcpkgs/triangle/template
@@ -2,19 +2,20 @@
 pkgname=triangle
 version=1.6
 revision=1
+create_wrksrc=yes
 hostmakedepends="unzip"
-short_desc="A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator"
+short_desc="Two-Dimensional Quality Mesh Generator and Delaunay Triangulator"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="custom:Triangle"
 homepage="http://www.cs.cmu.edu/~quake/triangle.html"
 distfiles="http://www.netlib.org/voronoi/triangle.zip"
 checksum=1766327add038495fa3499e9b7cc642179229750f7201b94f8e1b7bee76f8480
-create_wrksrc=yes
+repository=nonfree
 
 do_extract() {
-  mkdir -p ${wrksrc}
-  unzip "${XBPS_SRCDISTDIR}/${pkgname}-${version}/triangle.zip" -d ${wrksrc}
-  cd ${wrksrc}
+	mkdir -p ${wrksrc}
+	unzip "${XBPS_SRCDISTDIR}/${pkgname}-${version}/triangle.zip" -d ${wrksrc}
+	cd ${wrksrc}
 }
 
 do_build() {
@@ -22,9 +23,9 @@ do_build() {
 }
 
 do_install() {
-  vbin triangle
+	vbin triangle
 }
 
 post_install() {
-  vlicense ${FILESDIR}/LICENSE
+	vlicense ${FILESDIR}/LICENSE
 }

Re: [PR PATCH] [Closed]: New package: triangle-1.6

[olafmersmann]

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

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

New package: triangle-1.6
https://github.com/void-linux/void-packages/pull/25280

Description:
Add package triangle, a 2d mesh generation utility.

Re: [PR PATCH] [Closed]: New package: triangle-1.6

[olafmersmann]

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

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

New package: triangle-1.6
https://github.com/void-linux/void-packages/pull/25279

Description:
Add the triangle 2d mesh generation tool.

Re: [PR PATCH] [Closed]: New package: triangle-1.6

[olafmersmann]

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

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

New package: triangle-1.6
https://github.com/void-linux/void-packages/pull/25272

Description:
Add triangle (a 2D mesh generator).