* Re: [PR PATCH] [Updated] New package: d2-0.0.13
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
@ 2022-11-24 2:15 ` Vaelatern
2022-11-27 0:50 ` Vaelatern
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-11-24 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.0.13
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 1022 bytes --]
From e06ca11a498ae1e633f8639c7e493c2e6b516f0a Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.0.13
---
srcpkgs/d2/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..8c2d2576d924
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.0.13
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2/cmd/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=52fd8cddfb7fb34d88a0d6049c038bc31447216ede659d892ec13e288ab966e7
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.0.13
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
2022-11-24 2:15 ` [PR PATCH] [Updated] " Vaelatern
@ 2022-11-27 0:50 ` Vaelatern
2022-12-05 4:17 ` Vaelatern
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-11-27 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.0.13
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 1022 bytes --]
From 5db8606ff2faaa9fde72d44eda997c04b5e2929e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.0.13
---
srcpkgs/d2/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..8c2d2576d924
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.0.13
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2/cmd/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=52fd8cddfb7fb34d88a0d6049c038bc31447216ede659d892ec13e288ab966e7
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: New package: d2-0.0.13
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
2022-11-24 2:15 ` [PR PATCH] [Updated] " Vaelatern
2022-11-27 0:50 ` Vaelatern
@ 2022-12-05 4:17 ` Vaelatern
2022-12-06 18:54 ` [PR PATCH] [Updated] " Vaelatern
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-05 4:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/40716#issuecomment-1336730068
Comment:
https://github.com/terrastruct/d2/commit/c975ddcd035e679c9ead286a43b0de3880162dab
With this commit, d2 should build just fine on musl.
When the next version comes out, I expect to end up merging it.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.0.13
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (2 preceding siblings ...)
2022-12-05 4:17 ` Vaelatern
@ 2022-12-06 18:54 ` Vaelatern
2022-12-06 22:06 ` Vaelatern
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-06 18:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.0.13
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 1014 bytes --]
From 9ee09e8ee7946864c924265cb96efba1a411dcab Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.0.13
---
srcpkgs/d2/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..284ef3b0f2ae
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.0.13
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (3 preceding siblings ...)
2022-12-06 18:54 ` [PR PATCH] [Updated] " Vaelatern
@ 2022-12-06 22:06 ` Vaelatern
2022-12-07 0:52 ` Vaelatern
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-06 22:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.0.13
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 1013 bytes --]
From 2fbea7e3c765af817510c8515e2960e02796e41b Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.1.0
---
srcpkgs/d2/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..284ef3b0f2ae
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.0.13
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (4 preceding siblings ...)
2022-12-06 22:06 ` Vaelatern
@ 2022-12-07 0:52 ` Vaelatern
2022-12-07 0:54 ` Vaelatern
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-07 0:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.0.13
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 3731 bytes --]
From 4286f13856c2575108ef98fb4429700f1f62498f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.1.0
---
srcpkgs/d2/patches/64bit-int.patch | 81 ++++++++++++++++++++++++++++++
srcpkgs/d2/template | 13 +++++
2 files changed, 94 insertions(+)
create mode 100644 srcpkgs/d2/patches/64bit-int.patch
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/patches/64bit-int.patch b/srcpkgs/d2/patches/64bit-int.patch
new file mode 100644
index 000000000000..cbbf390532c2
--- /dev/null
+++ b/srcpkgs/d2/patches/64bit-int.patch
@@ -0,0 +1,81 @@
+diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go
+index 03abf99..bc8daa9 100644
+--- a/d2layouts/d2sequence/sequence_diagram.go
++++ b/d2layouts/d2sequence/sequence_diagram.go
+@@ -43,7 +43,7 @@ type sequenceDiagram struct {
+ }
+
+ func getObjEarliestLineNum(o *d2graph.Object) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range o.References {
+ if ref.MapKey == nil {
+ continue
+@@ -54,7 +54,7 @@ func getObjEarliestLineNum(o *d2graph.Object) int {
+ }
+
+ func getEdgeEarliestLineNum(e *d2graph.Edge) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range e.References {
+ if ref.MapKey == nil {
+ continue
+@@ -294,10 +294,11 @@ func (sd *sequenceDiagram) placeActors() {
+ // ┌──────────────┐
+ // │ actor │
+ // └──────┬───────┘
+-// │
+-// │ lifeline
+-// │
+-// │
++//
++// │
++// │ lifeline
++// │
++// │
+ func (sd *sequenceDiagram) addLifelineEdges() {
+ lastRoute := sd.messages[len(sd.messages)-1].Route
+ endY := 0.
+@@ -365,14 +366,15 @@ func (sd *sequenceDiagram) placeNotes() {
+ // ┌──────────┐
+ // │ actor │
+ // └────┬─────┘
+-// ┌─┴──┐
+-// │ │
+-// |span|
+-// │ │
+-// └─┬──┘
+-// │
+-// lifeline
+-// │
++//
++// ┌─┴──┐
++// │ │
++// |span|
++// │ │
++// └─┬──┘
++// │
++// lifeline
++// │
+ func (sd *sequenceDiagram) placeSpans() {
+ // quickly find the span center X
+ rankToX := make(map[int]float64)
+diff --git a/d2target/d2target.go b/d2target/d2target.go
+index bc312ca..b3ff970 100644
+--- a/d2target/d2target.go
++++ b/d2target/d2target.go
+@@ -44,10 +44,10 @@ func (diagram Diagram) HashID() (string, error) {
+ }
+
+ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
+- x1 := int(math.MaxInt64)
+- y1 := int(math.MaxInt64)
+- x2 := int(-math.MaxInt64)
+- y2 := int(-math.MaxInt64)
++ x1 := int(math.MaxInt32)
++ y1 := int(math.MaxInt32)
++ x2 := int(-math.MaxInt32)
++ y2 := int(-math.MaxInt32)
+
+ for _, targetShape := range diagram.Shapes {
+ x1 = go2.Min(x1, targetShape.Pos.X)
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..284ef3b0f2ae
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.0.13
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (5 preceding siblings ...)
2022-12-07 0:52 ` Vaelatern
@ 2022-12-07 0:54 ` Vaelatern
2022-12-07 16:25 ` [PR PATCH] [Updated] New package: d2-0.1.0 Vaelatern
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-07 0:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.0.13
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 2716 bytes --]
From dafee851dcf49fbe6dbc89e5f1eb6c96a7e01800 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.1.0
---
srcpkgs/d2/patches/64bit-int.patch | 41 ++++++++++++++++++++++++++++++
srcpkgs/d2/template | 13 ++++++++++
2 files changed, 54 insertions(+)
create mode 100644 srcpkgs/d2/patches/64bit-int.patch
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/patches/64bit-int.patch b/srcpkgs/d2/patches/64bit-int.patch
new file mode 100644
index 000000000000..498d693d5c9f
--- /dev/null
+++ b/srcpkgs/d2/patches/64bit-int.patch
@@ -0,0 +1,41 @@
+diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go
+index 03abf99..bc8daa9 100644
+--- a/d2layouts/d2sequence/sequence_diagram.go
++++ b/d2layouts/d2sequence/sequence_diagram.go
+@@ -43,7 +43,7 @@ type sequenceDiagram struct {
+ }
+
+ func getObjEarliestLineNum(o *d2graph.Object) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range o.References {
+ if ref.MapKey == nil {
+ continue
+@@ -54,7 +54,7 @@ func getObjEarliestLineNum(o *d2graph.Object) int {
+ }
+
+ func getEdgeEarliestLineNum(e *d2graph.Edge) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range e.References {
+ if ref.MapKey == nil {
+ continue
+diff --git a/d2target/d2target.go b/d2target/d2target.go
+index bc312ca..b3ff970 100644
+--- a/d2target/d2target.go
++++ b/d2target/d2target.go
+@@ -44,10 +44,10 @@ func (diagram Diagram) HashID() (string, error) {
+ }
+
+ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
+- x1 := int(math.MaxInt64)
+- y1 := int(math.MaxInt64)
+- x2 := int(-math.MaxInt64)
+- y2 := int(-math.MaxInt64)
++ x1 := int(math.MaxInt32)
++ y1 := int(math.MaxInt32)
++ x2 := int(-math.MaxInt32)
++ y2 := int(-math.MaxInt32)
+
+ for _, targetShape := range diagram.Shapes {
+ x1 = go2.Min(x1, targetShape.Pos.X)
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..284ef3b0f2ae
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.1.0
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (6 preceding siblings ...)
2022-12-07 0:54 ` Vaelatern
@ 2022-12-07 16:25 ` Vaelatern
2022-12-07 16:27 ` Vaelatern
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-07 16:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.1.0
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 3241 bytes --]
From 1e7af493d862fc89b6fbf2404453f8ded46521c5 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.1.0
---
srcpkgs/d2/patches/64bit-int.patch | 60 ++++++++++++++++++++++++++++++
srcpkgs/d2/template | 13 +++++++
2 files changed, 73 insertions(+)
create mode 100644 srcpkgs/d2/patches/64bit-int.patch
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/patches/64bit-int.patch b/srcpkgs/d2/patches/64bit-int.patch
new file mode 100644
index 000000000000..af039dc08a64
--- /dev/null
+++ b/srcpkgs/d2/patches/64bit-int.patch
@@ -0,0 +1,60 @@
+This was merged into master on d2
+
+commit 0345f3e975fdad9e9fb16ff4e699bf0319e43294
+Author: Toyam Cox <Vaelatern@voidlinux.org>
+Date: Tue Dec 6 19:51:41 2022 -0500
+
+ fix builds on 32bit systems
+
+ @alixander says: This is the highest number we go to:
+
+ ```
+ d2/lib/imgbundler/imgbundler.go
+ Line 25 in 3f62eed
+ const maxImageSize int64 = 1 << 25 // 33_554_432
+ ```
+
+ This is several shy of 64 bits, and even shy of 32 bits, so let's just
+ choose 32 bits.
+
+diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go
+index 03abf99..7af45f2 100644
+--- a/d2layouts/d2sequence/sequence_diagram.go
++++ b/d2layouts/d2sequence/sequence_diagram.go
+@@ -43,7 +43,7 @@ type sequenceDiagram struct {
+ }
+
+ func getObjEarliestLineNum(o *d2graph.Object) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range o.References {
+ if ref.MapKey == nil {
+ continue
+@@ -54,7 +54,7 @@ func getObjEarliestLineNum(o *d2graph.Object) int {
+ }
+
+ func getEdgeEarliestLineNum(e *d2graph.Edge) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range e.References {
+ if ref.MapKey == nil {
+ continue
+diff --git a/d2target/d2target.go b/d2target/d2target.go
+index ded6812..41dc4c7 100644
+--- a/d2target/d2target.go
++++ b/d2target/d2target.go
+@@ -47,10 +47,10 @@ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
+ if len(diagram.Shapes) == 0 {
+ return Point{0, 0}, Point{0, 0}
+ }
+- x1 := int(math.MaxInt64)
+- y1 := int(math.MaxInt64)
+- x2 := int(-math.MaxInt64)
+- y2 := int(-math.MaxInt64)
++ x1 := int(math.MaxInt32)
++ y1 := int(math.MaxInt32)
++ x2 := int(math.MinInt32)
++ y2 := int(math.MinInt32)
+
+ for _, targetShape := range diagram.Shapes {
+ x1 = go2.Min(x1, targetShape.Pos.X)
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..284ef3b0f2ae
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.1.0
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (7 preceding siblings ...)
2022-12-07 16:25 ` [PR PATCH] [Updated] New package: d2-0.1.0 Vaelatern
@ 2022-12-07 16:27 ` Vaelatern
2022-12-07 16:31 ` Vaelatern
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-07 16:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.1.0
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 3170 bytes --]
From 3e28030283176acda8b6b799def631acf80e92c8 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.1.0
---
srcpkgs/d2/patches/64bit-int.patch | 57 ++++++++++++++++++++++++++++++
srcpkgs/d2/template | 13 +++++++
2 files changed, 70 insertions(+)
create mode 100644 srcpkgs/d2/patches/64bit-int.patch
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/patches/64bit-int.patch b/srcpkgs/d2/patches/64bit-int.patch
new file mode 100644
index 000000000000..11cda3fa401a
--- /dev/null
+++ b/srcpkgs/d2/patches/64bit-int.patch
@@ -0,0 +1,57 @@
+This was merged into master on d2
+
+ commit 0345f3e975fdad9e9fb16ff4e699bf0319e43294
+ Author: Toyam Cox <Vaelatern@voidlinux.org>
+ Date: Tue Dec 6 19:51:41 2022 -0500
+
+ fix builds on 32bit systems
+
+ @alixander says: This is the highest number we go to:
+
+ ```
+ d2/lib/imgbundler/imgbundler.go
+ Line 25 in 3f62eed
+ const maxImageSize int64 = 1 << 25 // 33_554_432
+ ```
+
+ This is several shy of 64 bits, and even shy of 32 bits, so let's just
+ choose 32 bits.
+
+diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go
+index 03abf99..7af45f2 100644
+--- a/d2layouts/d2sequence/sequence_diagram.go
++++ b/d2layouts/d2sequence/sequence_diagram.go
+@@ -43,7 +43,7 @@ type sequenceDiagram struct {
+ }
+
+ func getObjEarliestLineNum(o *d2graph.Object) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range o.References {
+ if ref.MapKey == nil {
+ continue
+@@ -54,7 +54,7 @@ func getObjEarliestLineNum(o *d2graph.Object) int {
+ }
+
+ func getEdgeEarliestLineNum(e *d2graph.Edge) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range e.References {
+ if ref.MapKey == nil {
+ continue
+diff --git a/d2target/d2target.go b/d2target/d2target.go
+index ded6812..41dc4c7 100644
+--- a/d2target/d2target.go
++++ b/d2target/d2target.go
+@@ -47,10 +47,10 @@ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
+- x1 := int(math.MaxInt64)
+- y1 := int(math.MaxInt64)
+- x2 := int(-math.MaxInt64)
+- y2 := int(-math.MaxInt64)
++ x1 := int(math.MaxInt32)
++ y1 := int(math.MaxInt32)
++ x2 := int(math.MinInt32)
++ y2 := int(math.MinInt32)
+
+ for _, targetShape := range diagram.Shapes {
+ x1 = go2.Min(x1, targetShape.Pos.X)
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..284ef3b0f2ae
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.1.0
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (8 preceding siblings ...)
2022-12-07 16:27 ` Vaelatern
@ 2022-12-07 16:31 ` Vaelatern
2022-12-07 16:35 ` [PR PATCH] [Closed]: " Vaelatern
2022-12-07 16:35 ` [PR PATCH] [Updated] " Vaelatern
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-07 16:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.1.0
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 3189 bytes --]
From a65f187d31742134d779922f568c5f7d6e7522d6 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 23 Nov 2022 21:13:44 -0500
Subject: [PATCH] New package: d2-0.1.0
---
srcpkgs/d2/patches/64bit-int.patch | 58 ++++++++++++++++++++++++++++++
srcpkgs/d2/template | 13 +++++++
2 files changed, 71 insertions(+)
create mode 100644 srcpkgs/d2/patches/64bit-int.patch
create mode 100644 srcpkgs/d2/template
diff --git a/srcpkgs/d2/patches/64bit-int.patch b/srcpkgs/d2/patches/64bit-int.patch
new file mode 100644
index 000000000000..db19d4f14574
--- /dev/null
+++ b/srcpkgs/d2/patches/64bit-int.patch
@@ -0,0 +1,58 @@
+commit 78e81a854528abb33737ed81ed9a90d7aff3f16e
+Author: Toyam Cox <Vaelatern@voidlinux.org>
+Date: Tue Dec 6 19:51:41 2022 -0500
+
+ fix builds on 32bit systems
+
+ @alixander says: This is the highest number we go to:
+
+ ```
+ d2/lib/imgbundler/imgbundler.go
+ Line 25 in 3f62eed
+ const maxImageSize int64 = 1 << 25 // 33_554_432
+ ```
+
+ This is several shy of 64 bits, and even shy of 32 bits, so let's just
+ choose 32 bits.
+
+diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go
+index 03abf99..7af45f2 100644
+--- a/d2layouts/d2sequence/sequence_diagram.go
++++ b/d2layouts/d2sequence/sequence_diagram.go
+@@ -43,7 +43,7 @@ type sequenceDiagram struct {
+ }
+
+ func getObjEarliestLineNum(o *d2graph.Object) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range o.References {
+ if ref.MapKey == nil {
+ continue
+@@ -54,7 +54,7 @@ func getObjEarliestLineNum(o *d2graph.Object) int {
+ }
+
+ func getEdgeEarliestLineNum(e *d2graph.Edge) int {
+- min := int(math.MaxInt64)
++ min := int(math.MaxInt32)
+ for _, ref := range e.References {
+ if ref.MapKey == nil {
+ continue
+diff --git a/d2target/d2target.go b/d2target/d2target.go
+index bc312ca..49082a4 100644
+--- a/d2target/d2target.go
++++ b/d2target/d2target.go
+@@ -44,10 +44,10 @@ func (diagram Diagram) HashID() (string, error) {
+ }
+
+ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
+- x1 := int(math.MaxInt64)
+- y1 := int(math.MaxInt64)
+- x2 := int(-math.MaxInt64)
+- y2 := int(-math.MaxInt64)
++ x1 := int(math.MaxInt32)
++ y1 := int(math.MaxInt32)
++ x2 := int(math.MinInt32)
++ y2 := int(math.MinInt32)
+
+ for _, targetShape := range diagram.Shapes {
+ x1 = go2.Min(x1, targetShape.Pos.X)
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
new file mode 100644
index 000000000000..284ef3b0f2ae
--- /dev/null
+++ b/srcpkgs/d2/template
@@ -0,0 +1,13 @@
+# Template file for 'd2'
+pkgname=d2
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="oss.terrastruct.com/d2"
+go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+short_desc="Modern diagram scripting language that turns text to diagrams"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://d2lang.com/"
+distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
+checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Closed]: New package: d2-0.1.0
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (9 preceding siblings ...)
2022-12-07 16:31 ` Vaelatern
@ 2022-12-07 16:35 ` Vaelatern
2022-12-07 16:35 ` [PR PATCH] [Updated] " Vaelatern
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-07 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
There's a closed pull request on the void-packages repository
New package: d2-0.1.0
https://github.com/void-linux/void-packages/pull/40716
Description:
here for musl fix
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] New package: d2-0.1.0
2022-11-24 2:14 [PR PATCH] New package: d2-0.0.13 Vaelatern
` (10 preceding siblings ...)
2022-12-07 16:35 ` [PR PATCH] [Closed]: " Vaelatern
@ 2022-12-07 16:35 ` Vaelatern
11 siblings, 0 replies; 13+ messages in thread
From: Vaelatern @ 2022-12-07 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages d2
https://github.com/void-linux/void-packages/pull/40716
New package: d2-0.1.0
here for musl fix
A patch file from https://github.com/void-linux/void-packages/pull/40716.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-d2-40716.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread