From 7217a6e4935d62ef2d43a7c6b8b7e0d2cfe398e1 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sat, 20 Jul 2024 16:43:31 +0100 Subject: [PATCH 1/9] 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/9] 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/9] 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 079193b321d9ebc8feb3a6962265afc8db2c243b Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 29 Jul 2024 18:42:48 +0100 Subject: [PATCH 4/9] 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..8ffdd5ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2257,7 +2257,7 @@ dependencies = [ [[package]] name = "weylus" -version = "0.11.4" +version = "2024.7.29" dependencies = [ "autopilot", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index e80fdae5..ee4a33ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "weylus" -version = "0.11.4" +version = "2024.7.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! From 3beeaa53f8c2d5906cf005f7cf47fc99f254f002 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 31 Jul 2024 13:31:38 +0100 Subject: [PATCH 5/9] resolve some merge conflicts --- Readme.md | 1 - patch_community_edition.sh | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index c8aa8360..72db0788 100644 --- a/Readme.md +++ b/Readme.md @@ -10,7 +10,6 @@ After unzipping, run: * 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) diff --git a/patch_community_edition.sh b/patch_community_edition.sh index 20b240cc..98f3b928 100755 --- a/patch_community_edition.sh +++ b/patch_community_edition.sh @@ -1,23 +1,36 @@ git clone https://github.com/H-M-H/Weylus.git cd Weylus +echo "CONTRIBUTORS merge=ours" >.gitattributes +git config --global merge.ours.driver true 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 qdlmcfreshcompat https://github.com/electronstudio2/WeylusQdlmcFreshLyonbotCompat.git +git fetch qdlmcfreshcompat stylus_windows +git merge qdlmcfreshcompat/stylus_windows -m "merged qdlmcfresh compatability" + 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 merge 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" +# This one no longer seems necessary? Breaks mac build with vendored ffmpeg. +#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 +# This needs a fix for windows currently +#git remote add lyonbot https://github.com/lyonbot/Weylus.git +#git fetch lyonbot pr +#git merge lyonbot/pr -m "merged lyonbot" +# The fixed version +git remote add lyonbot https://github.com/electronstudio2/WeylusLyonbotWindowsFixes.git git fetch lyonbot pr git merge lyonbot/pr -m "merged lyonbot" @@ -25,5 +38,19 @@ git remote add electronstudio2 https://github.com/electronstudio2/Weylus.git git fetch electronstudio2 build-fixes git merge electronstudio2/build-fixes -m "merged build-fixes" + +sed -i '/<<<<<<< HEAD/,/=======/d' .github/workflows/build.yml +sed -i '/>>>>>>> electronstudio2\/build-fixes/d' .github/workflows/build.yml + +sed -i '/<<<<<<< HEAD/d' build.rs +sed -i '/=======/,/>>>>>>> electronstudio2\/build-fixes/d' build.rs +sed -i '/>>>>>>> electronstudio2\/build-fixes/d' build.rs + +git add build.rs .github/workflows/build.yml +git commit -m 'resolve conflict' + git fetch electronstudio2 community-edition-patches git merge electronstudio2/community-edition-patches -m "merged community-edition-patches" + +git remote add wce https://github.com/electronstudio/WeylusCommunityEdition.git +###git push -u wce master --force From 9000b128a5268c12e4545489aa29d13c94480099 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 31 Jul 2024 14:03:24 +0100 Subject: [PATCH 6/9] version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ffdd5ba..ce707d1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2257,7 +2257,7 @@ dependencies = [ [[package]] name = "weylus" -version = "2024.7.29" +version = "2024.7.31" dependencies = [ "autopilot", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index ee4a33ef..a36375f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "weylus" -version = "2024.7.29" +version = "2024.7.31" authors = ["HMH "] license = "AGPL-3.0-or-later" edition = "2021" From 57759b8feea6c67a9f5cfb83b46072a42b0ff84a Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 31 Jul 2024 15:46:48 +0100 Subject: [PATCH 7/9] added metainfo --- ...udio.weylus_community_edition.metainfo.xml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 io.github.electronstudio.weylus_community_edition.metainfo.xml diff --git a/io.github.electronstudio.weylus_community_edition.metainfo.xml b/io.github.electronstudio.weylus_community_edition.metainfo.xml new file mode 100644 index 00000000..1e90e384 --- /dev/null +++ b/io.github.electronstudio.weylus_community_edition.metainfo.xml @@ -0,0 +1,43 @@ + + + io.github.electronstudio.weylus_community_edition + + Weylus Community Edition + Use your tablet as graphic tablet/touch screen on your computer + + CC0-1.0 + AGPL-3.0-or-later + + + pointing + keyboard + touch + tablet + + + +

+ Weylus turns your tablet or smart phone into a graphic tablet/touch screen for your computer! +

+

Control your mouse with your tablet

+

Mirror your screen to your tablet

+

Send keyboard input using physical keyboards

+

Hardware accelerated video encoding

+

Support for a stylus/pen (supports pressure and tilt)

+

Multi-touch: Try it with software that supports multi-touch, like Krita, and see for yourself!

+

Capturing specific windows and only drawing to them

+

Faster screen mirroring

+

Tablet as second screen

+ +
+ https://github.com/electronstudio/WeylusCommunityEdition + + io.github.electronstudio.weylus_community_edition.desktop + + H-M-H + + + + + +
\ No newline at end of file From ac325c3c80085f2b6e94bf9cbc88bc42e2ffda81 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 31 Jul 2024 16:10:27 +0100 Subject: [PATCH 8/9] change back to mixed case id because linter wont accept if doesnt match url --- ....github.electronstudio.WeylusCommunityEdition.metainfo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename io.github.electronstudio.weylus_community_edition.metainfo.xml => io.github.electronstudio.WeylusCommunityEdition.metainfo.xml (90%) diff --git a/io.github.electronstudio.weylus_community_edition.metainfo.xml b/io.github.electronstudio.WeylusCommunityEdition.metainfo.xml similarity index 90% rename from io.github.electronstudio.weylus_community_edition.metainfo.xml rename to io.github.electronstudio.WeylusCommunityEdition.metainfo.xml index 1e90e384..18239cb3 100644 --- a/io.github.electronstudio.weylus_community_edition.metainfo.xml +++ b/io.github.electronstudio.WeylusCommunityEdition.metainfo.xml @@ -1,6 +1,6 @@ - io.github.electronstudio.weylus_community_edition + io.github.electronstudio.WeylusCommunityEdition Weylus Community Edition Use your tablet as graphic tablet/touch screen on your computer @@ -32,7 +32,7 @@ https://github.com/electronstudio/WeylusCommunityEdition - io.github.electronstudio.weylus_community_edition.desktop + io.github.electronstudio.WeylusCommunityEdition.desktop H-M-H From c81bb708701549586870069ac863243fc95a18fd Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 31 Jul 2024 17:06:49 +0100 Subject: [PATCH 9/9] add icon --- ....electronstudio.WeylusCommunityEdition.svg | 68 +++++++++++++++++++ weylus.desktop | 2 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 io.github.electronstudio.WeylusCommunityEdition.svg diff --git a/io.github.electronstudio.WeylusCommunityEdition.svg b/io.github.electronstudio.WeylusCommunityEdition.svg new file mode 100644 index 00000000..926aa228 --- /dev/null +++ b/io.github.electronstudio.WeylusCommunityEdition.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/weylus.desktop b/weylus.desktop index 574be920..38b96a69 100755 --- a/weylus.desktop +++ b/weylus.desktop @@ -5,6 +5,6 @@ Comment=Use your tablet as graphic tablet/touch screen on your computer. TryExec=weylus Exec=weylus Terminal=false -Icon=input-tablet +Icon=io.github.electronstudio.WeylusCommunityEdition Categories=Office;Graphics;Education;Presentation; StartupWMClass=weylus