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

[olafmersmann <olafmersmann@users.noreply.github.com>]

[-- 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
 }