Attachment #16741 for bug #51325

View | Details | Raw Unified | Return to bug 51325
Collapse All | Expand All

Lines 1-2 Link Here

(-)a/.gear/rules (+1 lines)
1	tar: cosmic-settings-daemon-1.0.0.alpha.1-cargo name=cosmic-settings-daemon-1.0.0.alpha.1-cargo base=	1	tar: cosmic-settings-daemon-1.0.0.alpha.1-cargo name=cosmic-settings-daemon-1.0.0.alpha.1-cargo base=
2	tar: cosmic-settings-daemon name=cosmic-settings-daemon-1.0.0.alpha.1	2	tar: cosmic-settings-daemon name=cosmic-settings-daemon-1.0.0.alpha.1
		3	copy: *.patch




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",

Lines 8-14 Link Here

(-)a/cosmic-settings-daemon.spec (-2 / +11 lines)
8		8
9	Name: cosmic-settings-daemon	9	Name: cosmic-settings-daemon
10	Version: %ver_major.0	10	Version: %ver_major.0
11	Release: alt0.1%beta	11	Release: alt0.2%beta
12		12
13	Summary: COSMIC Settings Daemon	13	Summary: COSMIC Settings Daemon
14	License: GPL-2.0	14	License: GPL-2.0
Lines 24-29 Source: %name-%version%beta.tar Link Here
24	%endif	24	%endif
25	Source1: %name-%version%beta-cargo.tar	25	Source1: %name-%version%beta-cargo.tar
26		26
		27	Patch: cosmic-settings-daemon-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
		28
27	ExcludeArch: %ix86 armh ppc64le	29	ExcludeArch: %ix86 armh ppc64le
28		30
29	Requires: cosmic-settings	31	Requires: cosmic-settings
Lines 44-49 BuildRequires: pkgconfig(libudev) Link Here
44	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml	46	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
45	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}	47	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
46		48
		49	%patch -p1
		50	# allow patching vendored rust code
		51	sed -i -e 's/"files":{[^}]*}/"files":{}/' \
		52	./vendor/linux-raw-sys/.cargo-checksum.json
		53
47	%build	54	%build
48	%rust_build	55	%rust_build
49		56
Lines 59-64 tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/} Link Here
59	%_datadir/polkit-1/rules.d/%name.rules	66	%_datadir/polkit-1/rules.d/%name.rules
60		67
61	%changelog	68	%changelog
		69	* Wed Aug 21 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.2.alpha.1
		70	- Add loongarch64 patch for linux-raw-sys crate
		71
62	* Sun Aug 18 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.1.alpha.1	72	* Sun Aug 18 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.1.alpha.1
63	- first build for Sisyphus (epoch-1.0.0-alpha.1-3-g93c5494)	73	- first build for Sisyphus (epoch-1.0.0-alpha.1-3-g93c5494)
64		74
65	-

Return to bug 51325

Line 0 Link Here

(-)a/cosmic-settings-daemon-1.0.0-alt-linux-raw-sys-char-loongarch64.patch (+14 lines)
	1	Valid util linux-raw-sys 0.6.5 version
	2
	3	diff --git a/vendor/linux-raw-sys/src/lib.rs b/vendor/linux-raw-sys/src/lib.rs
	4	index f1ca8b720..5b6425e5d 100644
	5	--- a/vendor/linux-raw-sys/src/lib.rs
	6	+++ b/vendor/linux-raw-sys/src/lib.rs
	7	@@ -20,6 +20,7 @@ pub mod ctypes {
	8	))]
	9	pub type c_char = c_uchar;
	10	#[cfg(any(
	11	+ target_arch = "loongarch64",
	12	target_arch = "mips",
	13	target_arch = "mips64",
	14	target_arch = "sparc64",