Revert "Temporary stopgap to workaround GUI crashes."

This reverts commit bf5c1afea152bbce80611b8b7f27d9b3fd934e87.

4 files changed, 2 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16a9a650c29e..19f56e2c045d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opentabletdriver-git
 	pkgdesc = A cross-platform open source tablet driver
-	pkgver = v0.5.2.3.r87.g8ee3ccf
+	pkgver = v0.5.2.1.r0.g0d9ec6f
 	pkgrel = 2
 	url = https://github.com/OpenTabletDriver/OpenTabletDriver
 	install = notes.install
@@ -18,8 +18,6 @@ pkgbase = opentabletdriver-git
 	conflicts = opentabletdriver
 	source = git+https://github.com/OpenTabletDriver/OpenTabletDriver
 	source = git+https://github.com/OpenTabletDriver/OpenTabletDriver-udev
-	source = Eto-2.5.10.tar.gz::https://github.com/picoe/Eto/archive/refs/tags/2.5.10.tar.gz
-	source = use-local-eto.patch
 	source = otd
 	source = otd-gui
 	source = opentabletdriver.service
@@ -27,8 +25,6 @@ pkgbase = opentabletdriver-git
 	source = notes.install
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 8bdf2445538b955206abd8bb08f4286200e5571ef70964e287ca9f937af6ce9d
-	sha256sums = 89907cac6db0c0516f49519c40b567089662ffa6c58957bc7d19070ee3b49025
 	sha256sums = 8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a
 	sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0
 	sha256sums = 88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2
diff --git a/.gitignore b/.gitignore
index f7670c80689a..1654f1a78999 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 *.pkg.*
 OpenTabletDriver/
 OpenTabletDriver-udev/
-Eto*
diff --git a/PKGBUILD b/PKGBUILD
index ac5cf6b11ba3..b379cee6f3f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,7 @@ pkgname=opentabletdriver-git
 _pkgname=OpenTabletDriver
 _lpkgname=opentabletdriver
 _spkgname=otd
-_etover=2.5.10
-pkgver=v0.5.2.3.r87.g8ee3ccf
+pkgver=v0.5.2.1.r0.g0d9ec6f
 pkgrel=2
 pkgdesc="A cross-platform open source tablet driver"
 arch=('x86_64')
@@ -19,8 +18,6 @@ conflicts=("opentabletdriver")
 install="notes.install"
 source=('git+https://github.com/OpenTabletDriver/OpenTabletDriver'
         'git+https://github.com/OpenTabletDriver/OpenTabletDriver-udev'
-        "Eto-$_etover.tar.gz::https://github.com/picoe/Eto/archive/refs/tags/$_etover.tar.gz"
-        "use-local-eto.patch"
         "$_spkgname"
         "$_spkgname-gui"
         "$_lpkgname.service"
@@ -29,8 +26,6 @@ source=('git+https://github.com/OpenTabletDriver/OpenTabletDriver'
 
 sha256sums=('SKIP'
             'SKIP'
-            '8bdf2445538b955206abd8bb08f4286200e5571ef70964e287ca9f937af6ce9d'
-            '89907cac6db0c0516f49519c40b567089662ffa6c58957bc7d19070ee3b49025'
             '8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a'
             '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0'
             '88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2'
@@ -46,13 +41,6 @@ prepare() {
     cd "$srcdir/$_pkgname-udev/.modules"
     rmdir "$_pkgname"
     ln -s "$srcdir/$_pkgname" "$_pkgname"
-
-    cd "$srcdir"
-    mv "Eto-$_etover" "Eto"
-    sed -i 's/3.22.25.74/3.24.24.34/' "Eto/src/Eto.Gtk/Eto.Gtk.csproj"
-
-    cd "$srcdir/$_pkgname"
-    git apply "../use-local-eto.patch"
 }
 
 build() {
diff --git a/use-local-eto.patch b/use-local-eto.patch
deleted file mode 100644
index 9789a578e2f6..000000000000
--- a/use-local-eto.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj b/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj
-index a25ae21..af4606b 100644
---- a/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj
-+++ b/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj
-@@ -7,11 +7,8 @@
-     <LangVersion>preview</LangVersion>
-   </PropertyGroup>
- 
--  <ItemGroup Label="NuGet Packages">
--    <PackageReference Include="Eto.Platform.Gtk" Version="2.5.10" />
--  </ItemGroup>
--
-   <ItemGroup Label="Project References">
-+    <ProjectReference Include="..\..\Eto\src\Eto.Gtk\Eto.Gtk.csproj" />
-     <ProjectReference Include="..\OpenTabletDriver.UX\OpenTabletDriver.UX.csproj" />
-   </ItemGroup>
-