You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

49 lines
2.0 KiB

Index: src/github.com/muesli/beehive/Makefile
--- src/github.com/muesli/beehive/Makefile.orig 2018-01-27 23:18:58.000000000 +0100
+++ src/github.com/muesli/beehive/Makefile 2018-01-27 23:24:56.022648000 +0100
@@ -1,23 +1,21 @@
BEEHIVE_VERSION=0.2.99
-COMMIT_SHA=$(shell git rev-parse --short HEAD)
+COMMIT_SHA=000000
all: embed
submodule:
- git submodule update --init
noembed: submodule build
generate:
- $(shell go env GOPATH)/bin/go-bindata --tags embed --pkg api -o api/bindata.go --ignore \\.git assets/... config/...
+ go-bindata --tags embed --pkg api -o api/bindata.go --ignore \\.git assets/... config/...
go-bindata:
- [ -f $(shell go env GOPATH)/bin/go-bindata ] || go get -u github.com/jteeuwen/go-bindata/go-bindata
embed: submodule go-bindata generate build
build:
- go build -tags 'embed' -ldflags '-s -w -X main.Version=$(BEEHIVE_VERSION) -X main.CommitSHA=$(COMMIT_SHA)'
+ go build -v -tags 'embed' -ldflags '-X main.Version=$(BEEHIVE_VERSION) -X main.CommitSHA=$(COMMIT_SHA)'
debug: submodule go-bindata generate
go build -tags 'embed' -ldflags '-X main.Version=$(BEEHIVE_VERSION) -X main.CommitSHA=$(COMMIT_SHA)'
Index: src/github.com/muesli/beehive/vendor/github.com/guelfey/go.dbus/transport_freebsd.go
--- src/github.com/muesli/beehive/vendor/github.com/guelfey/go.dbus/transport_freebsd.go.orig 2018-01-27 23:26:47.414312000 +0100
+++ src/github.com/muesli/beehive/vendor/github.com/guelfey/go.dbus/transport_freebsd.go 2018-01-27 23:26:38.638965000 +0100
@@ -0,0 +1,6 @@
+package dbus
+
+func (t *unixTransport) SendNullByte() error {
+ _, err := t.Write([]byte{0})
+ return err
+}
Index: src/github.com/muesli/beehive/vendor/github.com/guelfey/go.dbus/transport_unixcred.go
--- src/github.com/muesli/beehive/vendor/github.com/guelfey/go.dbus/transport_unixcred.go.orig 2018-01-27 23:19:06.000000000 +0100
+++ src/github.com/muesli/beehive/vendor/github.com/guelfey/go.dbus/transport_unixcred.go 2018-01-27 23:24:56.022795000 +0100
@@ -1,4 +1,4 @@
-// +build !darwin
+// +build !darwin,!freebsd
package dbus