From 414a1a8e630cd190a29120e511b1d7efd73328bd Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Fri, 10 Jan 2025 18:34:15 +0000
Subject: [PATCH] build: downgrade MSRV (#328)

* Cargo: downgrade to 1.81

* Cargo: downgrade to 1.65

* ubuntu: remove rustup patch

* ubuntu: add cargo as build dep

* Revert "ubuntu: remove rustup patch"

This reverts commit 662e033f4bb5ed453b24d631736b0acb34a30879.

* Revert "ubuntu: add cargo as build dep"

This reverts commit 9428bb61ea99ad4514664f8867a333cdf3348fc1.

* ubuntu: remove rustup patch

* ubuntu: add cargo as build dep

* deb: update rustup patch
---
 Cargo.lock                                    |  6 ++---
 Cargo.toml                                    |  2 +-
 .../0001-deb-fix-build-by-using-rustup.patch  | 23 ++++---------------
 packaging/deb/ubuntu/control                  |  1 +
 packaging/deb/ubuntu/rules                    |  1 -
 5 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fe8dc89f0..e31f546e9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "autocfg"
@@ -358,9 +358,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.94"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 332878d19..027408cf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "umu"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.83"
+rust-version = "1.65"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
diff --git a/packaging/deb/0001-deb-fix-build-by-using-rustup.patch b/packaging/deb/0001-deb-fix-build-by-using-rustup.patch
index b4cf25b87..1725207ae 100644
--- a/packaging/deb/0001-deb-fix-build-by-using-rustup.patch
+++ b/packaging/deb/0001-deb-fix-build-by-using-rustup.patch
@@ -1,16 +1,15 @@
-From 01a6b1c6e545fab6d01d24dfe1e240d327e77c3d Mon Sep 17 00:00:00 2001
+From 6df92e1bf3138a119c47187011cd9217d153206e Mon Sep 17 00:00:00 2001
 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
-Date: Fri, 3 Jan 2025 22:58:17 -0800
+Date: Fri, 10 Jan 2025 10:16:40 -0800
 Subject: [PATCH] deb: fix build by using rustup
 
 ---
  Makefile.in                  | 10 +++++++++-
  packaging/deb/debian/control |  1 +
- packaging/deb/ubuntu/control |  1 +
- 3 files changed, 11 insertions(+), 1 deletion(-)
+ 2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 03b18fc4..b9cfeb10 100644
+index 03b18fc4..069fa83f 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -3,6 +3,8 @@ PROJECT := umu-launcher
@@ -35,7 +34,7 @@ index 03b18fc4..b9cfeb10 100644
 +	curl -LJO https://sh.rustup.rs
 +	chmod u+x ./rustup-init.sh
 +	$(SHELL_INTERPRETER) rustup-init.sh --default-toolchain none -y
-+	$(RUSTUP_BIN) toolchain install 1.83
++	$(RUSTUP_BIN) toolchain install 1.65
 +	$(CARGO_BIN) build -r
  	cp -a ./target/release/libumu_delta.so $(OBJDIR)/umu_delta$(PYTHON_PLATFORM_TAG)
  
@@ -44,18 +43,6 @@ diff --git a/packaging/deb/debian/control b/packaging/deb/debian/control
 index 243d1771..5372875d 100644
 --- a/packaging/deb/debian/control
 +++ b/packaging/deb/debian/control
-@@ -14,6 +14,7 @@ Build-Depends:
-  python3-installer,
-  python3-build,
-  python3-pip,
-+ curl,
- Standards-Version: 4.6.2
- Homepage: https://github.com/Open-Wine-Components/umu-launcher
- Vcs-Browser: https://github.com/Open-Wine-Components/umu-launcher
-diff --git a/packaging/deb/ubuntu/control b/packaging/deb/ubuntu/control
-index 243d1771..5372875d 100644
---- a/packaging/deb/ubuntu/control
-+++ b/packaging/deb/ubuntu/control
 @@ -14,6 +14,7 @@ Build-Depends:
   python3-installer,
   python3-build,
diff --git a/packaging/deb/ubuntu/control b/packaging/deb/ubuntu/control
index 243d17712..357924617 100644
--- a/packaging/deb/ubuntu/control
+++ b/packaging/deb/ubuntu/control
@@ -14,6 +14,7 @@ Build-Depends:
  python3-installer,
  python3-build,
  python3-pip,
+ cargo,
 Standards-Version: 4.6.2
 Homepage: https://github.com/Open-Wine-Components/umu-launcher
 Vcs-Browser: https://github.com/Open-Wine-Components/umu-launcher
diff --git a/packaging/deb/ubuntu/rules b/packaging/deb/ubuntu/rules
index a3241c929..a13178230 100755
--- a/packaging/deb/ubuntu/rules
+++ b/packaging/deb/ubuntu/rules
@@ -27,7 +27,6 @@ PYTHONDIR = /usr/lib/python3/dist-packages
 	dh $@
 
 override_dh_auto_configure:
-	patch -p1 < packaging/deb/0001-deb-fix-build-by-using-rustup.patch
 	./configure.sh --prefix=/usr
 	
 override_dh_auto_build: