Skip to content

Commit 414a1a8

Browse files
authored
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 662e033. * Revert "ubuntu: add cargo as build dep" This reverts commit 9428bb6. * ubuntu: remove rustup patch * ubuntu: add cargo as build dep * deb: update rustup patch
1 parent fc3ec7a commit 414a1a8

File tree

5 files changed

+10
-23
lines changed

5 files changed

+10
-23
lines changed

Cargo.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "umu"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.83"
5+
rust-version = "1.65"
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88
[lib]

packaging/deb/0001-deb-fix-build-by-using-rustup.patch

+5-18
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
From 01a6b1c6e545fab6d01d24dfe1e240d327e77c3d Mon Sep 17 00:00:00 2001
1+
From 6df92e1bf3138a119c47187011cd9217d153206e Mon Sep 17 00:00:00 2001
22
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
3-
Date: Fri, 3 Jan 2025 22:58:17 -0800
3+
Date: Fri, 10 Jan 2025 10:16:40 -0800
44
Subject: [PATCH] deb: fix build by using rustup
55

66
---
77
Makefile.in | 10 +++++++++-
88
packaging/deb/debian/control | 1 +
9-
packaging/deb/ubuntu/control | 1 +
10-
3 files changed, 11 insertions(+), 1 deletion(-)
9+
2 files changed, 10 insertions(+), 1 deletion(-)
1110

1211
diff --git a/Makefile.in b/Makefile.in
13-
index 03b18fc4..b9cfeb10 100644
12+
index 03b18fc4..069fa83f 100644
1413
--- a/Makefile.in
1514
+++ b/Makefile.in
1615
@@ -3,6 +3,8 @@ PROJECT := umu-launcher
@@ -35,7 +34,7 @@ index 03b18fc4..b9cfeb10 100644
3534
+ curl -LJO https://sh.rustup.rs
3635
+ chmod u+x ./rustup-init.sh
3736
+ $(SHELL_INTERPRETER) rustup-init.sh --default-toolchain none -y
38-
+ $(RUSTUP_BIN) toolchain install 1.83
37+
+ $(RUSTUP_BIN) toolchain install 1.65
3938
+ $(CARGO_BIN) build -r
4039
cp -a ./target/release/libumu_delta.so $(OBJDIR)/umu_delta$(PYTHON_PLATFORM_TAG)
4140

@@ -44,18 +43,6 @@ diff --git a/packaging/deb/debian/control b/packaging/deb/debian/control
4443
index 243d1771..5372875d 100644
4544
--- a/packaging/deb/debian/control
4645
+++ b/packaging/deb/debian/control
47-
@@ -14,6 +14,7 @@ Build-Depends:
48-
python3-installer,
49-
python3-build,
50-
python3-pip,
51-
+ curl,
52-
Standards-Version: 4.6.2
53-
Homepage: https://github.com/Open-Wine-Components/umu-launcher
54-
Vcs-Browser: https://github.com/Open-Wine-Components/umu-launcher
55-
diff --git a/packaging/deb/ubuntu/control b/packaging/deb/ubuntu/control
56-
index 243d1771..5372875d 100644
57-
--- a/packaging/deb/ubuntu/control
58-
+++ b/packaging/deb/ubuntu/control
5946
@@ -14,6 +14,7 @@ Build-Depends:
6047
python3-installer,
6148
python3-build,

packaging/deb/ubuntu/control

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Build-Depends:
1414
python3-installer,
1515
python3-build,
1616
python3-pip,
17+
cargo,
1718
Standards-Version: 4.6.2
1819
Homepage: https://github.com/Open-Wine-Components/umu-launcher
1920
Vcs-Browser: https://github.com/Open-Wine-Components/umu-launcher

packaging/deb/ubuntu/rules

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ PYTHONDIR = /usr/lib/python3/dist-packages
2727
dh $@
2828

2929
override_dh_auto_configure:
30-
patch -p1 < packaging/deb/0001-deb-fix-build-by-using-rustup.patch
3130
./configure.sh --prefix=/usr
3231

3332
override_dh_auto_build:

0 commit comments

Comments
 (0)