From aa903a664a020ab7258f9a4948e1aa970462ee0e Mon Sep 17 00:00:00 2001 From: Unrud Date: Wed, 8 Sep 2021 18:53:48 +0200 Subject: [PATCH 001/176] Flatpak: Update runtime --- flatpak/com.github.unrud.RemoteTouchpad.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/com.github.unrud.RemoteTouchpad.yaml b/flatpak/com.github.unrud.RemoteTouchpad.yaml index 780bdca..19bceaf 100644 --- a/flatpak/com.github.unrud.RemoteTouchpad.yaml +++ b/flatpak/com.github.unrud.RemoteTouchpad.yaml @@ -1,6 +1,6 @@ app-id: com.github.unrud.RemoteTouchpad runtime: org.freedesktop.Platform -runtime-version: '20.08' +runtime-version: '21.08' sdk: org.freedesktop.Sdk command: remote-touchpad sdk-extensions: From c1a55e57ae0ab25064fb1c0348425640536316cc Mon Sep 17 00:00:00 2001 From: Unrud Date: Sat, 18 Sep 2021 21:17:52 +0200 Subject: [PATCH 002/176] Improve generators --- bindata.go | 1 + keysyms.generated.go | 1 + keysyms.generator.go | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bindata.go b/bindata.go index 3ed0ac6..f81829b 100644 --- a/bindata.go +++ b/bindata.go @@ -1,3 +1,4 @@ package main //go:generate go-bindata-assetfs -mode 0664 -modtime 1 -o ./bindata.generated.go webdata/... +//go:generate gofmt -w ./bindata.generated.go diff --git a/keysyms.generated.go b/keysyms.generated.go index faeae20..1e36558 100644 --- a/keysyms.generated.go +++ b/keysyms.generated.go @@ -1,3 +1,4 @@ +// Code generated by keysyms.generator.go. DO NOT EDIT. // +build portal x11 package main diff --git a/keysyms.generator.go b/keysyms.generator.go index 8682ad7..182e5ed 100644 --- a/keysyms.generator.go +++ b/keysyms.generator.go @@ -101,7 +101,8 @@ func main() { } keysymsMap[unicode] = keysym } - content := "// +build portal x11\n\n" + + content := "// Code generated by keysyms.generator.go. DO NOT EDIT.\n" + + "// +build portal x11\n\n" + "package main\n\n" + "var keysymsMap = map[rune]Keysym{\n" keys := make([]rune, 0) From 72d4d604191368094dd4834f702a76f14c1a5961 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sat, 18 Sep 2021 21:17:53 +0200 Subject: [PATCH 003/176] Update dependencies --- bindata.generated.go | 17 +++-------------- flatpak/com.github.unrud.RemoteTouchpad.yaml | 6 +++--- flatpak/modules.txt | 4 ++-- go.mod | 4 ++-- go.sum | 8 ++++---- 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/bindata.generated.go b/bindata.generated.go index bff0478..33940e7 100644 --- a/bindata.generated.go +++ b/bindata.generated.go @@ -1,4 +1,4 @@ -// Code generated for package main by go-bindata DO NOT EDIT. (@generated) +// Code generated by go-bindata. DO NOT EDIT. // sources: // webdata/fn.js // webdata/icon.png @@ -10,10 +10,10 @@ package main import ( - "github.com/elazarl/go-bindata-assetfs" "bytes" "compress/gzip" "fmt" + "github.com/elazarl/go-bindata-assetfs" "io" "io/ioutil" "os" @@ -54,32 +54,21 @@ type bindataFileInfo struct { modTime time.Time } -// Name return file name func (fi bindataFileInfo) Name() string { return fi.name } - -// Size return file size func (fi bindataFileInfo) Size() int64 { return fi.size } - -// Mode return file mode func (fi bindataFileInfo) Mode() os.FileMode { return fi.mode } - -// Mode return file modify time func (fi bindataFileInfo) ModTime() time.Time { return fi.modTime } - -// IsDir return file whether a directory func (fi bindataFileInfo) IsDir() bool { - return fi.mode&os.ModeDir != 0 + return false } - -// Sys return file is sys mode func (fi bindataFileInfo) Sys() interface{} { return nil } diff --git a/flatpak/com.github.unrud.RemoteTouchpad.yaml b/flatpak/com.github.unrud.RemoteTouchpad.yaml index 19bceaf..00f790e 100644 --- a/flatpak/com.github.unrud.RemoteTouchpad.yaml +++ b/flatpak/com.github.unrud.RemoteTouchpad.yaml @@ -20,8 +20,8 @@ modules: dest: vendor/github.com/elazarl/go-bindata-assetfs - type: git url: https://github.com/godbus/dbus - tag: v5.0.4 - commit: c88335c0b1d28a30e7fc76d526a06154b85e5d97 + tag: v5.0.5 + commit: 84a2dfb382a81e88c000206b8fcba8d98f00ad1e dest: vendor/github.com/godbus/dbus/v5 - type: git url: https://github.com/skip2/go-qrcode @@ -29,7 +29,7 @@ modules: dest: vendor/github.com/skip2/go-qrcode - type: git url: https://github.com/golang/net - commit: abc453219eb586afb3fc1742e8c685c28b9f7eea + commit: 978cfadd31cf6299758dbb5165d451ce91989f1a dest: vendor/golang.org/x/net - type: file path: modules.txt diff --git a/flatpak/modules.txt b/flatpak/modules.txt index ab871ab..f982cf6 100644 --- a/flatpak/modules.txt +++ b/flatpak/modules.txt @@ -1,7 +1,7 @@ # github.com/elazarl/go-bindata-assetfs v1.0.1 ## explicit github.com/elazarl/go-bindata-assetfs -# github.com/godbus/dbus/v5 v5.0.4 +# github.com/godbus/dbus/v5 v5.0.5 ## explicit github.com/godbus/dbus/v5 # github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e @@ -9,6 +9,6 @@ github.com/godbus/dbus/v5 github.com/skip2/go-qrcode github.com/skip2/go-qrcode/bitset github.com/skip2/go-qrcode/reedsolomon -# golang.org/x/net v0.0.0-20210525063256-abc453219eb5 +# golang.org/x/net v0.0.0-20210917221730-978cfadd31cf ## explicit golang.org/x/net/websocket diff --git a/go.mod b/go.mod index a586848..11bce4f 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/elazarl/go-bindata-assetfs v1.0.1 - github.com/godbus/dbus/v5 v5.0.4 + github.com/godbus/dbus/v5 v5.0.5 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e - golang.org/x/net v0.0.0-20210525063256-abc453219eb5 + golang.org/x/net v0.0.0-20210917221730-978cfadd31cf ) diff --git a/go.sum b/go.sum index ff7e67c..16c922f 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,11 @@ github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw= github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= -github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.5 h1:9Eg0XUhQxtkV8ykTMKtMMYY72g4NgxtRq4jgh4Ih5YM= +github.com/godbus/dbus/v5 v5.0.5/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210917221730-978cfadd31cf h1:R150MpwJIv1MpS0N/pc+NhTM8ajzvlmxlY5OYsrevXQ= +golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 1f22f5668a36933ec2cd88a8308f0547d1845830 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sat, 18 Sep 2021 21:17:53 +0200 Subject: [PATCH 004/176] Rename appdata to metainfo --- ...pdata.xml => com.github.unrud.RemoteTouchpad.metainfo.xml} | 0 flatpak/com.github.unrud.RemoteTouchpad.yaml | 2 +- snap/snapcraft.yaml | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename desktop/{com.github.unrud.RemoteTouchpad.appdata.xml => com.github.unrud.RemoteTouchpad.metainfo.xml} (100%) diff --git a/desktop/com.github.unrud.RemoteTouchpad.appdata.xml b/desktop/com.github.unrud.RemoteTouchpad.metainfo.xml similarity index 100% rename from desktop/com.github.unrud.RemoteTouchpad.appdata.xml rename to desktop/com.github.unrud.RemoteTouchpad.metainfo.xml diff --git a/flatpak/com.github.unrud.RemoteTouchpad.yaml b/flatpak/com.github.unrud.RemoteTouchpad.yaml index 00f790e..74e1d5e 100644 --- a/flatpak/com.github.unrud.RemoteTouchpad.yaml +++ b/flatpak/com.github.unrud.RemoteTouchpad.yaml @@ -42,7 +42,7 @@ modules: - . /usr/lib/sdk/golang/enable.sh; go build -tags portal,x11 - install -Dm0755 -t /app/bin remote-touchpad - install -Dm0755 -t /app/bin desktop/remote-touchpad-wait-on-error - - install -Dm0644 -t /app/share/metainfo desktop/com.github.unrud.RemoteTouchpad.appdata.xml + - install -Dm0644 -t /app/share/metainfo desktop/com.github.unrud.RemoteTouchpad.metainfo.xml - install -Dm0644 -t /app/share/applications desktop/com.github.unrud.RemoteTouchpad.desktop - install -Dm0644 -t /app/share/icons/hicolor/scalable/apps desktop/com.github.unrud.RemoteTouchpad.svg - | diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 97618c0..f32c543 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -47,7 +47,7 @@ parts: override-build: | snapcraftctl build install -Dm0755 -t "${SNAPCRAFT_PART_INSTALL}/usr/bin" desktop/remote-touchpad-wait-on-error - install -Dm0644 -t "${SNAPCRAFT_PART_INSTALL}/usr/share/metainfo" desktop/com.github.unrud.RemoteTouchpad.appdata.xml + install -Dm0644 -t "${SNAPCRAFT_PART_INSTALL}/usr/share/metainfo" desktop/com.github.unrud.RemoteTouchpad.metainfo.xml install -Dm0644 -t "${SNAPCRAFT_PART_INSTALL}/usr/share/applications" desktop/com.github.unrud.RemoteTouchpad.desktop install -Dm0644 -t "${SNAPCRAFT_PART_INSTALL}/usr/share/icons/hicolor/scalable/apps" desktop/com.github.unrud.RemoteTouchpad.svg - parse-info: [usr/share/metainfo/com.github.unrud.RemoteTouchpad.appdata.xml] + parse-info: [usr/share/metainfo/com.github.unrud.RemoteTouchpad.metainfo.xml] From 1ec541d78c7d8abbc19395b72a9c150c8f77e027 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sat, 18 Sep 2021 21:17:54 +0200 Subject: [PATCH 005/176] Bump version to 1.0.3 --- CHANGELOG.md | 4 ++++ .../com.github.unrud.RemoteTouchpad.metainfo.xml | 15 +++++++++++---- main.go | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d71cf02..da04a01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.3 (2021-09-18) + +* Update dependencies + ## 1.0.2 (2021-06-05) * New logo diff --git a/desktop/com.github.unrud.RemoteTouchpad.metainfo.xml b/desktop/com.github.unrud.RemoteTouchpad.metainfo.xml index 2656552..84ab1a9 100644 --- a/desktop/com.github.unrud.RemoteTouchpad.metainfo.xml +++ b/desktop/com.github.unrud.RemoteTouchpad.metainfo.xml @@ -19,6 +19,13 @@ https://github.com/Unrud/remote-touchpad Unrud + + +
    +
  • Update dependencies
    • +
+ +