Attachment 16734 Details for Bug 51325 – cosmic-greeter nix crate patch

[patch] cosmic-greeter nix crate patch

comsic-greeter-alt0.2.patch (text/plain), 2.65 KB, created by Ilya Sorochan on 2024-08-29 12:23:28 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Ilya Sorochan

Created: 2024-08-29 12:23:28 MSK

Size: 2.65 KB

patch

obsolete

>From bd9da4eb33c24dbf898ecb41f18f9d1505db829e Mon Sep 17 00:00:00 2001
>From: Ilya Sorochan <k0tran@altlinux.org>
>Date: Thu, 22 Aug 2024 18:08:05 +0300
>Subject: [PATCH] 1.0.0-alt0.2.alpha.1
>
>- Add patch for old nix crate version
>---
> ...c-greeter-1.0.0-alt-0.26-nix-loongarch64.patch | 15 +++++++++++++++
> cosmic-greeter.spec                               | 10 ++++++++--
> 2 files changed, 23 insertions(+), 2 deletions(-)
> create mode 100644 cosmic-greeter-1.0.0-alt-0.26-nix-loongarch64.patch
>
>diff --git a/cosmic-greeter-1.0.0-alt-0.26-nix-loongarch64.patch b/cosmic-greeter-1.0.0-alt-0.26-nix-loongarch64.patch
>new file mode 100644
>index 00000000..763eca6e
>--- /dev/null
>+++ b/cosmic-greeter-1.0.0-alt-0.26-nix-loongarch64.patch
>@@ -0,0 +1,15 @@
>+Bring support of loongarch64 to nix 0.26
>+
>+diff --git a/cosmic-session-1.0.0.alpha.1-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.1-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
>+--- a/cosmic-session-1.0.0.alpha.1-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
>++++ b/cosmic-session-1.0.0.alpha.1-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
>+@@ -42,7 +42,8 @@ mod consts {
>+     target_arch = "x86_64",
>+     target_arch = "aarch64",
>+     target_arch = "riscv32",
>+-    target_arch = "riscv64"
>++    target_arch = "riscv64",
>++    target_arch = "loongarch64"
>+ ))]
>+ mod consts {
>+     #[doc(hidden)]
>diff --git a/cosmic-greeter.spec b/cosmic-greeter.spec
>index dba3da0c..ccd3cc20 100644
>--- a/cosmic-greeter.spec
>+++ b/cosmic-greeter.spec
>@@ -8,7 +8,7 @@
> 
> Name: cosmic-greeter
> Version: %ver_major.0
>-Release: alt0.1%beta
>+Release: alt0.2%beta
> 
> Summary: COSMIC Greeter
> License: GPL-3.0
>@@ -24,6 +24,7 @@ Source: %name-%version%beta.tar
> %endif
> Source1: %name-%version%beta-cargo.tar
> Patch10: cosmic-term-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>+Patch11: cosmic-greeter-1.0.0-alt-0.26-nix-loongarch64.patch
> 
> Requires: greetd cosmic-comp
> 
>@@ -48,8 +49,10 @@ cargo vendor | sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.
> tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
> 
> %patch10 -p1
>+%patch11 -p2
> sed -i -e 's/"files":{[^}]*}/"files":{}/' \
>-    vendor/linux-raw-sys/.cargo-checksum.json
>+    vendor/linux-raw-sys/.cargo-checksum.json \
>+    vendor/nix-0.26.4/.cargo-checksum.json
> 
> %build
> export RUSTFLAGS="${RUSTFLAGS} -g"
>@@ -71,6 +74,9 @@ just rootdir=%buildroot install
> %doc README*
> 
> %changelog
>+* Thu Aug 22 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.2.alpha.1
>+- Add patch for old nix crate version
>+
> * Sun Aug 18 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.1.alpha.1
> - first build for Sisyphus (epoch-1.0.0-alpha.1-5-g3679ee5)
> 
>-- 
>2.42.2
>

Actions: View | Diff

Attachments on bug 51325: 16734 | 16735 | 16736 | 16737 | 16738 | 16739 | 16740 | 16741 | 16742 | 16743 | 16744 | 16745 | 16746 | 16747 | 16748 | 16749 | 16750 | 16751 | 16752 | 16934 | 16935 | 16936 | 16937 | 16938 | 16939 | 16940 | 17405 | 17406 | 17407 | 17408 | 17409