Skip to content

Commit 91e2fe4

Browse files
t1ld3xt1ld3x
committed
Fix: building binary on go1.13
1 parent 841a9dd commit 91e2fe4

16 files changed

Lines changed: 891 additions & 27 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tar_options_src=--transform "s/^\./$(pkg_name)-$(version)/" --exclude=.git --exc
3737
all: build
3838

3939
build:
40-
CGO_ENABLED=1 go build $(GOLDFLAGS) -o $(ibus_e_name)
40+
CGO_ENABLED=1 go build $(GOLDFLAGS) -o $(ibus_e_name) -mod=vendor
4141

4242
t:
4343
CGO_ENABLED=1 go test ./...

‎config/config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package config
33
import (
44
"encoding/json"
55
"fmt"
6+
"io/ioutil"
67
"log"
7-
"os"
88
"os/user"
99

1010
"github.com/BambooEngine/bamboo-core"
@@ -64,7 +64,7 @@ func LoadConfig(engineName string) *Config {
6464
c.Flags = 0
6565
}
6666

67-
data, err := os.ReadFile(GetConfigPath(engineName))
67+
data, err := ioutil.ReadFile(GetConfigPath(engineName))
6868
if err == nil {
6969
json.Unmarshal(data, &c)
7070
}
@@ -78,7 +78,7 @@ func SaveConfig(c *Config, engineName string) {
7878
return
7979
}
8080

81-
err = os.WriteFile(fmt.Sprintf(configFile, GetConfigDir(engineName), engineName), data, 0644)
81+
err = ioutil.WriteFile(fmt.Sprintf(configFile, GetConfigDir(engineName), engineName), data, 0644)
8282
if err != nil {
8383
log.Println(err)
8484
}

‎emoji.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package main
2121

2222
import (
2323
"encoding/json"
24-
"os"
24+
"io/ioutil"
2525
"sort"
2626
"strconv"
2727
"strings"
@@ -37,7 +37,7 @@ type EmojiOne struct {
3737
func loadEmojiOne(dataFile string) (*TrieNode, error) {
3838
var trie = NewTrie()
3939
var c = map[string]EmojiOne{}
40-
var data, err = os.ReadFile(dataFile)
40+
var data, err = ioutil.ReadFile(dataFile)
4141
if err != nil {
4242
return nil, err
4343
}

‎engine_utils.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"fmt"
2424
"ibus-bamboo/config"
2525
"ibus-bamboo/ui"
26+
"io/ioutil"
2627
"os"
2728
"strconv"
2829
"strings"
@@ -130,11 +131,11 @@ func initConfigFiles(engineName string) {
130131
macroPath := config.GetMacroPath(engineName)
131132
if _, err := os.Stat(macroPath); os.IsNotExist(err) {
132133
sampleFile := getEngineSubFile(sampleMactabFile)
133-
sample, err := os.ReadFile(sampleFile)
134+
sample, err := ioutil.ReadFile(sampleFile)
134135
if err != nil {
135136
panic(err)
136137
}
137-
err = os.WriteFile(macroPath, sample, 0644)
138+
err = ioutil.WriteFile(macroPath, sample, 0644)
138139
if err != nil {
139140
panic(err)
140141
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module ibus-bamboo
22

3-
go 1.18
3+
go 1.13
44

55
require (
66
github.com/BambooEngine/bamboo-core v0.0.0-20220521074724-f0ca534819fa

‎go.sum‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,47 @@ github.com/dkolbly/wl v0.0.0-20180220001605-b06f57e7e2e6 h1:boaySJl2jhPwf+lSBRug
66
github.com/dkolbly/wl v0.0.0-20180220001605-b06f57e7e2e6/go.mod h1:fUuzU55URBTyjoKP2pYoAoeZd1SvdjJP4IkYoT21xZg=
77
github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
88
github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
9+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
10+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
11+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
12+
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
13+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
14+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
15+
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
16+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
17+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
18+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
19+
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
20+
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
21+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
922
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
1023
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
24+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
25+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
26+
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
27+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
28+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
29+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
30+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
31+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
32+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
33+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
34+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
35+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
36+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
37+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
38+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
39+
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
40+
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
41+
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
42+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
43+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
44+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
45+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
46+
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
47+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
48+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
49+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
50+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
51+
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
52+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎ui/ui.go‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ import "C"
1010
import (
1111
"encoding/json"
1212
"ibus-bamboo/config"
13+
"io/ioutil"
1314
"os"
15+
"reflect"
1416
"unsafe"
1517
)
1618

@@ -32,7 +34,7 @@ func saveConfigText(text *C.char) {
3234
cfgText = C.GoString(text)
3335
cfgFn = config.GetConfigPath(engineName)
3436
)
35-
err := os.WriteFile(cfgFn, []byte(cfgText), 0644)
37+
err := ioutil.WriteFile(cfgFn, []byte(cfgText), 0644)
3638
if err != nil {
3739
panic(err)
3840
}
@@ -44,7 +46,7 @@ func saveMacroText(text *C.char) {
4446
macroText = C.GoString(text)
4547
macroFP = config.GetMacroPath(engineName)
4648
)
47-
err := os.WriteFile(macroFP, []byte(macroText), 0644)
49+
err := ioutil.WriteFile(macroFP, []byte(macroText), 0644)
4850
if err != nil {
4951
panic(err)
5052
}
@@ -69,6 +71,7 @@ func saveShortcuts(ptr *C.int, length int) {
6971
config.SaveConfig(cfg, engineName)
7072
}
7173

74+
/*
7275
func makeSliceFromPtr(ptr *C.int, length int) [10]uint32 {
7376
slice := unsafe.Slice(ptr, length)
7477
var ret [10]uint32
@@ -77,6 +80,16 @@ func makeSliceFromPtr(ptr *C.int, length int) [10]uint32 {
7780
}
7881
return ret
7982
}
83+
*/
84+
85+
func makeSliceFromPtr(ptr *C.int, length int) [10]uint32 {
86+
var oids [10]uint32
87+
sliceHeader := (*reflect.SliceHeader)((unsafe.Pointer(&oids)))
88+
sliceHeader.Cap = length
89+
sliceHeader.Len = length
90+
sliceHeader.Data = uintptr(unsafe.Pointer(ptr))
91+
return oids
92+
}
8093

8194
func OpenGUI(engName string) {
8295
engineName = engName
@@ -87,7 +100,7 @@ func OpenGUI(engName string) {
87100
size = len(shortcuts)
88101
macroFilePath = config.GetMacroPath(engineName)
89102
)
90-
mText, err := os.ReadFile(macroFilePath)
103+
mText, err := ioutil.ReadFile(macroFilePath)
91104
if err != nil {
92105
panic(err)
93106
}

‎vendor/golang.org/x/net/context/context.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)