From 50ec8ff4dbebda4eec4e3b4ad1ed8cc9b18a9de4 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 13 Sep 2020 10:25:28 +0200 Subject: [PATCH 001/187] Update go modules --- backend_portal.go | 2 +- go.mod | 4 ++-- go.sum | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/backend_portal.go b/backend_portal.go index 3de18ef..d85cae1 100644 --- a/backend_portal.go +++ b/backend_portal.go @@ -24,7 +24,7 @@ package main import ( "errors" "fmt" - dbus "salsa.debian.org/go-team/packages/golang-dbus.git" + "github.com/godbus/dbus/v5" "sync" ) diff --git a/go.mod b/go.mod index b7e27be..31b8ae8 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.3 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e - golang.org/x/net v0.0.0-20200822124328-c89045814202 - salsa.debian.org/go-team/packages/golang-dbus.git v4.1.0+incompatible + golang.org/x/net v0.0.0-20200707034311-ab3426394381 ) diff --git a/go.sum b/go.sum index f5fdd38..3af2b83 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,17 @@ 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.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= +github.com/godbus/dbus/v5 v5.0.3/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/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -salsa.debian.org/go-team/packages/golang-dbus.git v4.1.0+incompatible h1:dBfS1gPVxIbtSKttez6d4Llhs3O3T5td/PNMZcx2HCY= -salsa.debian.org/go-team/packages/golang-dbus.git v4.1.0+incompatible/go.mod h1:0DhHbsjPmOyFC1bl9LzWFuHgsHqgOtcUMvD+OcAg91Q= From e24b06b0f64e1ea5f370ea30744bdb639201bc09 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 13 Sep 2020 10:25:29 +0200 Subject: [PATCH 002/187] Separate tags with comma --- README.md | 2 +- flatpak/com.github.unrud.RemoteTouchpad.yaml | 2 +- snap/snapcraft.yaml | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0db3ce9..d98f1e8 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Supports Flatpak's RemoteDesktop portal (for Wayland), Windows and X11. * [Snap](https://snapcraft.io/remote-touchpad) * [Windows](https://github.com/Unrud/remote-touchpad/releases/latest) * Golang: - * Portal & X11: `go get -u -tags 'portal x11' github.com/Unrud/remote-touchpad` + * Portal & X11: `go get -u -tags portal,x11 github.com/Unrud/remote-touchpad` * Windows: `get get -u github.com/Unrud/remote-touchpad` ## Screenshots diff --git a/flatpak/com.github.unrud.RemoteTouchpad.yaml b/flatpak/com.github.unrud.RemoteTouchpad.yaml index 3901c21..4344540 100644 --- a/flatpak/com.github.unrud.RemoteTouchpad.yaml +++ b/flatpak/com.github.unrud.RemoteTouchpad.yaml @@ -34,7 +34,7 @@ modules: dest: src/github.com/unrud/remote-touchpad buildsystem: simple build-commands: - - . /usr/lib/sdk/golang/enable.sh; env GOPATH="$(pwd)" go build -tags 'portal x11' github.com/unrud/remote-touchpad + - . /usr/lib/sdk/golang/enable.sh; env GOPATH="$(pwd)" go build -tags portal,x11 github.com/unrud/remote-touchpad - install -Dm0755 -t /app/bin remote-touchpad - install -Dm0755 -t /app/bin src/github.com/unrud/remote-touchpad/desktop/remote-touchpad-wait-on-error - install -Dm0644 -t /app/share/metainfo src/github.com/unrud/remote-touchpad/desktop/com.github.unrud.RemoteTouchpad.appdata.xml diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 93e34f5..3098e75 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -32,7 +32,9 @@ parts: remote-touchpad: plugin: go go-importpath: github.com/Unrud/remote-touchpad - go-buildtags: [portal x11] + go-buildtags: + - portal + - x11 source: . source-type: git build-packages: @@ -47,7 +49,7 @@ parts: snapcraftctl pull # WORKAROUND: Snapcraft Go Plugin doesn't set buildtags for go-get GOPATH="$(realpath "${SNAPCRAFT_PART_SRC}/../go")" - env --chdir="$GOPATH/src" GOPATH="$GOPATH" go get -t -d -tags 'portal x11' ./github.com/Unrud/remote-touchpad/... + env --chdir="$GOPATH/src" GOPATH="$GOPATH" go get -t -d -tags portal,x11 ./github.com/Unrud/remote-touchpad/... # WORKAROUND: Point icon directly to high resolution version otherwise snapcraft automatically chooses lowest resolution sed -e 's|Icon=com.github.unrud.RemoteTouchpad|Icon=/usr/share/icons/hicolor/512x512/apps/com.github.unrud.RemoteTouchpad.png|' -i desktop/com.github.unrud.RemoteTouchpad.desktop override-build: | From 84944c578d8caf23a7e4ef92e628a647b1ae9ea9 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 13 Sep 2020 10:25:29 +0200 Subject: [PATCH 003/187] Snap: Remove workaround --- snap/snapcraft.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3098e75..3c2e1a9 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -31,25 +31,21 @@ apps: parts: remote-touchpad: plugin: go - go-importpath: github.com/Unrud/remote-touchpad go-buildtags: - portal - x11 source: . source-type: git build-packages: - - gcc - - libc6-dev - - libxt-dev - - libxtst-dev + - gcc + - libc6-dev + - libxt-dev + - libxtst-dev stage-packages: - - libxt6 - - libxtst6 + - libxt6 + - libxtst6 override-pull: | snapcraftctl pull - # WORKAROUND: Snapcraft Go Plugin doesn't set buildtags for go-get - GOPATH="$(realpath "${SNAPCRAFT_PART_SRC}/../go")" - env --chdir="$GOPATH/src" GOPATH="$GOPATH" go get -t -d -tags portal,x11 ./github.com/Unrud/remote-touchpad/... # WORKAROUND: Point icon directly to high resolution version otherwise snapcraft automatically chooses lowest resolution sed -e 's|Icon=com.github.unrud.RemoteTouchpad|Icon=/usr/share/icons/hicolor/512x512/apps/com.github.unrud.RemoteTouchpad.png|' -i desktop/com.github.unrud.RemoteTouchpad.desktop override-build: | From 50af32094d9e79e36dbe6ad7c42f22dd2d402366 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 13 Sep 2020 10:25:29 +0200 Subject: [PATCH 004/187] Flatpak: Update runtime and dependencies --- flatpak/com.github.unrud.RemoteTouchpad.yaml | 36 ++++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/flatpak/com.github.unrud.RemoteTouchpad.yaml b/flatpak/com.github.unrud.RemoteTouchpad.yaml index 4344540..c601931 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: '19.08' +runtime-version: '20.08' sdk: org.freedesktop.Sdk command: remote-touchpad sdk-extensions: @@ -12,22 +12,38 @@ finish-args: modules: - name: remote-touchpad sources: + # List dependencies: go mod download -json | jq -r '.Path+" "+.Version' - type: git - url: https://github.com/golang/net - commit: 3edf25e44fccea9e11b919341e952fca722ef460 - dest: src/golang.org/x/net + url: https://github.com/elazarl/go-bindata-assetfs + tag: v1.0.1 + commit: 234c15e7648ff35458026de92b34c637bae5e6f7 + dest: src/github.com/elazarl/go-bindata-assetfs + - type: git + url: https://github.com/godbus/dbus + tag: v5.0.3 + commit: 37bf87eef99d69c4f1d3528bd66e3a87dc201472 + dest: src/github.com/godbus/dbus/v5 - type: git url: https://github.com/skip2/go-qrcode commit: da1b6568686e89143e94f980a98bc2dbd5537f13 dest: src/github.com/skip2/go-qrcode - type: git - url: https://github.com/elazarl/go-bindata-assetfs - commit: 234c15e7648ff35458026de92b34c637bae5e6f7 - dest: src/github.com/elazarl/go-bindata-assetfs + url: https://github.com/golang/crypto + commit: 75b288015ac94e66e3d6715fb68a9b41bf046ec2 + dest: src/golang.org/x/crypto - type: git - url: https://salsa.debian.org/go-team/packages/golang-dbus.git - commit: ed647c482535c2296517ff0c45d8bdcb5efce458 - dest: src/salsa.debian.org/go-team/packages/golang-dbus.git + url: https://github.com/golang/net + commit: ab34263943818b32f575efc978a3d24e80b04bd7 + dest: src/golang.org/x/net + - type: git + url: https://github.com/golang/sys + commit: 85ca7c5b95cdf1e557abb38a283d1e61a5959c31 + dest: src/golang.org/x/sys + - type: git + url: https://github.com/golang/text + tag: v0.3.0 + commit: f21a4dfb5e38f5895301dc265a8def02365cc3d0 + dest: src/golang.org/x/text - type: git path: .. branch: master From 8139cf07341d7b1efd32f4f95aa0dcb4c2ad06de Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 13 Sep 2020 10:25:30 +0200 Subject: [PATCH 005/187] Bump version to 1.0.1 --- .../com.github.unrud.RemoteTouchpad.appdata.xml | 15 +++++++++++---- main.go | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/desktop/com.github.unrud.RemoteTouchpad.appdata.xml b/desktop/com.github.unrud.RemoteTouchpad.appdata.xml index c5d9de2..cf0b0bf 100644 --- a/desktop/com.github.unrud.RemoteTouchpad.appdata.xml +++ b/desktop/com.github.unrud.RemoteTouchpad.appdata.xml @@ -19,6 +19,13 @@ https://github.com/Unrud/remote-touchpad Unrud + + +
    +
  • Update dependencies
    • +
+ +