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




Bring support of loongarch64 to nix 0.23

diff --git a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
index 68ebaba..d9a41f9 100644
--- a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
+++ b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
@@ -34,6 +34,7 @@ mod consts {
           target_arch = "s390x",
           target_arch = "x86_64",
           target_arch = "aarch64",
+          target_arch = "loongarch64",
           target_arch = "riscv64"))]
 mod consts {
     #[doc(hidden)]




Bring support of loongarch64 to nix 0.26

diff --git a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs
--- a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs
+++ a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/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-session.spec (-1 / +12 lines)
8		8
9	Name: cosmic-session	9	Name: cosmic-session
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 Session Manager	13	Summary: COSMIC Session Manager
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-session-1.0.0-alt-0.23-nix-loongarch64.patch
		28	Patch1: cosmic-session-1.0.0-alt-0.26-nix-loongarch64.patch
		29
27	ExcludeArch: %ix86 armh ppc64le	30	ExcludeArch: %ix86 armh ppc64le
28		31
29	Requires: cosmic-app-library	32	Requires: cosmic-app-library
Lines 63-68 Session manager for the COSMIC desktop environment. Link Here
63	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml	66	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
64	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}	67	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
65		68
		69	%patch -p2
		70	%patch1 -p2
		71	sed -i -e 's/"files":{[^}]*}/"files":{}/' \
		72	./vendor/nix-*/.cargo-checksum.json
		73
66	# fix path	74	# fix path
67	sed -i 's\|\/usr\(\/bin\/dbus-run-session\)\|\1\|' data/start-cosmic	75	sed -i 's\|\/usr\(\/bin\/dbus-run-session\)\|\1\|' data/start-cosmic
68		76
Lines 83-88 just rootdir=%buildroot install Link Here
83	%_datadir/wayland-sessions/cosmic.desktop	91	%_datadir/wayland-sessions/cosmic.desktop
84		92
85	%changelog	93	%changelog
		94	* Fri Sep 27 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.0.port.2.alpha.2
		95	- add two patches for old nix crate versions
		96
86	* Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2	97	* Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2
87	- 1.0.0-alpha.2	98	- 1.0.0-alpha.2
88		99

Return to bug 51325

Line 0 Link Here

(-)a/cosmic-session-1.0.0-alt-0.23-nix-loongarch64.patch (+14 lines)
	1	Bring support of loongarch64 to nix 0.23
	2
	3	diff --git a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
	4	index 68ebaba..d9a41f9 100644
	5	--- a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
	6	+++ b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
	7	@@ -34,6 +34,7 @@ mod consts {
	8	target_arch = "s390x",
	9	target_arch = "x86_64",
	10	target_arch = "aarch64",
	11	+ target_arch = "loongarch64",
	12	target_arch = "riscv64"))]
	13	mod consts {
	14	#[doc(hidden)]

Line 0 Link Here

(-)a/cosmic-session-1.0.0-alt-0.26-nix-loongarch64.patch (+15 lines)
	1	Bring support of loongarch64 to nix 0.26
	2
	3	diff --git a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs
	4	--- a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs
	5	+++ a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/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)]