From 1e7af493d862fc89b6fbf2404453f8ded46521c5 Mon Sep 17 00:00:00 2001 From: Toyam Cox 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 +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 " +license="MPL-2.0" +homepage="https://d2lang.com/" +distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz" +checksum=78fac0235fd583e28d961b0fd066994095a9cec4d5a834747833bbab042ab1c0