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




diff --git a/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
index 68ebaba..e24a1fc 100644
--- a/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
+++ b/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
@@ -34,7 +34,8 @@ mod consts {
           target_arch = "s390x",
           target_arch = "x86_64",
           target_arch = "aarch64",
-          target_arch = "riscv64"))]
+          target_arch = "riscv64",
+          target_arch = "loongarch64"))]
 mod consts {
     #[doc(hidden)]
     pub const NONE: u8 = 0;




diff --git a/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
index 0c0a209..669d517 100644
--- a/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
+++ b/cosmic-session-1.0.0.alpha.4-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-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.4%beta	11	Release: alt0.0.port.4%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 65-70 Session manager for the COSMIC desktop environment. Link Here
65	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml	68	cargo vendor \| sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
66	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}	69	tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
67		70
		71	%patch -p2
		72	%patch1 -p2
		73	sed -i -e 's/"files":{[^}]*}/"files":{}/' \
		74	./vendor/nix-*/.cargo-checksum.json
		75
68	# fix path	76	# fix path
69	sed -i 's\|\/usr\(\/bin\/dbus-run-session\)\|\1\|' data/start-cosmic	77	sed -i 's\|\/usr\(\/bin\/dbus-run-session\)\|\1\|' data/start-cosmic
70		78
Lines 87-92 install -pD -m644 data/dconf/profile/cosmic %buildroot%_datadir/dconf/profile/co Link Here
87	%_datadir/wayland-sessions/cosmic.desktop	95	%_datadir/wayland-sessions/cosmic.desktop
88		96
89	%changelog	97	%changelog
		98	* Thu Dec 12 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.0.port.4.alpha.4
		99	- add two patches for old nix crate versions for loongarch64 build
		100
90	* Sat Dec 07 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.4.alpha.4	101	* Sat Dec 07 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.4.alpha.4
91	- updated to epoch-1.0.0-alpha.4-1-g78316ba	102	- updated to epoch-1.0.0-alpha.4-1-g78316ba
92		103

Return to bug 51325

Line 0 Link Here

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

Line 0 Link Here

(-)a/cosmic-session-1.0.0-alt-0.26-nix-loongarch64.patch (+14 lines)
	1	diff --git a/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	2	index 0c0a209..669d517 100644
	3	--- a/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	4	+++ b/cosmic-session-1.0.0.alpha.4-cargo/vendor/nix-0.26.4/src/sys/ioctl/linux.rs
	5	@@ -42,7 +42,8 @@ mod consts {
	6	target_arch = "x86_64",
	7	target_arch = "aarch64",
	8	target_arch = "riscv32",
	9	- target_arch = "riscv64"
	10	+ target_arch = "riscv64",
	11	+ target_arch = "loongarch64"
	12	))]
	13	mod consts {
	14	#[doc(hidden)]