Attachment 16741 Details for Bug 51325 – cosmic-settings-daemon linux-raw-sys crate patch

[patch] cosmic-settings-daemon linux-raw-sys crate patch

cosmic-settings-daemon-alt0.2.patch (text/plain), 2.98 KB, created by Ilya Sorochan on 2024-08-29 12:31:33 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Ilya Sorochan

Created: 2024-08-29 12:31:33 MSK

Size: 2.98 KB

patch

obsolete

>From ecd4a433a592d37cd94c6d6c3a22c4cbc713f5ae Mon Sep 17 00:00:00 2001
>From: Ilya Sorochan <k0tran@altlinux.org>
>Date: Wed, 21 Aug 2024 09:47:50 +0300
>Subject: [PATCH] 1.0.0-alt0.2.alpha.1
>
>- Add loongarch64 patch for linux-raw-sys crate
>---
> .gear/rules                                        |  1 +
> ...-1.0.0-alt-linux-raw-sys-char-loongarch64.patch | 14 ++++++++++++++
> cosmic-settings-daemon.spec                        | 12 +++++++++++-
> 3 files changed, 26 insertions(+), 1 deletion(-)
> create mode 100644 cosmic-settings-daemon-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>
>diff --git a/.gear/rules b/.gear/rules
>index 675a397f..9e4bbb8a 100644
>--- a/.gear/rules
>+++ b/.gear/rules
>@@ -1,2 +1,3 @@
> tar: cosmic-settings-daemon-1.0.0.alpha.1-cargo name=cosmic-settings-daemon-1.0.0.alpha.1-cargo base=
> tar: cosmic-settings-daemon name=cosmic-settings-daemon-1.0.0.alpha.1
>+copy: *.patch
>diff --git a/cosmic-settings-daemon-1.0.0-alt-linux-raw-sys-char-loongarch64.patch b/cosmic-settings-daemon-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>new file mode 100644
>index 00000000..5c47be70
>--- /dev/null
>+++ b/cosmic-settings-daemon-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>@@ -0,0 +1,14 @@
>+Valid util linux-raw-sys 0.6.5 version
>+
>+diff --git a/vendor/linux-raw-sys/src/lib.rs b/vendor/linux-raw-sys/src/lib.rs
>+index f1ca8b720..5b6425e5d 100644
>+--- a/vendor/linux-raw-sys/src/lib.rs
>++++ b/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-settings-daemon.spec b/cosmic-settings-daemon.spec
>index 95c5026e..eeddce93 100644
>--- a/cosmic-settings-daemon.spec
>+++ b/cosmic-settings-daemon.spec
>@@ -8,7 +8,7 @@
> 
> Name: cosmic-settings-daemon
> Version: %ver_major.0
>-Release: alt0.1%beta
>+Release: alt0.2%beta
> 
> Summary: COSMIC Settings Daemon
> License: GPL-2.0
>@@ -24,6 +24,8 @@ Source: %name-%version%beta.tar
> %endif
> Source1: %name-%version%beta-cargo.tar
> 
>+Patch: cosmic-settings-daemon-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
>+
> ExcludeArch: %ix86 armh ppc64le
> 
> Requires: cosmic-settings
>@@ -44,6 +46,11 @@ BuildRequires: pkgconfig(libudev)
> cargo vendor | sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
> tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
> 
>+%patch -p1
>+# allow patching vendored rust code
>+sed -i -e 's/"files":{[^}]*}/"files":{}/' \
>+     ./vendor/linux-raw-sys/.cargo-checksum.json
>+
> %build
> %rust_build
> 
>@@ -59,6 +66,9 @@ tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
> %_datadir/polkit-1/rules.d/%name.rules
> 
> %changelog
>+* Wed Aug 21 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.2.alpha.1
>+- Add loongarch64 patch for linux-raw-sys crate
>+
> * 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-3-g93c5494)
> 
>-- 
>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