Attachment 16940 Details for Bug 51325 – nix & linux-raw-sys patch for cosmic-notifications

[patch] nix & linux-raw-sys patch for cosmic-notifications

notifications.patch (text/plain), 3.22 KB, created by Ilya Sorochan on 2024-10-01 10:56:55 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Ilya Sorochan

Created: 2024-10-01 10:56:55 MSK

Size: 3.22 KB

patch

obsolete

>diff --git a/.gear/rules b/.gear/rules
>index 52596071..f9f75075 100644
>--- a/.gear/rules
>+++ b/.gear/rules
>@@ -1,2 +1,3 @@
> tar: cosmic-notifications-1.0.0.alpha.2-cargo name=cosmic-notifications-1.0.0.alpha.2-cargo base=
> tar: cosmic-notifications name=cosmic-notifications-1.0.0.alpha.2
>+copy: *.patch
>diff --git a/cosmic-notifications-1.0.0-alt-linux-raw-sys-char-loongarch64.patch b/cosmic-notifications-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>new file mode 100644
>index 00000000..4bdfcc88
>--- /dev/null
>+++ b/cosmic-notifications-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>@@ -0,0 +1,12 @@
>+Valid util linux-raw-sys 0.6.5 version
>+
>+--- a/cosmic-notifications-1.0.0.alpha.2-cargo/vendor/linux-raw-sys/src/lib.rs
>++++ b/cosmic-notifications-1.0.0.alpha.2-cargo/vendor/linux-raw-sys/src/lib.rs
>+@@ -20,6 +20,7 @@ pub mod ctypes {
>+     ))]
>+     pub type c_char = c_uchar;
>+     #[cfg(any(
>++        target_arch = "loongarch64",
>+         target_arch = "mips",
>+         target_arch = "mips64",
>+         target_arch = "sparc64",
>diff --git a/cosmic-notifications-1.0.0-alt-old-nix-loongarch64.patch b/cosmic-notifications-1.0.0-alt-old-nix-loongarch64.patch
>new file mode 100644
>index 00000000..89307c8d
>--- /dev/null
>+++ b/cosmic-notifications-1.0.0-alt-old-nix-loongarch64.patch
>@@ -0,0 +1,15 @@
>+Bring loongarch support for old nix versions
>+The path's are shortened for using it for different versions
>+
>+--- a/cosmic-notifications-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
>++++ b/cosmic-notifications-1.0.0.alpha.2-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-notifications.spec b/cosmic-notifications.spec
>index 089e85ab..89180de7 100644
>--- a/cosmic-notifications.spec
>+++ b/cosmic-notifications.spec
>@@ -8,7 +8,7 @@
> 
> Name: cosmic-notifications
> Version: %ver_major.0
>-Release: alt0.2%beta
>+Release: alt0.0.port.2%beta
> 
> Summary: COSMIC Notifications Service
> License: MPL-2.0
>@@ -24,6 +24,9 @@ Source: %name-%version%beta.tar
> %endif
> Source1: %name-%version%beta-cargo.tar
> 
>+Patch: cosmic-notifications-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>+Patch1: cosmic-notifications-1.0.0-alt-old-nix-loongarch64.patch
>+
> BuildRequires(pre): rpm-build-rust
> BuildRequires: just
> BuildRequires: pkgconfig(xkbcommon)
>@@ -40,6 +43,12 @@ Layer Shell notifications daemon which integrates with COSMIC.
> cargo vendor | sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
> tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
> 
>+%patch -p2
>+%patch1 -p2
>+sed -i -e 's/"files":{[^}]*}/"files":{}/' \
>+    vendor/linux-raw-sys/.cargo-checksum.json \
>+    vendor/nix-0.26.4/.cargo-checksum.json
>+
> %build
> %rust_build
> 
>@@ -57,6 +66,9 @@ just rootdir=%buildroot install
> %doc README*
> 
> %changelog
>+* Mon Sep 30 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.0.port.2.alpha.2
>+- add two patches for loongarch64 for linux-raw-sys and nix crates
>+
> * Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2
> - 1.0.0-alpha.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