Attachment #16738 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-osd-1.0.0.alpha.1-cargo name=cosmic-osd-1.0.0.alpha.1-cargo base=	1	tar: cosmic-osd-1.0.0.alpha.1-cargo name=cosmic-osd-1.0.0.alpha.1-cargo base=
2	tar: cosmic-osd name=cosmic-osd-1.0.0.alpha.1	2	tar: cosmic-osd name=cosmic-osd-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-osd.spec (-2 / +11 lines)
8		8
9	Name: cosmic-osd	9	Name: cosmic-osd
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 OSD	13	Summary: COSMIC OSD
14	License: GPL-3.0	14	License: GPL-3.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-osd-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
		28
27	BuildRequires(pre): rpm-build-rust	29	BuildRequires(pre): rpm-build-rust
28	BuildRequires: make	30	BuildRequires: make
29	BuildRequires: pkgconfig(xkbcommon)	31	BuildRequires: pkgconfig(xkbcommon)
Lines 41-46 BuildRequires: pkgconfig(libpulse) Link Here
41	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml	43	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
42	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}	44	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
43		45
		46	%patch -p1
		47	# allow patching vendored rust code
		48	sed -i -e 's/"files":{[^}]*}/"files":{}/' \
		49	./vendor/linux-raw-sys/.cargo-checksum.json
		50
44	%build	51	%build
45	%rust_build	52	%rust_build
46		53
Lines 54-59 tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/} Link Here
54	%_bindir/%name	61	%_bindir/%name
55		62
56	%changelog	63	%changelog
		64	* Tue Aug 20 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.2.alpha.1
		65	- Add loongarch64 patch for linux-raw-sys crate
		66
57	* Sun Aug 18 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.1.alpha.1	67	* Sun Aug 18 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.1.alpha.1
58	- first build for Sisyphus	68	- first build for Sisyphus
59		69
60	-

Return to bug 51325

Line 0 Link Here

(-)a/cosmic-osd-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",