Skip to content

Commit 7b9b53b

Browse files
nigeltaonigeltao
committed
shiny: delete internal/xgb fork
Use an upstream xgb package instead. As per BurntSushi/xgb@deaf085 the BurntSushi/xgb repo is largely unmaintained as of January 2021 and recommends https://github.com/jezek/xgb instead. Change-Id: Ie25323f60677500134e7e1323598c84466140c4d Reviewed-on: https://go-review.googlesource.com/c/exp/+/387014 Trust: Nigel Tao <[email protected]> Run-TryBot: Nigel Tao <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 053ad81 commit 7b9b53b

File tree

24 files changed

+21
-21540
lines changed

24 files changed

+21
-21540
lines changed

‎shiny/driver/x11driver/buffer.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"sync"
1313
"unsafe"
1414

15-
"golang.org/x/exp/shiny/internal/xgb"
16-
"golang.org/x/exp/shiny/internal/xgb/render"
17-
"golang.org/x/exp/shiny/internal/xgb/shm"
18-
"golang.org/x/exp/shiny/internal/xgb/xproto"
15+
"github.com/jezek/xgb"
16+
"github.com/jezek/xgb/render"
17+
"github.com/jezek/xgb/shm"
18+
"github.com/jezek/xgb/xproto"
1919

2020
"golang.org/x/exp/shiny/driver/internal/swizzle"
2121
)

‎shiny/driver/x11driver/buffer_fallback.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"image"
99
"sync"
1010

11-
"golang.org/x/exp/shiny/internal/xgb"
12-
"golang.org/x/exp/shiny/internal/xgb/xproto"
11+
"github.com/jezek/xgb"
12+
"github.com/jezek/xgb/xproto"
1313

1414
"golang.org/x/exp/shiny/driver/internal/swizzle"
1515
)

‎shiny/driver/x11driver/screen.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"log"
1313
"sync"
1414

15-
"golang.org/x/exp/shiny/internal/xgb"
16-
"golang.org/x/exp/shiny/internal/xgb/render"
17-
"golang.org/x/exp/shiny/internal/xgb/shm"
18-
"golang.org/x/exp/shiny/internal/xgb/xproto"
15+
"github.com/jezek/xgb"
16+
"github.com/jezek/xgb/render"
17+
"github.com/jezek/xgb/shm"
18+
"github.com/jezek/xgb/xproto"
1919

2020
"golang.org/x/exp/shiny/driver/internal/x11key"
2121
"golang.org/x/exp/shiny/screen"

‎shiny/driver/x11driver/texture.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"math"
1212
"sync"
1313

14-
"golang.org/x/exp/shiny/internal/xgb/render"
15-
"golang.org/x/exp/shiny/internal/xgb/xproto"
14+
"github.com/jezek/xgb/render"
15+
"github.com/jezek/xgb/xproto"
1616

1717
"golang.org/x/exp/shiny/screen"
1818
"golang.org/x/image/math/f64"

‎shiny/driver/x11driver/window.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"image/draw"
1313
"sync"
1414

15-
"golang.org/x/exp/shiny/internal/xgb"
16-
"golang.org/x/exp/shiny/internal/xgb/render"
17-
"golang.org/x/exp/shiny/internal/xgb/xproto"
15+
"github.com/jezek/xgb"
16+
"github.com/jezek/xgb/render"
17+
"github.com/jezek/xgb/xproto"
1818

1919
"golang.org/x/exp/shiny/driver/internal/drawer"
2020
"golang.org/x/exp/shiny/driver/internal/event"

‎shiny/driver/x11driver/x11driver.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ package x11driver // import "golang.org/x/exp/shiny/driver/x11driver"
1313
import (
1414
"fmt"
1515

16-
"golang.org/x/exp/shiny/internal/xgb"
17-
"golang.org/x/exp/shiny/internal/xgb/render"
18-
"golang.org/x/exp/shiny/internal/xgb/shm"
16+
"github.com/jezek/xgb"
17+
"github.com/jezek/xgb/render"
18+
"github.com/jezek/xgb/shm"
1919

2020
"golang.org/x/exp/shiny/driver/internal/errscreen"
2121
"golang.org/x/exp/shiny/screen"

‎shiny/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.18
55
require (
66
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037
77
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4
8+
github.com/jezek/xgb v1.0.0
89
golang.org/x/image v0.0.0-20190802002840-cff245a6509b
910
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f
1011
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654

‎shiny/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7
33
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
44
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
55
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
6+
github.com/jezek/xgb v1.0.0 h1:s2rRzAV8KQRlpsYA7Uyxoidv1nodMF0m6dIG6FhhVLQ=
7+
github.com/jezek/xgb v1.0.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
68
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
79
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
810
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎shiny/internal/xgb/AUTHORS

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎shiny/internal/xgb/CONTRIBUTORS

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)