merged community-edition-patches

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "weylus"
-version = "0.11.4"
+version = "2024.7.31"
 authors = ["HMH <[email protected]>"]
 license = "AGPL-3.0-or-later"
 edition = "2021"

Readme.md

@@ -1,4 +1,22 @@
-# Weylus
+# Weylus Community Edition
+
+## Note for MacOS
+
+After unzipping, run:
+
+    sudo xattr -dr com.apple.quarantine ~/Downloads/Weylus.app
+
+## 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)
+* [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!

io.github.electronstudio.WeylusCommunityEdition.metainfo.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>io.github.electronstudio.WeylusCommunityEdition</id>
+
+    <name>Weylus Community Edition</name>
+    <summary>Use your tablet as graphic tablet/touch screen on your computer</summary>
+
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>AGPL-3.0-or-later</project_license>
+
+    <supports>
+        <control>pointing</control>
+        <control>keyboard</control>
+        <control>touch</control>
+        <control>tablet</control>
+    </supports>
+
+    <description>
+        <p>
+            Weylus turns your tablet or smart phone into a graphic tablet/touch screen for your computer!
+        </p>
+        <p>Control your mouse with your tablet</p>
+                <p>Mirror your screen to your tablet</p>
+                <p>Send keyboard input using physical keyboards</p>
+                <p>Hardware accelerated video encoding</p>
+                <p>Support for a stylus/pen (supports pressure and tilt)</p>
+                <p>Multi-touch: Try it with software that supports multi-touch, like Krita, and see for yourself!</p>
+                <p>Capturing specific windows and only drawing to them</p>
+                <p>Faster screen mirroring</p>
+                <p>Tablet as second screen</p>
+
+    </description>
+    <url type="homepage">https://github.com/electronstudio/WeylusCommunityEdition</url>
+    <content_rating type="oars-1.1" />
+    <launchable type="desktop-id">io.github.electronstudio.WeylusCommunityEdition.desktop</launchable>
+    <developer id="io.github.electronstudio">
+        <name>H-M-H</name>
+    </developer>
+    <releases>
+        <release version="2024.7.31" date="2024-7-31">
+        </release>
+    </releases>
+</component>

patch_community_edition.sh

@@ -0,0 +1,56 @@
+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 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"
+
+# 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"
+
+
+# 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"
+
+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