Use github.com/go-graphite/gocairo module

Replace ithub.com/evmar/gocairo/cairo module with github.com/go-graphite/gocairo one.
go-graphite · Feb 15, 2025 · 16bad60 · 16bad60
1 parent b4d86c5
commit 16bad60
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 9 deletions.
diff --git a/expr/functions/cairo/png/cairo.go b/expr/functions/cairo/png/cairo.go
@@ -23,7 +23,7 @@ import (
 	"github.com/go-graphite/carbonapi/expr/types"
 	"github.com/go-graphite/carbonapi/pkg/parser"
 
-	"github.com/evmar/gocairo/cairo"
+	"github.com/go-graphite/gocairo/cairo"
 	"github.com/tebeka/strftime"
 )
 

diff --git a/expr/functions/cairo/png/pixel_ratio.go b/expr/functions/cairo/png/pixel_ratio.go
@@ -1,8 +1,9 @@
+//go:build cairo
 // +build cairo
 
 package png
 
-import "github.com/evmar/gocairo/cairo"
+import "github.com/go-graphite/gocairo/cairo"
 
 // interface with all used cairo.Context methods
 type cairoContext interface {

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768
 	github.com/dgryski/httputil v0.0.0-20160116060654-189c2918cd08
 	github.com/dustin/go-humanize v1.0.1
-	github.com/evmar/gocairo v0.0.0-20160222165215-ddd30f837497
+	github.com/go-graphite/gocairo v0.1.0
 	github.com/go-graphite/protocol v1.0.0
 	github.com/golang/protobuf v1.5.4
 	github.com/gomodule/redigo v1.9.2

diff --git a/go.sum b/go.sum
@@ -61,6 +61,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-errors/errors v1.1.1 h1:ljK/pL5ltg3qoN+OtN6yCv9HWSfMwxSx90GJCZQxYNg=
 github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
+github.com/go-graphite/gocairo v0.1.0 h1:VH624JTY1a6DsBHcM0knN73jJSUS/LwpqVEyXyBZRH4=
+github.com/go-graphite/gocairo v0.1.0/go.mod h1:6yOCt3ZqO6z4l6zZd5jM5Cj89B1kDK999KRYp6QO4Vs=
 github.com/go-graphite/protocol v1.0.0 h1:Fqb0mkVVtfMrn6vw6Ntm3raf3gVVZCOVdZu4JosW5qE=
 github.com/go-graphite/protocol v1.0.0/go.mod h1:eonkg/0UGhJUYu+PshOg1NzWSUcXskr/yHeQXJHJr8Y=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

diff --git a/vendor/github.com/evmar/gocairo/LICENSE → ...or/github.com/go-graphite/gocairo/LICENSE b/vendor/github.com/evmar/gocairo/LICENSE → ...or/github.com/go-graphite/gocairo/LICENSE
diff --git a/...r/github.com/evmar/gocairo/cairo/cairo.go → ...ub.com/go-graphite/gocairo/cairo/cairo.go b/...r/github.com/evmar/gocairo/cairo/cairo.go → ...ub.com/go-graphite/gocairo/cairo/cairo.go
diff --git a/vendor/github.com/evmar/gocairo/cairo/doc.go → ...thub.com/go-graphite/gocairo/cairo/doc.go b/vendor/github.com/evmar/gocairo/cairo/doc.go → ...thub.com/go-graphite/gocairo/cairo/doc.go
diff --git a/...or/github.com/evmar/gocairo/cairo/path.go → ...hub.com/go-graphite/gocairo/cairo/path.go b/...or/github.com/evmar/gocairo/cairo/path.go → ...hub.com/go-graphite/gocairo/cairo/path.go
diff --git a/...or/github.com/evmar/gocairo/cairo/util.go → ...hub.com/go-graphite/gocairo/cairo/util.go b/...or/github.com/evmar/gocairo/cairo/util.go → ...hub.com/go-graphite/gocairo/cairo/util.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -50,15 +50,15 @@ github.com/dgryski/httputil
 # github.com/dustin/go-humanize v1.0.1
 ## explicit; go 1.16
 github.com/dustin/go-humanize
-# github.com/evmar/gocairo v0.0.0-20160222165215-ddd30f837497
-## explicit
-github.com/evmar/gocairo/cairo
 # github.com/felixge/httpsnoop v1.0.4
 ## explicit; go 1.13
 github.com/felixge/httpsnoop
 # github.com/fsnotify/fsnotify v1.7.0
 ## explicit; go 1.17
 github.com/fsnotify/fsnotify
+# github.com/go-graphite/gocairo v0.1.0
+## explicit; go 1.17
+github.com/go-graphite/gocairo/cairo
 # github.com/go-graphite/protocol v1.0.0
 ## explicit; go 1.16
 github.com/go-graphite/protocol/carbonapi_v2_pb