Merge pull request #8 from getgauge/switch-to-maintained-libs

Switch to maintained w32 and xgb variants
getgauge · Jul 17, 2024 · 3e2aef7 · 3e2aef7
2 parents 81019fb + 481f797
commit 3e2aef7
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/NOTICE.md b/NOTICE.md
@@ -1,11 +1,11 @@
 
-| Dependency Name | Copyright Information | Description |	Repo URL | License Type	| License URL |
-|:---------------:|:---------------------:|:-----------------------:|:--------:|:------------:|:-----------:|
-| screenshot | Copyright (C) 2012 vova616 <[email protected]> | Original code for this library, patched/modified to be a standalone utility| [link](https://github.com/vova616/screenshot) | MIT          | [link](https://github.com/vova616/screenshot/blob/master/LICENSE) |
-| os         | Copyright (c) 2012 The Go Authors              | provides a platform-independent interface to operating system functionality| [link](https://golang.org/pkg/os/)| BSD Styled   | [link](https://golang.org/LICENSE)|
-| fmt        | Copyright (c) 2012 The Go Authors              | implements formatted I/O with functions analogous to C's printf and scanf| [link](https://golang.org/pkg/fmt/) | BSD Styled   | [link](https://golang.org/LICENSE)|
-| xgb        | Copyright (c) 2009 The XGB Authors             | low-level API to communicate with the X server. It is modeled on XCB and supports many X extensions | [link](https://github.com/BurntSushi/xgb) | BSD 3 clause | [link](https://github.com/BurntSushi/xgb/blob/master/LICENSE) |
-| image      | Copyright (c) 2012 The Go Authors              | mplements a basic 2-D image library.|[link](https://golang.org/pkg/image/)         | BSD Styled   | [link](https://golang.org/LICENSE)|
-| w32        | Copyright (c) 2010-2012 The w32 Authors        | A wrapper of windows apis for the Go Programming Language.| [link](https://github.com/AllenDang/w32)      | BSD 3 clause |[link](https://github.com/AllenDang/w32/blob/master/LICENSE)      |
-| reflect    | Copyright (c) 2012 The Go Authors              | implements run-time reflection, allowing a program to manipulate objects with arbitrary types| [link](http://golang.org/pkg/reflect/)        | BSD Styled   | [link](https://golang.org/LICENSE)|
-| unsafe     | Copyright (c) 2012 The Go Authors              | Package unsafe contains operations that step around the type safety of Go programs. Packages that import unsafe may be non-portable and are not protected by the Go 1 compatibility guidelines. | [link](http://golang.org/pkg/unsafe/)         | BSD Styled   | [link](https://golang.org/LICENSE)                                |
+| Dependency Name |             Copyright Information              |                                                                                           Description                                                                                           |                   Repo URL                    | License Type |                            License URL                            |
+|:---------------:|:----------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------:|:------------:|:-----------------------------------------------------------------:|
+|   screenshot    | Copyright (C) 2012 vova616 <[email protected]> |                                                           Original code for this library, patched/modified to be a standalone utility                                                           | [link](https://github.com/vova616/screenshot) |     MIT      | [link](https://github.com/vova616/screenshot/blob/master/LICENSE) |
+|       os        |       Copyright (c) 2012 The Go Authors        |                                                           provides a platform-independent interface to operating system functionality                                                           |      [link](https://golang.org/pkg/os/)       |  BSD Styled  |                [link](https://golang.org/LICENSE)                 |
+|       fmt       |       Copyright (c) 2012 The Go Authors        |                                                            implements formatted I/O with functions analogous to C's printf and scanf                                                            |      [link](https://golang.org/pkg/fmt/)      |  BSD Styled  |                [link](https://golang.org/LICENSE)                 |
+|       xgb       |       Copyright (c) 2009 The XGB Authors       |                                               low-level API to communicate with the X server. It is modeled on XCB and supports many X extensions                                               |     [link](https://github.com/jezek/xgb)      | BSD 3 clause |     [link](https://github.com/jezek/xgb/blob/master/LICENSE)      |
+|      image      |       Copyright (c) 2012 The Go Authors        |                                                                              Implements a basic 2-D image library.                                                                              |     [link](https://golang.org/pkg/image/)     |  BSD Styled  |                [link](https://golang.org/LICENSE)                 |
+|       w32       |    Copyright (c) 2010-2012 The w32 Authors     |                                                                   A wrapper of windows apis for the Go Programming Language.                                                                    |     [link](https://github.com/gonutz/w32)     | BSD 3 clause |   [link](https://github.com/AllenDang/w32/blob/master/LICENSE)    |
+|     reflect     |       Copyright (c) 2012 The Go Authors        |                                                  implements run-time reflection, allowing a program to manipulate objects with arbitrary types                                                  |    [link](http://golang.org/pkg/reflect/)     |  BSD Styled  |                [link](https://golang.org/LICENSE)                 |
+|     unsafe      |       Copyright (c) 2012 The Go Authors        | Package unsafe contains operations that step around the type safety of Go programs. Packages that import unsafe may be non-portable and are not protected by the Go 1 compatibility guidelines. |     [link](http://golang.org/pkg/unsafe/)     |  BSD Styled  |                [link](https://golang.org/LICENSE)                 |
diff --git a/README.md b/README.md
@@ -18,8 +18,8 @@ In order to compile this code, `gcc` must be installed. Please ensure that you i
 One way to install the required way of `gcc` on Windows is to use the [mingw-w64-install.exe](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/installer/mingw-w64-install.exe/download) which can fetch and install the desired version of `gcc`.
 
 ## Dependencies:
-- Windows: https://github.com/TheTitanrain/w32
-- Linux/Freebsd: https://github.com/BurntSushi/xgb
+- Windows: https://github.com/gonutz/w32
+- Linux/Freebsd: https://github.com/jezel/xgb
 - OSx: `screencapture` :)
 
 ## Credits

diff --git a/capture/capture_freebsd.go b/capture/capture_freebsd.go
@@ -19,8 +19,8 @@
 package capture
 
 import (
-	"github.com/BurntSushi/xgb"
-	"github.com/BurntSushi/xgb/xproto"
+	"github.com/jezek/xgb"
+	"github.com/jezek/xgb/xproto"
 	"image"
 	"image/png"
 	"os"

diff --git a/capture/capture_linux.go b/capture/capture_linux.go
@@ -19,8 +19,8 @@
 package capture
 
 import (
-	"github.com/BurntSushi/xgb"
-	"github.com/BurntSushi/xgb/xproto"
+	"github.com/jezek/xgb"
+	"github.com/jezek/xgb/xproto"
 	"image"
 	"image/png"
 	"os"

diff --git a/capture/capture_windows.go b/capture/capture_windows.go
@@ -20,7 +20,7 @@ package capture
 
 import (
 	"fmt"
-	"github.com/TheTitanrain/w32"
+	"github.com/gonutz/w32/v2"
 	"image"
 	"image/png"
 	"os"

diff --git a/go.mod b/go.mod
@@ -3,6 +3,6 @@ module github.com/getgauge/gauge_screenshot
 go 1.22
 
 require (
-	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc
-	github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d
+	github.com/gonutz/w32/v2 v2.11.1
+	github.com/jezek/xgb v1.1.1
 )
diff --git a/go.sum b/go.sum
@@ -1,4 +1,4 @@
-github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc h1:7D+Bh06CRPCJO3gr2F7h1sriovOZ8BMhca2Rg85c2nk=
-github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d h1:2xp1BQbqcDDaikHnASWpVZRjibOxu7y9LhAv04whugI=
-github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I=
+github.com/gonutz/w32/v2 v2.11.1 h1:plG738ZY7VIkPGf3adZ6lFeAf2evCKrULKyZT5GrPoc=
+github.com/gonutz/w32/v2 v2.11.1/go.mod h1:MgtHx0AScDVNKyB+kjyPder4xIi3XAcHS6LDDU2DmdE=
+github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4=
+github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
diff --git a/plugin.json b/plugin.json
@@ -1,6 +1,6 @@
 {
     "id" : "screenshot",
-    "version" : "0.2.0",
+    "version" : "0.3.0",
     "name" : "Screenshot",
     "description" : "cross-platform command line screenshot utility",
     "scope" : [],

diff --git a/version/version.go b/version/version.go
@@ -18,4 +18,4 @@
 
 package version
 
-var Version = "0.2.0"
+var Version = "0.3.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@

		package version

		var Version = "0.2.0"
		var Version = "0.3.0"