Attachment #16737 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-launcher-1.0.0.alpha.1-cargo name=cosmic-launcher-1.0.0.alpha.1-cargo base=	1	tar: cosmic-launcher-1.0.0.alpha.1-cargo name=cosmic-launcher-1.0.0.alpha.1-cargo base=
2	tar: cosmic-launcher name=cosmic-launcher-1.0.0.alpha.1	2	tar: cosmic-launcher name=cosmic-launcher-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-launcher.spec (-2 / +11 lines)
8		8
9	Name: cosmic-launcher	9	Name: cosmic-launcher
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 Launcher	13	Summary: COSMIC Launcher
14	License: MPL-2.0	14	License: MPL-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-launcher-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: just	30	BuildRequires: just
29	BuildRequires: pkgconfig(xkbcommon)	31	BuildRequires: pkgconfig(xkbcommon)
Lines 40-45 BuildRequires: pkgconfig(xkbcommon) Link Here
40	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml	42	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
41	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}	43	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
42		44
		45	%patch -p1
		46	# allow patching vendored rust code
		47	sed -i -e 's/"files":{[^}]*}/"files":{}/' \
		48	./vendor/linux-raw-sys/.cargo-checksum.json
		49
43	%build	50	%build
44	%rust_build	51	%rust_build
45		52
Lines 57-62 just rootdir=%buildroot install Link Here
57	%doc README*	64	%doc README*
58		65
59	%changelog	66	%changelog
		67	* Tue Aug 20 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.2.alpha.1
		68	- Add loongarch64 patch for linux-raw-sys crate
		69
60	* Sun Aug 18 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.1.alpha.1	70	* Sun Aug 18 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.1.alpha.1
61	- first build for Sisyphus	71	- first build for Sisyphus
62		72
63	-

Return to bug 51325

Line 0 Link Here

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