From d58167b75caa259ddb1e2cec870627fd81d51f8c Mon Sep 17 00:00:00 2001 From: Robert Deusser Date: Mon, 25 Jul 2022 15:58:52 -0400 Subject: [PATCH 1/5] chore: add go.mod --- go.mod | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 go.mod diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..a38675b --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/rakyll/magicmime + +go 1.16 From fda0683ae6c5262ea57fd65716f0b6e79be8e094 Mon Sep 17 00:00:00 2001 From: Robert Deusser Date: Mon, 25 Jul 2022 15:59:10 -0400 Subject: [PATCH 2/5] chore: update go versions --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80895c4..8d10341 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: go go: - - 1.7.x - - 1.8.x - - 1.9.x + - 1.16.x + - 1.17.x + - 1.18.x - tip addons: apt: From c2e563ded5f9b7cb4d1bae3e87cd109253bd1498 Mon Sep 17 00:00:00 2001 From: Robert Deusser Date: Mon, 25 Jul 2022 16:01:12 -0400 Subject: [PATCH 3/5] fix: update build tags --- magicmime.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magicmime.go b/magicmime.go index c794058..8bea2da 100644 --- a/magicmime.go +++ b/magicmime.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build linux darwin freebsd +//go:build linux || darwin || freebsd // Package magicmime detects mimetypes using libmagic. // This package requires libmagic, install it by the following From 4dfe982de8add6c33246d3cd128368fa3462a274 Mon Sep 17 00:00:00 2001 From: Robert Deusser Date: Mon, 25 Jul 2022 16:02:56 -0400 Subject: [PATCH 4/5] fix: use pkg-config to generate flags --- magicmime.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magicmime.go b/magicmime.go index 8bea2da..1b1bdc7 100644 --- a/magicmime.go +++ b/magicmime.go @@ -22,8 +22,8 @@ // - Mac OS X: brew install libmagic package magicmime +// #cgo pkg-config: libmagic // #cgo CFLAGS: -I/usr/local/include -// #cgo LDFLAGS: -lmagic -L/usr/local/lib // #include // #include import "C" From 650de26877eb85ba6385a7e54f05838300e7cd50 Mon Sep 17 00:00:00 2001 From: Robert Deusser Date: Mon, 25 Jul 2022 16:10:42 -0400 Subject: [PATCH 5/5] fix: add homebrew path for libmagic for m1 macs --- magicmime.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magicmime.go b/magicmime.go index 1b1bdc7..4c3f33b 100644 --- a/magicmime.go +++ b/magicmime.go @@ -23,7 +23,7 @@ package magicmime // #cgo pkg-config: libmagic -// #cgo CFLAGS: -I/usr/local/include +// #cgo CFLAGS: -I/usr/local/include -I/opt/homebrew/opt/libmagic/include // #include // #include import "C"