From 7217a6e4935d62ef2d43a7c6b8b7e0d2cfe398e1 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sat, 20 Jul 2024 16:43:31 +0100 Subject: [PATCH 1/4] script to patch community edition --- patch_community_edition.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patch_community_edition.sh diff --git a/patch_community_edition.sh b/patch_community_edition.sh new file mode 100644 index 00000000..b02c4b97 --- /dev/null +++ b/patch_community_edition.sh @@ -0,0 +1,22 @@ +git clone https://github.com/H-M-H/Weylus.git +cd Weylus + +git remote add qdlmcfresh https://github.com/qdlmcfresh/Weylus.git +git fetch qdlmcfresh stylus_windows +git merge qdlmcfresh/stylus_windows -m "merged qdlmcfresh" + +git remote add OmegaRogue https://github.com/OmegaRogue/Weylus.git +git fetch OmegaRogue master +git merge -s recursive -X theirs OmegaRogue/master -m "merged OmegaRogue" + +git remote add scribblemaniac https://github.com/scribblemaniac/Weylus.git +git fetch scribblemaniac fix-qr-code +git merge scribblemaniac/fix-qr-code -m "merged scribblemaniac" + +git remote add Diordany https://github.com/Diordany/Weylus.git +git fetch Diordany pr-func-proto +git merge Diordany/pr-func-proto -m "merged Diordany" + +git remote add lyonbot https://github.com/lyonbot/Weylus.git +git fetch lyonbot pr +git merge lyonbot/pr -m "merged lyonbot" From f5cd44d596780e9094bf216c956eb2a409efeb45 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sat, 20 Jul 2024 16:49:26 +0100 Subject: [PATCH 2/4] add another patch --- patch_community_edition.sh | 7 +++++++ 1 file changed, 7 insertions(+) mode change 100644 => 100755 patch_community_edition.sh diff --git a/patch_community_edition.sh b/patch_community_edition.sh old mode 100644 new mode 100755 index b02c4b97..20b240cc --- a/patch_community_edition.sh +++ b/patch_community_edition.sh @@ -20,3 +20,10 @@ git merge Diordany/pr-func-proto -m "merged Diordany" git remote add lyonbot https://github.com/lyonbot/Weylus.git git fetch lyonbot pr git merge lyonbot/pr -m "merged lyonbot" + +git remote add electronstudio2 https://github.com/electronstudio2/Weylus.git +git fetch electronstudio2 build-fixes +git merge electronstudio2/build-fixes -m "merged build-fixes" + +git fetch electronstudio2 community-edition-patches +git merge electronstudio2/community-edition-patches -m "merged community-edition-patches" From 6db94d5e663fb093c02b4abd1df5de6f263ea91e Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sat, 20 Jul 2024 16:57:18 +0100 Subject: [PATCH 3/4] update readme with list of patches --- Readme.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Readme.md b/Readme.md index b381caac..bb3a7014 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,15 @@ # Weylus + +## Community Edition adds these patches + +* Commits from Weylus master that improve Wayland compabability. +* [bunch of improvements: MacOS Stylus, Virtual Key, Reconnect, etc.](https://github.com/H-M-H/Weylus/pull/276) +* [Modify write_video_packet prototype](https://github.com/H-M-H/Weylus/pull/273) +* [Always render square QR code so it can be read](https://github.com/H-M-H/Weylus/pull/236) +* [fix scroll direction problems in uinput](https://github.com/H-M-H/Weylus/pull/215) +* [Use WinAPI to simulate pointermovements](https://github.com/H-M-H/Weylus/pull/128) +* [Linux build fixes](https://github.com/electronstudio2/Weylus/tree/build-fixes) + ![Build](https://github.com/H-M-H/Weylus/workflows/Build/badge.svg) Weylus turns your tablet or smart phone into a graphic tablet/touch screen for your computer! From a43472c6f13a13c6d1c42b64a19903cac2634e1a Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 29 Jul 2024 18:42:48 +0100 Subject: [PATCH 4/4] use date for version number --- Cargo.lock | 2 +- Cargo.toml | 2 +- Readme.md | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b1cbc05..15353aa4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2257,7 +2257,7 @@ dependencies = [ [[package]] name = "weylus" -version = "0.11.4" +version = "2024.07.29" dependencies = [ "autopilot", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index e80fdae5..8f4b0bfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "weylus" -version = "0.11.4" +version = "2024.07.29" authors = ["HMH "] license = "AGPL-3.0-or-later" edition = "2021" diff --git a/Readme.md b/Readme.md index bb3a7014..c8aa8360 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,10 @@ -# Weylus +# Weylus Community Edition + +## Note for MacOS + +After unzipping, run: + + sudo xattr -dr com.apple.quarantine ~/Downloads/Weylus.app ## Community Edition adds these patches @@ -10,6 +16,8 @@ * [Use WinAPI to simulate pointermovements](https://github.com/H-M-H/Weylus/pull/128) * [Linux build fixes](https://github.com/electronstudio2/Weylus/tree/build-fixes) + + ![Build](https://github.com/H-M-H/Weylus/workflows/Build/badge.svg) Weylus turns your tablet or smart phone into a graphic tablet/touch screen for your computer!