Attachment #16940 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-notifications-1.0.0.alpha.2-cargo name=cosmic-notifications-1.0.0.alpha.2-cargo base=	1	tar: cosmic-notifications-1.0.0.alpha.2-cargo name=cosmic-notifications-1.0.0.alpha.2-cargo base=
2	tar: cosmic-notifications name=cosmic-notifications-1.0.0.alpha.2	2	tar: cosmic-notifications name=cosmic-notifications-1.0.0.alpha.2
		3	copy: *.patch




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




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)]

Lines 8-14 Link Here

(-)a/cosmic-notifications.spec (-1 / +13 lines)
8		8
9	Name: cosmic-notifications	9	Name: cosmic-notifications
10	Version: %ver_major.0	10	Version: %ver_major.0
11	Release: alt0.2%beta	11	Release: alt0.0.port.2%beta
12		12
13	Summary: COSMIC Notifications Service	13	Summary: COSMIC Notifications Service
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-notifications-1.0.0-alt-linux-raw-sys-char-loongarch64.patch
		28	Patch1: cosmic-notifications-1.0.0-alt-old-nix-loongarch64.patch
		29
27	BuildRequires(pre): rpm-build-rust	30	BuildRequires(pre): rpm-build-rust
28	BuildRequires: just	31	BuildRequires: just
29	BuildRequires: pkgconfig(xkbcommon)	32	BuildRequires: pkgconfig(xkbcommon)
Lines 40-45 Layer Shell notifications daemon which integrates with COSMIC. Link Here
40	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml	43	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
41	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}	44	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
42		45
		46	%patch -p2
		47	%patch1 -p2
		48	sed -i -e 's/"files":{[^}]*}/"files":{}/' \
		49	vendor/linux-raw-sys/.cargo-checksum.json \
		50	vendor/nix-0.26.4/.cargo-checksum.json
		51
43	%build	52	%build
44	%rust_build	53	%rust_build
45		54
Lines 57-62 just rootdir=%buildroot install Link Here
57	%doc README*	66	%doc README*
58		67
59	%changelog	68	%changelog
		69	* Mon Sep 30 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.0.port.2.alpha.2
		70	- add two patches for loongarch64 for linux-raw-sys and nix crates
		71
60	* Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2	72	* Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2
61	- 1.0.0-alpha.2	73	- 1.0.0-alpha.2
62		74

Return to bug 51325

Line 0 Link Here

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

Line 0 Link Here

(-)a/cosmic-notifications-1.0.0-alt-old-nix-loongarch64.patch (+15 lines)
	1	Bring loongarch support for old nix versions
	2	The path's are shortened for using it for different versions
	3
	4	--- a/cosmic-notifications-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	5	+++ b/cosmic-notifications-1.0.0.alpha.2-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	6	@@ -42,7 +42,8 @@ mod consts {
	7	target_arch = "x86_64",
	8	target_arch = "aarch64",
	9	target_arch = "riscv32",
	10	- target_arch = "riscv64"
	11	+ target_arch = "riscv64",
	12	+ target_arch = "loongarch64"
	13	))]
	14	mod consts {
	15	#[doc(hidden)]