* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
@ 2024-08-08 21:21 ` Calandracas606
2024-08-09 3:05 ` Calandracas606
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-08 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc **NO**
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
This is WIP, I haven't gotten it to compile and install yet.
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 12574 bytes --]
From 7bc548f58f18ff99eb5dd05848d72af19b00b306 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 248 ++++++++++++++++++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
21 files changed, 268 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..59af62d63caf24
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,248 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.1
+revision=1
+_tag="epoch-1.0.0-alpha.1"
+build_style=cargo
+hostmakedepends="pkg-config clang18 lld18"
+makedepends="wayland-devel MesaLib-devel libgbm-devel libseat-devel dbus-devel
+ libxkbcommon-devel elogind-devel pulseaudio-devel expat-devel fontconfig-devel
+ freetype-devel llvm18-devel pipewire-devel libinput-devel"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://system76.com/cosmic"
+distfiles="https://github.com/pop-os/cosmic-epoch/archive/refs/tags/${_tag}.tar.gz"
+subpackages="
+ cosmic-applets
+ cosmic-applibrary
+ cosmic-bg
+ cosmic-comp
+ cosmic-edit
+ cosmic-files
+ cosmic-greeter
+ cosmic-icons
+ cosmic-launcher
+ cosmic-notifications
+ cosmic-osd
+ cosmic-panel
+ cosmic-randr
+ cosmic-screenshot
+ cosmic-session
+ cosmic-settings-daemon
+ cosmic-store
+ cosmic-term
+ cosmic-workspaces-epoch
+ xdg-desktop-portal-cosmic
+"
+for _sub in $subpackages; do
+ local _tarball="${_sub}_${_tag}.tar.gz"
+ distfiles+=" https://github.com/pop-os/${_sub}/archive/refs/tags/${_tag}.tar.gz>${_tarball}"
+ skip_extraction+=" ${_tarball}"
+done
+
+checksum="ffce96bfab2ef39114c386ea91af9a5d055087e001ceb5fb44ca32e43f9f8829
+ be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+ 6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+ 6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+ 46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+ c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+ e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+ 408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+ 20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+ a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+ 6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+ a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
+ f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+ b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
+ 78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+ be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+ fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+ eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+ 3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+ d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+ ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516"
+
+post_extract() {
+ for _sub in $subpackages; do
+ vsrcextract -C $_sub "${_sub}_${_tag}.tar.gz"
+ done
+}
+
+do_build() {
+ for _sub in $subpackages; do
+ cd $_sub
+ cargo auditable build --release --locked --target ${RUST_TARGET} ${configure_args}
+ cd ../
+ done
+}
+
+do_install() {
+ #noop
+ $(:)
+}
+
+_cosmic_do_install() {
+ cargo auditable install --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
+ --offline --locked ${configure_args} --path .
+}
+
+cosmic-applets_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-applibrary_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-bg_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-comp_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-edit_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-files_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-greeter_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-icons_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-launcher_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-notifications_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-osd_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-panel_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-randr_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-screenshot_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-session_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-settings-daemon_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-store_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-term_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+cosmic-workspaces-epoch_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
+
+xdg-desktop-portal-cosmic_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ _cosmic_do_install
+ }
+}
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
2024-08-08 21:21 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-08-09 3:05 ` Calandracas606
2024-08-09 21:49 ` Calandracas606
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-09 3:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc **NO**
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
This is WIP, I haven't gotten it to compile and install yet.
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 12917 bytes --]
From 5e6ecd6484bdd59987e0b05263641758a0015d2d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 255 ++++++++++++++++++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 276 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..885fcb83aaa1d8
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,255 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.1
+revision=1
+_tag="epoch-1.0.0-alpha.1"
+build_style=cargo
+hostmakedepends="pkg-config clang18 lld18 just which mold"
+makedepends="wayland-devel MesaLib-devel libgbm-devel libseat-devel dbus-devel
+ libxkbcommon-devel elogind-devel pulseaudio-devel expat-devel fontconfig-devel
+ freetype-devel llvm18-devel pipewire-devel libinput-devel pixman-devel
+ oniguruma-devel libglib-devel pam-devel openssl-devel flatpak-devel"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://system76.com/cosmic"
+distfiles="https://github.com/pop-os/cosmic-epoch/archive/refs/tags/${_tag}.tar.gz"
+subpackages="
+ cosmic-applets
+ cosmic-applibrary
+ cosmic-bg
+ cosmic-comp
+ cosmic-edit
+ cosmic-files
+ cosmic-greeter
+ cosmic-icons
+ cosmic-launcher
+ cosmic-notifications
+ cosmic-osd
+ cosmic-panel
+ cosmic-randr
+ cosmic-screenshot
+ cosmic-session
+ cosmic-settings
+ cosmic-settings-daemon
+ cosmic-store
+ cosmic-term
+ cosmic-workspaces-epoch
+ xdg-desktop-portal-cosmic
+"
+depends=$subpackages
+
+for _sub in $subpackages; do
+ local _tarball="${_sub}_${_tag}.tar.gz"
+ distfiles+=" https://github.com/pop-os/${_sub}/archive/refs/tags/${_tag}.tar.gz>${_tarball}"
+ skip_extraction+=" ${_tarball}"
+done
+
+checksum="ffce96bfab2ef39114c386ea91af9a5d055087e001ceb5fb44ca32e43f9f8829
+ be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+ 6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+ 6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+ 46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+ c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+ e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+ 408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+ 20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+ a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+ 6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+ a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
+ f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+ b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
+ 78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+ be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+ eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+ fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+ eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+ 3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+ d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+ ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516"
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+post_extract() {
+ for _sub in $subpackages; do
+ vsrcextract -C $_sub "${_sub}_${_tag}.tar.gz"
+ done
+}
+
+do_build() {
+ just build
+}
+
+do_install() {
+ #noop
+ :
+}
+
+cosmic-applets_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-applibrary_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-bg_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-comp_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-edit_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-files_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-greeter_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-icons_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-launcher_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-notifications_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-osd_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-panel_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-randr_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-screenshot_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-session_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-settings-daemon_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-store_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-term_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-workspaces-epoch_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+xdg-desktop-portal-cosmic_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
+
+cosmic-settings_package() {
+ short_desc+=" - ${pkgname}"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}
+ just install
+ }
+}
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
2024-08-08 21:21 ` [PR PATCH] [Updated] " Calandracas606
2024-08-09 3:05 ` Calandracas606
@ 2024-08-09 21:49 ` Calandracas606
2024-08-09 21:50 ` Calandracas606
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-09 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc **NO**
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
This is WIP, I haven't gotten it to compile and install yet.
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 11997 bytes --]
From 2b4faf35870dbe8e93a84abceb8a35b44157c332 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 142 ++++++++++++++++++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 163 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..3c44ea4e091bfe
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,142 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+_submodules="
+ cosmic-applets
+ cosmic-applibrary
+ cosmic-bg
+ cosmic-comp
+ cosmic-edit
+ cosmic-files
+ cosmic-greeter
+ cosmic-icons
+ cosmic-launcher
+ cosmic-notifications
+ cosmic-osd
+ cosmic-panel
+ cosmic-randr
+ cosmic-screenshot
+ cosmic-session
+ cosmic-settings
+ cosmic-settings-daemon
+ cosmic-store
+ cosmic-term
+ cosmic-workspaces-epoch
+ xdg-desktop-portal-cosmic
+"
+build_style=cargo
+hostmakedepends="pkg-config clang18 lld18 just which mold"
+makedepends="wayland-devel MesaLib-devel libgbm-devel libseat-devel dbus-devel
+ libxkbcommon-devel elogind-devel pulseaudio-devel expat-devel fontconfig-devel
+ freetype-devel llvm18-devel pipewire-devel libinput-devel pixman-devel
+ oniguruma-devel libglib-devel pam-devel openssl-devel flatpak-devel libxml2-devel"
+depends=$_submodules
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only, custom:TRADEMARK"
+homepage="https://system76.com/cosmic"
+distfiles="https://github.com/pop-os/cosmic-epoch/archive/refs/tags/${_tag}.tar.gz"
+subpackages=$_submodules
+make_check=no # no cargo in wrksrc
+
+for _sub in $_submodules; do
+ local _tarball="${_sub}_${_tag}.tar.gz"
+ distfiles+=" https://github.com/pop-os/${_sub}/archive/refs/tags/${_tag}.tar.gz>${_tarball}"
+ skip_extraction+=" ${_tarball}"
+done
+
+checksum="ffce96bfab2ef39114c386ea91af9a5d055087e001ceb5fb44ca32e43f9f8829
+ be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+ 6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+ 6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+ 46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+ c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+ e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+ 408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+ 20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+ a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+ 6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+ a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
+ f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+ b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
+ 78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+ be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+ eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+ fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+ eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+ 3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+ d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+ ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516"
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+post_extract() {
+ for _sub in $_submodules; do
+ vsrcextract -C $_sub "${_sub}_${_tag}.tar.gz"
+ done
+}
+
+do_build() {
+ just build
+}
+
+do_install() {
+ #noop
+ :
+}
+
+post_install() {
+ vlicense TRADEMARK.md
+}
+
+_cosmic_install() {
+
+ cd ${wrksrc}/${pkgname}
+ local _make_install_cmd="make install"
+ local _just_install_cmd="just --set rootdir ${PKGDESTDIR} --set prefix /usr install"
+
+ declare -A _install_cmd=(
+ ["cosmic-applets"]="just --set rootdir ${PKGDESTDIR} --set prefix /usr --set cosmic-applets-bin cosmic-applets install"
+ ["cosmic-applibrary"]="${_just_install_cmd}"
+ ["cosmic-bg"]="${_just_install_cmd}"
+ ["cosmic-comp"]="${_make_install_cmd}"
+ ["cosmic-edit"]="${_just_install_cmd}"
+ ["cosmic-files"]="${_just_install_cmd}"
+ ["cosmic-greeter"]="${_just_install_cmd}"
+ ["cosmic-icons"]="${_just_install_cmd}"
+ ["cosmic-launcher"]="${_just_install_cmd}"
+ ["cosmic-notifications"]="${_just_install_cmd}"
+ ["cosmic-osd"]="${_make_install_cmd}"
+ ["cosmic-panel"]="${_just_install_cmd}"
+ ["cosmic-randr"]="${_just_install_cmd}"
+ ["cosmic-screenshot"]="${_just_install_cmd}"
+ ["cosmic-session"]="just --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install"
+ ["cosmic-settings"]="${_just_install_cmd}"
+ ["cosmic-settings-daemon"]="${_make_install_cmd}"
+ ["cosmic-store"]="${_just_install_cmd}"
+ ["cosmic-term"]="${_just_install_cmd}"
+ ["cosmic-workspaces-epoch"]="${_make_install_cmd}"
+ ["xdg-desktop-portal-cosmic"]="${_make_install_cmd}"
+ )
+
+ PREFIX=/usr \
+ prefix=/usr \
+ DESTDIR="${PKGDESTDIR}" \
+ destdir="${PKGDESTDIR}" \
+ ROOTDIR="${PKGDESTDIR}" \
+ rootdir="${PKGDESTDIR}" \
+ ${_install_cmd[$pkgname]}
+
+}
+
+for _sub in $_submodules; do
+ eval "${_sub}_package() {
+ short_desc+=\" - ${_sub}\"
+ pkg_install() {
+ _cosmic_install
+ }
+ };"
+done
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (2 preceding siblings ...)
2024-08-09 21:49 ` Calandracas606
@ 2024-08-09 21:50 ` Calandracas606
2024-08-09 21:59 ` Calandracas606
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-09 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc **NO**
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
This is WIP, I haven't gotten it to compile and install yet.
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 11997 bytes --]
From dcc0f8fd48f79d8d5af0674fafccb8554602d603 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 142 ++++++++++++++++++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 163 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..3c44ea4e091bfe
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,142 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+_submodules="
+ cosmic-applets
+ cosmic-applibrary
+ cosmic-bg
+ cosmic-comp
+ cosmic-edit
+ cosmic-files
+ cosmic-greeter
+ cosmic-icons
+ cosmic-launcher
+ cosmic-notifications
+ cosmic-osd
+ cosmic-panel
+ cosmic-randr
+ cosmic-screenshot
+ cosmic-session
+ cosmic-settings
+ cosmic-settings-daemon
+ cosmic-store
+ cosmic-term
+ cosmic-workspaces-epoch
+ xdg-desktop-portal-cosmic
+"
+build_style=cargo
+hostmakedepends="pkg-config clang18 lld18 just which mold"
+makedepends="wayland-devel MesaLib-devel libgbm-devel libseat-devel dbus-devel
+ libxkbcommon-devel elogind-devel pulseaudio-devel expat-devel fontconfig-devel
+ freetype-devel llvm18-devel pipewire-devel libinput-devel pixman-devel
+ oniguruma-devel libglib-devel pam-devel openssl-devel flatpak-devel libxml2-devel"
+depends=$_submodules
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only, custom:TRADEMARK"
+homepage="https://system76.com/cosmic"
+distfiles="https://github.com/pop-os/cosmic-epoch/archive/refs/tags/${_tag}.tar.gz"
+subpackages=$_submodules
+make_check=no # no cargo in wrksrc
+
+for _sub in $_submodules; do
+ local _tarball="${_sub}_${_tag}.tar.gz"
+ distfiles+=" https://github.com/pop-os/${_sub}/archive/refs/tags/${_tag}.tar.gz>${_tarball}"
+ skip_extraction+=" ${_tarball}"
+done
+
+checksum="ffce96bfab2ef39114c386ea91af9a5d055087e001ceb5fb44ca32e43f9f8829
+ be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+ 6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+ 6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+ 46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+ c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+ e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+ 408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+ 20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+ a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+ 6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+ a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
+ f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+ b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
+ 78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+ be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+ eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+ fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+ eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+ 3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+ d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+ ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516"
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+post_extract() {
+ for _sub in $_submodules; do
+ vsrcextract -C $_sub "${_sub}_${_tag}.tar.gz"
+ done
+}
+
+do_build() {
+ just build
+}
+
+do_install() {
+ #noop
+ :
+}
+
+post_install() {
+ vlicense TRADEMARK.md
+}
+
+_cosmic_install() {
+
+ cd ${wrksrc}/${pkgname}
+ local _make_install_cmd="make install"
+ local _just_install_cmd="just --set rootdir ${PKGDESTDIR} --set prefix /usr install"
+
+ declare -A _install_cmd=(
+ ["cosmic-applets"]="just --set rootdir ${PKGDESTDIR} --set prefix /usr --set cosmic-applets-bin cosmic-applets install"
+ ["cosmic-applibrary"]="${_just_install_cmd}"
+ ["cosmic-bg"]="${_just_install_cmd}"
+ ["cosmic-comp"]="${_make_install_cmd}"
+ ["cosmic-edit"]="${_just_install_cmd}"
+ ["cosmic-files"]="${_just_install_cmd}"
+ ["cosmic-greeter"]="${_just_install_cmd}"
+ ["cosmic-icons"]="${_just_install_cmd}"
+ ["cosmic-launcher"]="${_just_install_cmd}"
+ ["cosmic-notifications"]="${_just_install_cmd}"
+ ["cosmic-osd"]="${_make_install_cmd}"
+ ["cosmic-panel"]="${_just_install_cmd}"
+ ["cosmic-randr"]="${_just_install_cmd}"
+ ["cosmic-screenshot"]="${_just_install_cmd}"
+ ["cosmic-session"]="just --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install"
+ ["cosmic-settings"]="${_just_install_cmd}"
+ ["cosmic-settings-daemon"]="${_make_install_cmd}"
+ ["cosmic-store"]="${_just_install_cmd}"
+ ["cosmic-term"]="${_just_install_cmd}"
+ ["cosmic-workspaces-epoch"]="${_make_install_cmd}"
+ ["xdg-desktop-portal-cosmic"]="${_make_install_cmd}"
+ )
+
+ PREFIX=/usr \
+ prefix=/usr \
+ DESTDIR="${PKGDESTDIR}" \
+ destdir="${PKGDESTDIR}" \
+ ROOTDIR="${PKGDESTDIR}" \
+ rootdir="${PKGDESTDIR}" \
+ ${_install_cmd[$pkgname]}
+
+}
+
+for _sub in $_submodules; do
+ eval "${_sub}_package() {
+ short_desc+=\" - ${_sub}\"
+ pkg_install() {
+ _cosmic_install
+ }
+ };"
+done
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (3 preceding siblings ...)
2024-08-09 21:50 ` Calandracas606
@ 2024-08-09 21:59 ` Calandracas606
2024-08-09 23:05 ` [PR PATCH] [Updated] " Calandracas606
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-09 21:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51735#issuecomment-2278806123
Comment:
it builds and installs on glibc
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (4 preceding siblings ...)
2024-08-09 21:59 ` Calandracas606
@ 2024-08-09 23:05 ` Calandracas606
2024-08-09 23:21 ` Calandracas606
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-09 23:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 18828 bytes --]
From 807262169930d154f238f7f47a7548b702f8a105 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/patches/systemd.patch | 179 +++++++++++++++++++
srcpkgs/COSMIC-Desktop/template | 146 +++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
23 files changed, 346 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/patches/systemd.patch
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/patches/systemd.patch b/srcpkgs/COSMIC-Desktop/patches/systemd.patch
new file mode 100644
index 00000000000000..951af052b597dd
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/patches/systemd.patch
@@ -0,0 +1,179 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/cosmic-session/Cargo.toml
++++ b/cosmic-session/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 6e426f471170f7897b276c1a37515abbc73f1986 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..7953d0d 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -44,17 +44,27 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
+- .try_init()
+- .wrap_err("failed to initialize logger")?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..44108fe546a59d
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,146 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+_submodules="
+ cosmic-applets
+ cosmic-applibrary
+ cosmic-bg
+ cosmic-comp
+ cosmic-edit
+ cosmic-files
+ cosmic-greeter
+ cosmic-icons
+ cosmic-launcher
+ cosmic-notifications
+ cosmic-osd
+ cosmic-panel
+ cosmic-randr
+ cosmic-screenshot
+ cosmic-session
+ cosmic-settings
+ cosmic-settings-daemon
+ cosmic-store
+ cosmic-term
+ cosmic-workspaces-epoch
+ xdg-desktop-portal-cosmic
+"
+build_style=cargo
+hostmakedepends="pkg-config clang18 lld18 just which"
+makedepends="wayland-devel MesaLib-devel libgbm-devel libseat-devel dbus-devel
+ libxkbcommon-devel elogind-devel pulseaudio-devel expat-devel fontconfig-devel
+ freetype-devel llvm18-devel pipewire-devel libinput-devel pixman-devel
+ oniguruma-devel libglib-devel pam-devel openssl-devel flatpak-devel libxml2-devel"
+depends=$_submodules
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only, custom:TRADEMARK"
+homepage="https://system76.com/cosmic"
+distfiles="https://github.com/pop-os/cosmic-epoch/archive/refs/tags/${_tag}.tar.gz"
+subpackages=$_submodules
+make_check=no # no cargo in wrksrc
+
+for _sub in $_submodules; do
+ local _tarball="${_sub}_${_tag}.tar.gz"
+ distfiles+=" https://github.com/pop-os/${_sub}/archive/refs/tags/${_tag}.tar.gz>${_tarball}"
+ skip_extraction+=" ${_tarball}"
+done
+
+checksum="ffce96bfab2ef39114c386ea91af9a5d055087e001ceb5fb44ca32e43f9f8829
+ be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+ 6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+ 6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+ 46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+ c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+ e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+ 408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+ 20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+ a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+ 6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+ a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
+ f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+ b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
+ 78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+ be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+ eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+ fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+ eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+ 3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+ d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+ ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516"
+
+if [ -z "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mold"
+fi
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+post_extract() {
+ for _sub in $_submodules; do
+ vsrcextract -C $_sub "${_sub}_${_tag}.tar.gz"
+ done
+}
+
+do_build() {
+ just build
+}
+
+do_install() {
+ #noop
+ :
+}
+
+post_install() {
+ vlicense TRADEMARK.md
+}
+
+_cosmic_install() {
+
+ cd ${wrksrc}/${pkgname}
+ local _make_install_cmd="make install"
+ local _just_install_cmd="just --set rootdir ${PKGDESTDIR} --set prefix /usr install"
+
+ declare -A _install_cmd=(
+ ["cosmic-applets"]="just --set rootdir ${PKGDESTDIR} --set prefix /usr --set cosmic-applets-bin cosmic-applets install"
+ ["cosmic-applibrary"]="${_just_install_cmd}"
+ ["cosmic-bg"]="${_just_install_cmd}"
+ ["cosmic-comp"]="${_make_install_cmd}"
+ ["cosmic-edit"]="${_just_install_cmd}"
+ ["cosmic-files"]="${_just_install_cmd}"
+ ["cosmic-greeter"]="${_just_install_cmd}"
+ ["cosmic-icons"]="${_just_install_cmd}"
+ ["cosmic-launcher"]="${_just_install_cmd}"
+ ["cosmic-notifications"]="${_just_install_cmd}"
+ ["cosmic-osd"]="${_make_install_cmd}"
+ ["cosmic-panel"]="${_just_install_cmd}"
+ ["cosmic-randr"]="${_just_install_cmd}"
+ ["cosmic-screenshot"]="${_just_install_cmd}"
+ ["cosmic-session"]="just --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install"
+ ["cosmic-settings"]="${_just_install_cmd}"
+ ["cosmic-settings-daemon"]="${_make_install_cmd}"
+ ["cosmic-store"]="${_just_install_cmd}"
+ ["cosmic-term"]="${_just_install_cmd}"
+ ["cosmic-workspaces-epoch"]="${_make_install_cmd}"
+ ["xdg-desktop-portal-cosmic"]="${_make_install_cmd}"
+ )
+
+ PREFIX=/usr \
+ prefix=/usr \
+ DESTDIR="${PKGDESTDIR}" \
+ destdir="${PKGDESTDIR}" \
+ ROOTDIR="${PKGDESTDIR}" \
+ rootdir="${PKGDESTDIR}" \
+ ${_install_cmd[$pkgname]}
+
+}
+
+for _sub in $_submodules; do
+ eval "${_sub}_package() {
+ short_desc+=\" - ${_sub}\"
+ pkg_install() {
+ _cosmic_install
+ }
+ };"
+done
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (5 preceding siblings ...)
2024-08-09 23:05 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-08-09 23:21 ` Calandracas606
2024-08-09 23:35 ` [PR PATCH] [Updated] " Calandracas606
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-09 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
New comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51735#issuecomment-2278870928
Comment:
I've tested some applets, and they seem to be working.
Unfortunately, `cosmic-session`, does not work, as it crashes immediately after being unable to connect to journald
https://github.com/pop-os/cosmic-session/pull/59
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (6 preceding siblings ...)
2024-08-09 23:21 ` Calandracas606
@ 2024-08-09 23:35 ` Calandracas606
2024-08-10 0:22 ` Calandracas606
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-09 23:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 18915 bytes --]
From d7e6203e10b2baf612d0631c03370e5ec095aaa8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/patches/systemd.patch | 179 +++++++++++++++++++
srcpkgs/COSMIC-Desktop/template | 150 ++++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
23 files changed, 350 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/patches/systemd.patch
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/patches/systemd.patch b/srcpkgs/COSMIC-Desktop/patches/systemd.patch
new file mode 100644
index 00000000000000..951af052b597dd
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/patches/systemd.patch
@@ -0,0 +1,179 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/cosmic-session/Cargo.toml
++++ b/cosmic-session/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 6e426f471170f7897b276c1a37515abbc73f1986 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..7953d0d 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -44,17 +44,27 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
+- .try_init()
+- .wrap_err("failed to initialize logger")?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..61da04e4253266
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,150 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+_submodules="
+ cosmic-applets
+ cosmic-applibrary
+ cosmic-bg
+ cosmic-comp
+ cosmic-edit
+ cosmic-files
+ cosmic-greeter
+ cosmic-icons
+ cosmic-launcher
+ cosmic-notifications
+ cosmic-osd
+ cosmic-panel
+ cosmic-randr
+ cosmic-screenshot
+ cosmic-session
+ cosmic-settings
+ cosmic-settings-daemon
+ cosmic-store
+ cosmic-term
+ cosmic-workspaces-epoch
+ xdg-desktop-portal-cosmic
+"
+build_style=cargo
+hostmakedepends="pkg-config clang18 lld18 just which"
+makedepends="wayland-devel MesaLib-devel libgbm-devel libseat-devel dbus-devel
+ libxkbcommon-devel elogind-devel pulseaudio-devel expat-devel fontconfig-devel
+ freetype-devel llvm18-devel pipewire-devel libinput-devel pixman-devel
+ oniguruma-devel libglib-devel pam-devel openssl-devel flatpak-devel libxml2-devel"
+depends=$_submodules
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only, custom:TRADEMARK"
+homepage="https://system76.com/cosmic"
+distfiles="https://github.com/pop-os/cosmic-epoch/archive/refs/tags/${_tag}.tar.gz"
+subpackages=$_submodules
+make_check=no # no cargo in wrksrc
+
+for _sub in $_submodules; do
+ local _tarball="${_sub}_${_tag}.tar.gz"
+ distfiles+=" https://github.com/pop-os/${_sub}/archive/refs/tags/${_tag}.tar.gz>${_tarball}"
+ skip_extraction+=" ${_tarball}"
+done
+
+checksum="ffce96bfab2ef39114c386ea91af9a5d055087e001ceb5fb44ca32e43f9f8829
+ be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+ 6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+ 6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+ 46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+ c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+ e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+ 408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+ 20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+ a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+ 6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+ a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
+ f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+ b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
+ 78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+ be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+ eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+ fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+ eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+ 3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+ d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+ ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516"
+
+if [ -z "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mold"
+fi
+
+if [ "$XBPS_WORDSIZE" = "32"]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+post_extract() {
+ for _sub in $_submodules; do
+ vsrcextract -C $_sub "${_sub}_${_tag}.tar.gz"
+ done
+}
+
+do_build() {
+ just build
+}
+
+do_install() {
+ #noop
+ :
+}
+
+post_install() {
+ vlicense TRADEMARK.md
+}
+
+_cosmic_install() {
+
+ cd ${wrksrc}/${pkgname}
+ local _make_install_cmd="make install"
+ local _just_install_cmd="just --set rootdir ${PKGDESTDIR} --set prefix /usr install"
+
+ declare -A _install_cmd=(
+ ["cosmic-applets"]="just --set rootdir ${PKGDESTDIR} --set prefix /usr --set cosmic-applets-bin cosmic-applets install"
+ ["cosmic-applibrary"]="${_just_install_cmd}"
+ ["cosmic-bg"]="${_just_install_cmd}"
+ ["cosmic-comp"]="${_make_install_cmd}"
+ ["cosmic-edit"]="${_just_install_cmd}"
+ ["cosmic-files"]="${_just_install_cmd}"
+ ["cosmic-greeter"]="${_just_install_cmd}"
+ ["cosmic-icons"]="${_just_install_cmd}"
+ ["cosmic-launcher"]="${_just_install_cmd}"
+ ["cosmic-notifications"]="${_just_install_cmd}"
+ ["cosmic-osd"]="${_make_install_cmd}"
+ ["cosmic-panel"]="${_just_install_cmd}"
+ ["cosmic-randr"]="${_just_install_cmd}"
+ ["cosmic-screenshot"]="${_just_install_cmd}"
+ ["cosmic-session"]="just --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install"
+ ["cosmic-settings"]="${_just_install_cmd}"
+ ["cosmic-settings-daemon"]="${_make_install_cmd}"
+ ["cosmic-store"]="${_just_install_cmd}"
+ ["cosmic-term"]="${_just_install_cmd}"
+ ["cosmic-workspaces-epoch"]="${_make_install_cmd}"
+ ["xdg-desktop-portal-cosmic"]="${_make_install_cmd}"
+ )
+
+ PREFIX=/usr \
+ prefix=/usr \
+ DESTDIR="${PKGDESTDIR}" \
+ destdir="${PKGDESTDIR}" \
+ ROOTDIR="${PKGDESTDIR}" \
+ rootdir="${PKGDESTDIR}" \
+ ${_install_cmd[$pkgname]}
+
+}
+
+for _sub in $_submodules; do
+ eval "${_sub}_package() {
+ short_desc+=\" - ${_sub}\"
+ pkg_install() {
+ _cosmic_install
+ }
+ };"
+done
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (7 preceding siblings ...)
2024-08-09 23:35 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-08-10 0:22 ` Calandracas606
2024-08-11 2:09 ` Calandracas606
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-10 0:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 18916 bytes --]
From 03da08c681a861e92d84a0b8996a7db2da74d1c7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/patches/systemd.patch | 179 +++++++++++++++++++
srcpkgs/COSMIC-Desktop/template | 150 ++++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
23 files changed, 350 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/patches/systemd.patch
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/patches/systemd.patch b/srcpkgs/COSMIC-Desktop/patches/systemd.patch
new file mode 100644
index 00000000000000..951af052b597dd
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/patches/systemd.patch
@@ -0,0 +1,179 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/cosmic-session/Cargo.toml
++++ b/cosmic-session/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 6e426f471170f7897b276c1a37515abbc73f1986 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..7953d0d 100644
+--- a/cosmic-session/src/main.rs
++++ b/cosmic-session/src/main.rs
+@@ -44,17 +44,27 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
+- .try_init()
+- .wrap_err("failed to initialize logger")?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..6c775586df3129
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,150 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+_submodules="
+ cosmic-applets
+ cosmic-applibrary
+ cosmic-bg
+ cosmic-comp
+ cosmic-edit
+ cosmic-files
+ cosmic-greeter
+ cosmic-icons
+ cosmic-launcher
+ cosmic-notifications
+ cosmic-osd
+ cosmic-panel
+ cosmic-randr
+ cosmic-screenshot
+ cosmic-session
+ cosmic-settings
+ cosmic-settings-daemon
+ cosmic-store
+ cosmic-term
+ cosmic-workspaces-epoch
+ xdg-desktop-portal-cosmic
+"
+build_style=cargo
+hostmakedepends="pkg-config clang18 lld18 just which"
+makedepends="wayland-devel MesaLib-devel libgbm-devel libseat-devel dbus-devel
+ libxkbcommon-devel elogind-devel pulseaudio-devel expat-devel fontconfig-devel
+ freetype-devel llvm18-devel pipewire-devel libinput-devel pixman-devel
+ oniguruma-devel libglib-devel pam-devel openssl-devel flatpak-devel libxml2-devel"
+depends=$_submodules
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only, custom:TRADEMARK"
+homepage="https://system76.com/cosmic"
+distfiles="https://github.com/pop-os/cosmic-epoch/archive/refs/tags/${_tag}.tar.gz"
+subpackages=$_submodules
+make_check=no # no cargo in wrksrc
+
+for _sub in $_submodules; do
+ local _tarball="${_sub}_${_tag}.tar.gz"
+ distfiles+=" https://github.com/pop-os/${_sub}/archive/refs/tags/${_tag}.tar.gz>${_tarball}"
+ skip_extraction+=" ${_tarball}"
+done
+
+checksum="ffce96bfab2ef39114c386ea91af9a5d055087e001ceb5fb44ca32e43f9f8829
+ be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+ 6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+ 6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+ 46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+ c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+ e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+ 408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+ 20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+ a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+ 6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+ a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
+ f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+ b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
+ 78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+ be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+ eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+ fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+ eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+ 3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+ d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+ ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516"
+
+if [ -z "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mold"
+fi
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+post_extract() {
+ for _sub in $_submodules; do
+ vsrcextract -C $_sub "${_sub}_${_tag}.tar.gz"
+ done
+}
+
+do_build() {
+ just build
+}
+
+do_install() {
+ #noop
+ :
+}
+
+post_install() {
+ vlicense TRADEMARK.md
+}
+
+_cosmic_install() {
+
+ cd ${wrksrc}/${pkgname}
+ local _make_install_cmd="make install"
+ local _just_install_cmd="just --set rootdir ${PKGDESTDIR} --set prefix /usr install"
+
+ declare -A _install_cmd=(
+ ["cosmic-applets"]="just --set rootdir ${PKGDESTDIR} --set prefix /usr --set cosmic-applets-bin cosmic-applets install"
+ ["cosmic-applibrary"]="${_just_install_cmd}"
+ ["cosmic-bg"]="${_just_install_cmd}"
+ ["cosmic-comp"]="${_make_install_cmd}"
+ ["cosmic-edit"]="${_just_install_cmd}"
+ ["cosmic-files"]="${_just_install_cmd}"
+ ["cosmic-greeter"]="${_just_install_cmd}"
+ ["cosmic-icons"]="${_just_install_cmd}"
+ ["cosmic-launcher"]="${_just_install_cmd}"
+ ["cosmic-notifications"]="${_just_install_cmd}"
+ ["cosmic-osd"]="${_make_install_cmd}"
+ ["cosmic-panel"]="${_just_install_cmd}"
+ ["cosmic-randr"]="${_just_install_cmd}"
+ ["cosmic-screenshot"]="${_just_install_cmd}"
+ ["cosmic-session"]="just --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install"
+ ["cosmic-settings"]="${_just_install_cmd}"
+ ["cosmic-settings-daemon"]="${_make_install_cmd}"
+ ["cosmic-store"]="${_just_install_cmd}"
+ ["cosmic-term"]="${_just_install_cmd}"
+ ["cosmic-workspaces-epoch"]="${_make_install_cmd}"
+ ["xdg-desktop-portal-cosmic"]="${_make_install_cmd}"
+ )
+
+ PREFIX=/usr \
+ prefix=/usr \
+ DESTDIR="${PKGDESTDIR}" \
+ destdir="${PKGDESTDIR}" \
+ ROOTDIR="${PKGDESTDIR}" \
+ rootdir="${PKGDESTDIR}" \
+ ${_install_cmd[$pkgname]}
+
+}
+
+for _sub in $_submodules; do
+ eval "${_sub}_package() {
+ short_desc+=\" - ${_sub}\"
+ pkg_install() {
+ _cosmic_install
+ }
+ };"
+done
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (8 preceding siblings ...)
2024-08-10 0:22 ` Calandracas606
@ 2024-08-11 2:09 ` Calandracas606
2024-08-11 4:18 ` Calandracas606
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-11 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1460 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 52766 bytes --]
From 1752c0e5efd07d033f2a19fe0167fa8c17c343c1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH 01/22] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 14 ++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 35 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..872f184f0baaed
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,14 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+build_style=meta
+depends="cosmic-applets cosmic-applibrary cosmic-bg cosmic-comp cosmic-edit
+ cosmic-files cosmic-greeter cosmic-icons cosmic-launcher cosmic-notifications
+ cosmic-osd cosmic-panel cosmic-randr cosmic-screenshot cosmic-session
+ cosmic-settings cosmic-settings-daemon cosmic-store cosmic-term
+ cosmic-workspaces-epoch xdg-desktop-portal-cosmic"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Public Domain"
+homepage="https://system76.com/cosmic"
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
From cdffa08da4b0efc397f959505161fef5e7e07ccc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:26:22 -0400
Subject: [PATCH 02/22] New package: cosmic-bg-1.0.0.alpha.1
---
srcpkgs/cosmic-bg | 1 -
srcpkgs/cosmic-bg/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-bg
create mode 100644 srcpkgs/cosmic-bg/template
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-bg
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg/template b/srcpkgs/cosmic-bg/template
new file mode 100644
index 00000000000000..a79027a7bbf73c
--- /dev/null
+++ b/srcpkgs/cosmic-bg/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-bg'
+pkgname=cosmic-bg
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-bg short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-bg"
+distfiles="https://github.com/pop-os/cosmic-bg/archive/refs/tags/${_tag}.tar.gz"
+checksum=6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 2210a93fd9c5c39473fc7af625dd2069668a7f8d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:51:36 -0400
Subject: [PATCH 03/22] New package: cosmic-applets-1.0.0.alpha.1
---
srcpkgs/cosmic-applets | 1 -
srcpkgs/cosmic-applets/template | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applets
create mode 100644 srcpkgs/cosmic-applets/template
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applets
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applets/template b/srcpkgs/cosmic-applets/template
new file mode 100644
index 00000000000000..662f4b519be4aa
--- /dev/null
+++ b/srcpkgs/cosmic-applets/template
@@ -0,0 +1,23 @@
+# Template file for 'cosmic-applets'
+pkgname=cosmic-applets
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel dbus-devel pulseaudio-devel libinput-devel"
+short_desc="TODO: cosmic-applets short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applets"
+distfiles="https://github.com/pop-os/cosmic-applets/archive/refs/tags/${_tag}.tar.gz"
+checksum=be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+do_install() {
+ just --set targetdir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} \
+ --set prefix /usr --set cosmic-applets-bin cosmic-applets install
+}
From 99c738118a75c56ee8d73015fd617f0f83caf799 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:56:31 -0400
Subject: [PATCH 04/22] New package: cosmic-applibrary-1.0.0.alpha.1
---
srcpkgs/cosmic-applibrary | 1 -
srcpkgs/cosmic-applibrary/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applibrary
create mode 100644 srcpkgs/cosmic-applibrary/template
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applibrary
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary/template b/srcpkgs/cosmic-applibrary/template
new file mode 100644
index 00000000000000..8da931e7bb7d70
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-applibrary'
+pkgname=cosmic-applibrary
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-applibrary short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applibrary"
+distfiles="https://github.com/pop-os/cosmic-applibrary/archive/refs/tags/${_tag}.tar.gz"
+checksum=6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 06086c237564bf0bc887ec07162074bdd772b47d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:24:22 -0400
Subject: [PATCH 05/22] New package: cosmic-comp-1.0.0.alpha.1
---
srcpkgs/cosmic-comp | 1 -
srcpkgs/cosmic-comp/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-comp
create mode 100644 srcpkgs/cosmic-comp/template
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-comp
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
new file mode 100644
index 00000000000000..61c577e384510d
--- /dev/null
+++ b/srcpkgs/cosmic-comp/template
@@ -0,0 +1,20 @@
+# Template file for 'cosmic-comp'
+pkgname=cosmic-comp
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libseat-devel libxkbcommon-devel libinput-devel
+ pixman-devel libgbm-devel"
+short_desc="TODO: cosmic-comp short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-comp"
+distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.gz"
+checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+
+do_install() {
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} \
+ make install-bare-session
+}
From 1da3b6cb4bf4a046358e631c2a697f46d91c5a54 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:30:31 -0400
Subject: [PATCH 06/22] New package: cosmic-edit-1.0.0.alpha.1
---
srcpkgs/cosmic-edit | 1 -
srcpkgs/cosmic-edit/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-edit
create mode 100644 srcpkgs/cosmic-edit/template
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-edit
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit/template b/srcpkgs/cosmic-edit/template
new file mode 100644
index 00000000000000..b7039c34389227
--- /dev/null
+++ b/srcpkgs/cosmic-edit/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-edit'
+pkgname=cosmic-edit
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel oniguruma-devel"
+short_desc="TODO: cosmic-edit short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-edit"
+distfiles="https://github.com/pop-os/cosmic-edit/archive/refs/tags/${_tag}.tar.gz"
+checksum=c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From f9eac15bb8b4b1531e4516ce7191b0670e63ea59 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:37:24 -0400
Subject: [PATCH 07/22] New package: cosmic-files-1.0.0.alpha.1
---
srcpkgs/cosmic-files | 1 -
srcpkgs/cosmic-files/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-files
create mode 100644 srcpkgs/cosmic-files/template
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-files
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files/template b/srcpkgs/cosmic-files/template
new file mode 100644
index 00000000000000..463c7934f2768b
--- /dev/null
+++ b/srcpkgs/cosmic-files/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-files'
+pkgname=cosmic-files
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel libglib-devel"
+short_desc="TODO: cosmic-files short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-files"
+distfiles="https://github.com/pop-os/cosmic-files/archive/refs/tags/${_tag}.tar.gz"
+checksum=e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 940a14d329f0b7b3687ae795203c695845bcca0f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 01:31:38 -0400
Subject: [PATCH 08/22] New package: cosmic-greeter-1.0.0.alpha.1
---
srcpkgs/cosmic-greeter | 1 -
srcpkgs/cosmic-greeter/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-greeter
create mode 100644 srcpkgs/cosmic-greeter/template
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-greeter
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter/template b/srcpkgs/cosmic-greeter/template
new file mode 100644
index 00000000000000..44e315e754e9a9
--- /dev/null
+++ b/srcpkgs/cosmic-greeter/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-greeter'
+pkgname=cosmic-greeter
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+configure_args=" --all"
+hostmakedepends="pkg-config just llvm18 clang18"
+makedepends="libxkbcommon-devel llvm18-devel eudev-libudev-devel pam-devel libinput-devel"
+short_desc="TODO: cosmic-greeter short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-greeter"
+distfiles="https://github.com/pop-os/cosmic-greeter/archive/refs/tags/${_tag}.tar.gz"
+checksum=408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 7ae1d29d7c23356e449048d36647afd45f72c957 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:47:42 -0400
Subject: [PATCH 09/22] New package: cosmic-icons-1.0.0.alpha.1
---
srcpkgs/cosmic-icons | 1 -
srcpkgs/cosmic-icons/template | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-icons
create mode 100644 srcpkgs/cosmic-icons/template
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-icons
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons/template b/srcpkgs/cosmic-icons/template
new file mode 100644
index 00000000000000..476ab867e57324
--- /dev/null
+++ b/srcpkgs/cosmic-icons/template
@@ -0,0 +1,16 @@
+# Template file for 'cosmic-icons'
+pkgname=cosmic-icons
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+hostmakedepends="just"
+short_desc="TODO: cosmic-icons short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-icons"
+distfiles="https://github.com/pop-os/cosmic-icons/archive/refs/tags/${_tag}.tar.gz"
+checksum=20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+
+do_install() {
+ just --set rootdir ${DESTDIR} --set prefix /usr install
+}
From aeb4068d4763b6b0f3ee83934e706eb89f5790b8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:52:07 -0400
Subject: [PATCH 10/22] New package: cosmic-launcher-1.0.0.alpha.1
---
srcpkgs/cosmic-launcher | 1 -
srcpkgs/cosmic-launcher/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-launcher
create mode 100644 srcpkgs/cosmic-launcher/template
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-launcher
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher/template b/srcpkgs/cosmic-launcher/template
new file mode 100644
index 00000000000000..7316a116cc1113
--- /dev/null
+++ b/srcpkgs/cosmic-launcher/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-launcher'
+pkgname=cosmic-launcher
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-launcher short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-launcher"
+distfiles="https://github.com/pop-os/cosmic-launcher/archive/refs/tags/${_tag}.tar.gz"
+checksum=a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From aa5c598d800f841da6c01b5f1260f0f554359c7c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:55:46 -0400
Subject: [PATCH 11/22] New package: cosmic-notifications-1.0.0.alpha.1
---
srcpkgs/cosmic-notifications | 1 -
.../patches/0001-systemd.patch | 102 ++++++++++++++++++
srcpkgs/cosmic-notifications/template | 18 ++++
3 files changed, 120 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-notifications
create mode 100644 srcpkgs/cosmic-notifications/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-notifications/template
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-notifications
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications/patches/0001-systemd.patch b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..e698ae73e6d4d2
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
@@ -0,0 +1,102 @@
+From c481817c5ea763d4d388d2ab1b1ab7736f1ff2e0 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:04:17 +0100
+Subject: [PATCH 1/2] Add a defaulted systemd feature to include and use
+ tracing_journald
+
+---
+ Cargo.toml | 6 +++++-
+ src/main.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f4e1900..2e37ce5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -27,7 +27,7 @@ tracing = "0.1"
+ nix = "0.26.2"
+ once_cell = "1.17"
+ tracing-subscriber = "0.3.17"
+-tracing-journald = "0.3.0"
++tracing-journald = { version = "0.3.0", optional = true }
+ rust-embed = "8.4.0"
+ serde = { version = "1.0.152", features = ["derive"] }
+ ron = "0.8"
+@@ -53,6 +53,10 @@ log-panics = { version = "2", features = ["with-backtrace"] }
+ # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+ # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+
++[features]
++systemd = ["dep:tracing-journald"]
++default = ["systemd"]
++
+ [workspace]
+ members = ["cosmic-notifications-util", "cosmic-notifications-config"]
+
+diff --git a/src/main.rs b/src/main.rs
+index 88d360e..ba9f241 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -12,8 +12,10 @@ use localize::localize;
+ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer()?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer()?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From dcc0461d2d77f9c89679a2741a30319dc73593b2 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:10:29 +0100
+Subject: [PATCH 2/2] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index ba9f241..b8531b6 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -13,16 +13,25 @@ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+ let trace = tracing_subscriber::registry();
++
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::WARN.into())
++ .from_env_lossy();
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer()?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::WARN.into())
+- .from_env_lossy(),
+- )
+- .try_init()?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()?;
++ } else {
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++ tracing::warn!("Failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++
+ log_panics::init();
+
+ info!("cosmic-notifications ({})", APP_ID);
diff --git a/srcpkgs/cosmic-notifications/template b/srcpkgs/cosmic-notifications/template
new file mode 100644
index 00000000000000..ef22e2c5022d36
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-notifications'
+pkgname=cosmic-notifications
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-notifications short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-notifications"
+distfiles="https://github.com/pop-os/cosmic-notifications/archive/refs/tags/${_tag}.tar.gz"
+checksum=6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From a8a965e6e0f478362c76cf4ebdf1c5d3b9a366d9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:01:21 -0400
Subject: [PATCH 12/22] New package: cosmic-osd-1.0.0.alpha.1
---
srcpkgs/cosmic-osd | 1 -
srcpkgs/cosmic-osd/template | 14 ++++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-osd
create mode 100644 srcpkgs/cosmic-osd/template
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-osd
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd/template b/srcpkgs/cosmic-osd/template
new file mode 100644
index 00000000000000..865b28f89dadba
--- /dev/null
+++ b/srcpkgs/cosmic-osd/template
@@ -0,0 +1,14 @@
+# Template file for 'cosmic-osd'
+pkgname=cosmic-osd
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel pulseaudio-devel"
+short_desc="TODO: cosmic-osd short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-osd"
+distfiles="https://github.com/pop-os/cosmic-osd/archive/refs/tags/${_tag}.tar.gz"
+checksum=a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
From bda4d8a4a2c3dfa9f34b120dc5a53d8141032e21 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:04:44 -0400
Subject: [PATCH 13/22] New package: cosmic-panel-1.0.0.alpha.1
---
srcpkgs/cosmic-panel | 1 -
srcpkgs/cosmic-panel/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-panel
create mode 100644 srcpkgs/cosmic-panel/template
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-panel
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
new file mode 100644
index 00000000000000..ca3374d0ac5b8e
--- /dev/null
+++ b/srcpkgs/cosmic-panel/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-panel'
+pkgname=cosmic-panel
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-panel short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-panel"
+distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
+checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 2f72df9895485a9eab51a0e4b8a66acc67b27b6c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:11:43 -0400
Subject: [PATCH 14/22] New package: cosmic-randr-1.0.0.alpha.1
---
srcpkgs/cosmic-randr | 1 -
srcpkgs/cosmic-randr/template | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-randr
create mode 100644 srcpkgs/cosmic-randr/template
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-randr
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr/template b/srcpkgs/cosmic-randr/template
new file mode 100644
index 00000000000000..d025e245ef696c
--- /dev/null
+++ b/srcpkgs/cosmic-randr/template
@@ -0,0 +1,13 @@
+# Template file for 'cosmic-randr'
+pkgname=cosmic-randr
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cli"
+short_desc="TODO: cosmic-randr short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-randr"
+distfiles="https://github.com/pop-os/cosmic-randr/archive/refs/tags/${_tag}.tar.gz"
+checksum=b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
From aba8c5a3d11ebf5deb95fecdd8418684fe4ae9be Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:14:24 -0400
Subject: [PATCH 15/22] New package: cosmic-screenshot-1.0.0.alpha.1
---
srcpkgs/cosmic-screenshot | 1 -
srcpkgs/cosmic-screenshot/template | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-screenshot
create mode 100644 srcpkgs/cosmic-screenshot/template
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-screenshot
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot/template b/srcpkgs/cosmic-screenshot/template
new file mode 100644
index 00000000000000..f578512bb03b7b
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot/template
@@ -0,0 +1,17 @@
+# Template file for 'cosmic-screenshot'
+pkgname=cosmic-screenshot
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-screenshot short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-screenshot"
+distfiles="https://github.com/pop-os/cosmic-screenshot/archive/refs/tags/${_tag}.tar.gz"
+checksum=78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From c8837497d9721051a13e45cc931c02c5ef0aac20 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:25:45 -0400
Subject: [PATCH 16/22] New package: cosmic-session-1.0.0.alpha.1
---
srcpkgs/cosmic-session | 1 -
.../cosmic-session/patches/0001-systemd.patch | 182 ++++++++++++++++++
.../cosmic-session/patches/0002-systemd.patch | 10 +
srcpkgs/cosmic-session/template | 18 ++
4 files changed, 210 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-session
create mode 100644 srcpkgs/cosmic-session/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-session/patches/0002-systemd.patch
create mode 100644 srcpkgs/cosmic-session/template
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-session
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session/patches/0001-systemd.patch b/srcpkgs/cosmic-session/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..578ca1002b6a1a
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0001-systemd.patch
@@ -0,0 +1,182 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 357379d116501a337e4dc1f3375f2f71e74f1f31 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..636d88b 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -44,17 +44,34 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
+ trace
+ .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
++ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/cosmic-session/patches/0002-systemd.patch b/srcpkgs/cosmic-session/patches/0002-systemd.patch
new file mode 100644
index 00000000000000..bc03edc8487da6
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0002-systemd.patch
@@ -0,0 +1,10 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..68a8571 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,5 +45,3 @@ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+-default = ["systemd"]
diff --git a/srcpkgs/cosmic-session/template b/srcpkgs/cosmic-session/template
new file mode 100644
index 00000000000000..a76928658e7e46
--- /dev/null
+++ b/srcpkgs/cosmic-session/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-session'
+pkgname=cosmic-session
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-session short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-session"
+distfiles="https://github.com/pop-os/cosmic-session/archive/refs/tags/${_tag}.tar.gz"
+checksum=be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" \
+ --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install
+}
From e7710801c9b5270a0165212668be6fcf4e05d5a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:36:20 -0400
Subject: [PATCH 17/22] New package: cosmic-settings-1.0.0.alpha.1
---
srcpkgs/cosmic-settings | 1 -
srcpkgs/cosmic-settings/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings
create mode 100644 srcpkgs/cosmic-settings/template
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings/template b/srcpkgs/cosmic-settings/template
new file mode 100644
index 00000000000000..aa2652fc351675
--- /dev/null
+++ b/srcpkgs/cosmic-settings/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-settings'
+pkgname=cosmic-settings
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings"
+distfiles="https://github.com/pop-os/cosmic-settings/archive/refs/tags/${_tag}.tar.gz"
+checksum=eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 0ccfa45194e50427a9d972af5b8e31778aefe14d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:38:56 -0400
Subject: [PATCH 18/22] New package: cosmic-daemon-1.0.0.alpha.1
---
srcpkgs/cosmic-settings-daemon | 1 -
srcpkgs/cosmic-settings-daemon/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings-daemon
create mode 100644 srcpkgs/cosmic-settings-daemon/template
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings-daemon
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon/template b/srcpkgs/cosmic-settings-daemon/template
new file mode 100644
index 00000000000000..77bc8f32edc86d
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-settings-daemon'
+pkgname=cosmic-settings-daemon
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings-daemon short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings-daemon"
+distfiles="https://github.com/pop-os/cosmic-settings-daemon/archive/refs/tags/${_tag}.tar.gz"
+checksum=fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+
+do_install() {
+ DESTDIR="${DESTDIR}" CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
From b93777f2eb417d899b1fa39ab76e78694a110b1d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:44:14 -0400
Subject: [PATCH 19/22] New package: cosmic-store-1.0.0.alpha.1
---
srcpkgs/cosmic-store | 1 -
srcpkgs/cosmic-store/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-store
create mode 100644 srcpkgs/cosmic-store/template
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-store
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store/template b/srcpkgs/cosmic-store/template
new file mode 100644
index 00000000000000..86c65904933a1a
--- /dev/null
+++ b/srcpkgs/cosmic-store/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-store'
+pkgname=cosmic-store
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel openssl-devel flatpak-devel"
+short_desc="TODO: cosmic-store short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-store"
+distfiles="https://github.com/pop-os/cosmic-store/archive/refs/tags/${_tag}.tar.gz"
+checksum=eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From c599a42979a6ab83d7fffd99fe74ad53e79b614a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:45:00 -0400
Subject: [PATCH 20/22] New package: cosmic-term-1.0.0.alpha.1
---
srcpkgs/cosmic-term | 1 -
srcpkgs/cosmic-term/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-term
create mode 100644 srcpkgs/cosmic-term/template
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-term
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term/template b/srcpkgs/cosmic-term/template
new file mode 100644
index 00000000000000..7ba0f87d2889ed
--- /dev/null
+++ b/srcpkgs/cosmic-term/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-term'
+pkgname=cosmic-term
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-term short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-term"
+distfiles="https://github.com/pop-os/cosmic-term/archive/refs/tags/${_tag}.tar.gz"
+checksum=3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 59ee1398772b3dc7213a97f0b38c190e118ac77c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:14:00 -0400
Subject: [PATCH 21/22] New package: cosmic-workspaces-epoch-1.0.0.alpha.1
---
srcpkgs/cosmic-workspaces-epoch | 1 -
srcpkgs/cosmic-workspaces-epoch/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 100644 srcpkgs/cosmic-workspaces-epoch/template
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-workspaces-epoch
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch/template b/srcpkgs/cosmic-workspaces-epoch/template
new file mode 100644
index 00000000000000..7f822f05cc1171
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-workspaces-epoch'
+pkgname=cosmic-workspaces-epoch
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel libgbm-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-workspaces-epoch short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-workspaces-epoch"
+distfiles="https://github.com/pop-os/cosmic-workspaces-epoch/archive/refs/tags/${_tag}.tar.gz"
+checksum=d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+
+post_install() {
+ vinstall data/com.system76.CosmicWorkspaces.desktop 0644 usr/share/applications
+ vinstall data/com.system76.CosmicWorkspaces.svg 0644 usr/share/icons/hicolor/scalable/apps
+}
From a128c4cc48596e73409873124c846336df88b4e1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:32:56 -0400
Subject: [PATCH 22/22] New package: xdg-desktop-portal-cosmic-1.0.0.alpha.1
---
srcpkgs/xdg-desktop-portal-cosmic | 1 -
srcpkgs/xdg-desktop-portal-cosmic/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/xdg-desktop-portal-cosmic
create mode 100644 srcpkgs/xdg-desktop-portal-cosmic/template
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/xdg-desktop-portal-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic/template b/srcpkgs/xdg-desktop-portal-cosmic/template
new file mode 100644
index 00000000000000..009bc95c59c779
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic/template
@@ -0,0 +1,21 @@
+# Template file for 'xdg-desktop-portal-cosmic'
+pkgname=xdg-desktop-portal-cosmic
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config llvm18 clang18"
+makedepends="libxkbcommon-devel libgbm-devel pipewire-devel llvm18-devel"
+short_desc="TODO: xdg-desktop-portal-cosmic short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/xdg-desktop-portal-cosmic"
+distfiles="https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/refs/tags/${_tag}.tar.gz"
+checksum=ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ DESTDIR="${DESTDIR}" prefix=/usr CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (9 preceding siblings ...)
2024-08-11 2:09 ` Calandracas606
@ 2024-08-11 4:18 ` Calandracas606
2024-08-11 5:11 ` Calandracas606
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-11 4:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 53028 bytes --]
From 1752c0e5efd07d033f2a19fe0167fa8c17c343c1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH 01/22] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 14 ++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 35 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..872f184f0baaed
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,14 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+build_style=meta
+depends="cosmic-applets cosmic-applibrary cosmic-bg cosmic-comp cosmic-edit
+ cosmic-files cosmic-greeter cosmic-icons cosmic-launcher cosmic-notifications
+ cosmic-osd cosmic-panel cosmic-randr cosmic-screenshot cosmic-session
+ cosmic-settings cosmic-settings-daemon cosmic-store cosmic-term
+ cosmic-workspaces-epoch xdg-desktop-portal-cosmic"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Public Domain"
+homepage="https://system76.com/cosmic"
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
From cdffa08da4b0efc397f959505161fef5e7e07ccc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:26:22 -0400
Subject: [PATCH 02/22] New package: cosmic-bg-1.0.0.alpha.1
---
srcpkgs/cosmic-bg | 1 -
srcpkgs/cosmic-bg/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-bg
create mode 100644 srcpkgs/cosmic-bg/template
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-bg
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg/template b/srcpkgs/cosmic-bg/template
new file mode 100644
index 00000000000000..a79027a7bbf73c
--- /dev/null
+++ b/srcpkgs/cosmic-bg/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-bg'
+pkgname=cosmic-bg
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-bg short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-bg"
+distfiles="https://github.com/pop-os/cosmic-bg/archive/refs/tags/${_tag}.tar.gz"
+checksum=6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 2210a93fd9c5c39473fc7af625dd2069668a7f8d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:51:36 -0400
Subject: [PATCH 03/22] New package: cosmic-applets-1.0.0.alpha.1
---
srcpkgs/cosmic-applets | 1 -
srcpkgs/cosmic-applets/template | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applets
create mode 100644 srcpkgs/cosmic-applets/template
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applets
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applets/template b/srcpkgs/cosmic-applets/template
new file mode 100644
index 00000000000000..662f4b519be4aa
--- /dev/null
+++ b/srcpkgs/cosmic-applets/template
@@ -0,0 +1,23 @@
+# Template file for 'cosmic-applets'
+pkgname=cosmic-applets
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel dbus-devel pulseaudio-devel libinput-devel"
+short_desc="TODO: cosmic-applets short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applets"
+distfiles="https://github.com/pop-os/cosmic-applets/archive/refs/tags/${_tag}.tar.gz"
+checksum=be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+do_install() {
+ just --set targetdir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} \
+ --set prefix /usr --set cosmic-applets-bin cosmic-applets install
+}
From 99c738118a75c56ee8d73015fd617f0f83caf799 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:56:31 -0400
Subject: [PATCH 04/22] New package: cosmic-applibrary-1.0.0.alpha.1
---
srcpkgs/cosmic-applibrary | 1 -
srcpkgs/cosmic-applibrary/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applibrary
create mode 100644 srcpkgs/cosmic-applibrary/template
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applibrary
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary/template b/srcpkgs/cosmic-applibrary/template
new file mode 100644
index 00000000000000..8da931e7bb7d70
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-applibrary'
+pkgname=cosmic-applibrary
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-applibrary short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applibrary"
+distfiles="https://github.com/pop-os/cosmic-applibrary/archive/refs/tags/${_tag}.tar.gz"
+checksum=6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 06086c237564bf0bc887ec07162074bdd772b47d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:24:22 -0400
Subject: [PATCH 05/22] New package: cosmic-comp-1.0.0.alpha.1
---
srcpkgs/cosmic-comp | 1 -
srcpkgs/cosmic-comp/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-comp
create mode 100644 srcpkgs/cosmic-comp/template
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-comp
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
new file mode 100644
index 00000000000000..61c577e384510d
--- /dev/null
+++ b/srcpkgs/cosmic-comp/template
@@ -0,0 +1,20 @@
+# Template file for 'cosmic-comp'
+pkgname=cosmic-comp
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libseat-devel libxkbcommon-devel libinput-devel
+ pixman-devel libgbm-devel"
+short_desc="TODO: cosmic-comp short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-comp"
+distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.gz"
+checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+
+do_install() {
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} \
+ make install-bare-session
+}
From 1da3b6cb4bf4a046358e631c2a697f46d91c5a54 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:30:31 -0400
Subject: [PATCH 06/22] New package: cosmic-edit-1.0.0.alpha.1
---
srcpkgs/cosmic-edit | 1 -
srcpkgs/cosmic-edit/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-edit
create mode 100644 srcpkgs/cosmic-edit/template
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-edit
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit/template b/srcpkgs/cosmic-edit/template
new file mode 100644
index 00000000000000..b7039c34389227
--- /dev/null
+++ b/srcpkgs/cosmic-edit/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-edit'
+pkgname=cosmic-edit
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel oniguruma-devel"
+short_desc="TODO: cosmic-edit short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-edit"
+distfiles="https://github.com/pop-os/cosmic-edit/archive/refs/tags/${_tag}.tar.gz"
+checksum=c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From f9eac15bb8b4b1531e4516ce7191b0670e63ea59 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:37:24 -0400
Subject: [PATCH 07/22] New package: cosmic-files-1.0.0.alpha.1
---
srcpkgs/cosmic-files | 1 -
srcpkgs/cosmic-files/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-files
create mode 100644 srcpkgs/cosmic-files/template
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-files
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files/template b/srcpkgs/cosmic-files/template
new file mode 100644
index 00000000000000..463c7934f2768b
--- /dev/null
+++ b/srcpkgs/cosmic-files/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-files'
+pkgname=cosmic-files
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel libglib-devel"
+short_desc="TODO: cosmic-files short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-files"
+distfiles="https://github.com/pop-os/cosmic-files/archive/refs/tags/${_tag}.tar.gz"
+checksum=e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 940a14d329f0b7b3687ae795203c695845bcca0f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 01:31:38 -0400
Subject: [PATCH 08/22] New package: cosmic-greeter-1.0.0.alpha.1
---
srcpkgs/cosmic-greeter | 1 -
srcpkgs/cosmic-greeter/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-greeter
create mode 100644 srcpkgs/cosmic-greeter/template
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-greeter
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter/template b/srcpkgs/cosmic-greeter/template
new file mode 100644
index 00000000000000..44e315e754e9a9
--- /dev/null
+++ b/srcpkgs/cosmic-greeter/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-greeter'
+pkgname=cosmic-greeter
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+configure_args=" --all"
+hostmakedepends="pkg-config just llvm18 clang18"
+makedepends="libxkbcommon-devel llvm18-devel eudev-libudev-devel pam-devel libinput-devel"
+short_desc="TODO: cosmic-greeter short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-greeter"
+distfiles="https://github.com/pop-os/cosmic-greeter/archive/refs/tags/${_tag}.tar.gz"
+checksum=408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 7ae1d29d7c23356e449048d36647afd45f72c957 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:47:42 -0400
Subject: [PATCH 09/22] New package: cosmic-icons-1.0.0.alpha.1
---
srcpkgs/cosmic-icons | 1 -
srcpkgs/cosmic-icons/template | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-icons
create mode 100644 srcpkgs/cosmic-icons/template
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-icons
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons/template b/srcpkgs/cosmic-icons/template
new file mode 100644
index 00000000000000..476ab867e57324
--- /dev/null
+++ b/srcpkgs/cosmic-icons/template
@@ -0,0 +1,16 @@
+# Template file for 'cosmic-icons'
+pkgname=cosmic-icons
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+hostmakedepends="just"
+short_desc="TODO: cosmic-icons short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-icons"
+distfiles="https://github.com/pop-os/cosmic-icons/archive/refs/tags/${_tag}.tar.gz"
+checksum=20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+
+do_install() {
+ just --set rootdir ${DESTDIR} --set prefix /usr install
+}
From aeb4068d4763b6b0f3ee83934e706eb89f5790b8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:52:07 -0400
Subject: [PATCH 10/22] New package: cosmic-launcher-1.0.0.alpha.1
---
srcpkgs/cosmic-launcher | 1 -
srcpkgs/cosmic-launcher/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-launcher
create mode 100644 srcpkgs/cosmic-launcher/template
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-launcher
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher/template b/srcpkgs/cosmic-launcher/template
new file mode 100644
index 00000000000000..7316a116cc1113
--- /dev/null
+++ b/srcpkgs/cosmic-launcher/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-launcher'
+pkgname=cosmic-launcher
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-launcher short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-launcher"
+distfiles="https://github.com/pop-os/cosmic-launcher/archive/refs/tags/${_tag}.tar.gz"
+checksum=a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From aa5c598d800f841da6c01b5f1260f0f554359c7c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:55:46 -0400
Subject: [PATCH 11/22] New package: cosmic-notifications-1.0.0.alpha.1
---
srcpkgs/cosmic-notifications | 1 -
.../patches/0001-systemd.patch | 102 ++++++++++++++++++
srcpkgs/cosmic-notifications/template | 18 ++++
3 files changed, 120 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-notifications
create mode 100644 srcpkgs/cosmic-notifications/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-notifications/template
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-notifications
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications/patches/0001-systemd.patch b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..e698ae73e6d4d2
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
@@ -0,0 +1,102 @@
+From c481817c5ea763d4d388d2ab1b1ab7736f1ff2e0 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:04:17 +0100
+Subject: [PATCH 1/2] Add a defaulted systemd feature to include and use
+ tracing_journald
+
+---
+ Cargo.toml | 6 +++++-
+ src/main.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f4e1900..2e37ce5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -27,7 +27,7 @@ tracing = "0.1"
+ nix = "0.26.2"
+ once_cell = "1.17"
+ tracing-subscriber = "0.3.17"
+-tracing-journald = "0.3.0"
++tracing-journald = { version = "0.3.0", optional = true }
+ rust-embed = "8.4.0"
+ serde = { version = "1.0.152", features = ["derive"] }
+ ron = "0.8"
+@@ -53,6 +53,10 @@ log-panics = { version = "2", features = ["with-backtrace"] }
+ # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+ # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+
++[features]
++systemd = ["dep:tracing-journald"]
++default = ["systemd"]
++
+ [workspace]
+ members = ["cosmic-notifications-util", "cosmic-notifications-config"]
+
+diff --git a/src/main.rs b/src/main.rs
+index 88d360e..ba9f241 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -12,8 +12,10 @@ use localize::localize;
+ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer()?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer()?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From dcc0461d2d77f9c89679a2741a30319dc73593b2 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:10:29 +0100
+Subject: [PATCH 2/2] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index ba9f241..b8531b6 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -13,16 +13,25 @@ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+ let trace = tracing_subscriber::registry();
++
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::WARN.into())
++ .from_env_lossy();
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer()?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::WARN.into())
+- .from_env_lossy(),
+- )
+- .try_init()?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()?;
++ } else {
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++ tracing::warn!("Failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++
+ log_panics::init();
+
+ info!("cosmic-notifications ({})", APP_ID);
diff --git a/srcpkgs/cosmic-notifications/template b/srcpkgs/cosmic-notifications/template
new file mode 100644
index 00000000000000..ef22e2c5022d36
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-notifications'
+pkgname=cosmic-notifications
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-notifications short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-notifications"
+distfiles="https://github.com/pop-os/cosmic-notifications/archive/refs/tags/${_tag}.tar.gz"
+checksum=6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From a8a965e6e0f478362c76cf4ebdf1c5d3b9a366d9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:01:21 -0400
Subject: [PATCH 12/22] New package: cosmic-osd-1.0.0.alpha.1
---
srcpkgs/cosmic-osd | 1 -
srcpkgs/cosmic-osd/template | 14 ++++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-osd
create mode 100644 srcpkgs/cosmic-osd/template
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-osd
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd/template b/srcpkgs/cosmic-osd/template
new file mode 100644
index 00000000000000..865b28f89dadba
--- /dev/null
+++ b/srcpkgs/cosmic-osd/template
@@ -0,0 +1,14 @@
+# Template file for 'cosmic-osd'
+pkgname=cosmic-osd
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel pulseaudio-devel"
+short_desc="TODO: cosmic-osd short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-osd"
+distfiles="https://github.com/pop-os/cosmic-osd/archive/refs/tags/${_tag}.tar.gz"
+checksum=a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
From bda4d8a4a2c3dfa9f34b120dc5a53d8141032e21 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:04:44 -0400
Subject: [PATCH 13/22] New package: cosmic-panel-1.0.0.alpha.1
---
srcpkgs/cosmic-panel | 1 -
srcpkgs/cosmic-panel/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-panel
create mode 100644 srcpkgs/cosmic-panel/template
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-panel
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
new file mode 100644
index 00000000000000..ca3374d0ac5b8e
--- /dev/null
+++ b/srcpkgs/cosmic-panel/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-panel'
+pkgname=cosmic-panel
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-panel short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-panel"
+distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
+checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 2f72df9895485a9eab51a0e4b8a66acc67b27b6c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:11:43 -0400
Subject: [PATCH 14/22] New package: cosmic-randr-1.0.0.alpha.1
---
srcpkgs/cosmic-randr | 1 -
srcpkgs/cosmic-randr/template | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-randr
create mode 100644 srcpkgs/cosmic-randr/template
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-randr
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr/template b/srcpkgs/cosmic-randr/template
new file mode 100644
index 00000000000000..d025e245ef696c
--- /dev/null
+++ b/srcpkgs/cosmic-randr/template
@@ -0,0 +1,13 @@
+# Template file for 'cosmic-randr'
+pkgname=cosmic-randr
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cli"
+short_desc="TODO: cosmic-randr short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-randr"
+distfiles="https://github.com/pop-os/cosmic-randr/archive/refs/tags/${_tag}.tar.gz"
+checksum=b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
From aba8c5a3d11ebf5deb95fecdd8418684fe4ae9be Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:14:24 -0400
Subject: [PATCH 15/22] New package: cosmic-screenshot-1.0.0.alpha.1
---
srcpkgs/cosmic-screenshot | 1 -
srcpkgs/cosmic-screenshot/template | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-screenshot
create mode 100644 srcpkgs/cosmic-screenshot/template
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-screenshot
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot/template b/srcpkgs/cosmic-screenshot/template
new file mode 100644
index 00000000000000..f578512bb03b7b
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot/template
@@ -0,0 +1,17 @@
+# Template file for 'cosmic-screenshot'
+pkgname=cosmic-screenshot
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-screenshot short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-screenshot"
+distfiles="https://github.com/pop-os/cosmic-screenshot/archive/refs/tags/${_tag}.tar.gz"
+checksum=78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From c8837497d9721051a13e45cc931c02c5ef0aac20 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:25:45 -0400
Subject: [PATCH 16/22] New package: cosmic-session-1.0.0.alpha.1
---
srcpkgs/cosmic-session | 1 -
.../cosmic-session/patches/0001-systemd.patch | 182 ++++++++++++++++++
.../cosmic-session/patches/0002-systemd.patch | 10 +
srcpkgs/cosmic-session/template | 18 ++
4 files changed, 210 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-session
create mode 100644 srcpkgs/cosmic-session/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-session/patches/0002-systemd.patch
create mode 100644 srcpkgs/cosmic-session/template
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-session
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session/patches/0001-systemd.patch b/srcpkgs/cosmic-session/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..578ca1002b6a1a
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0001-systemd.patch
@@ -0,0 +1,182 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 357379d116501a337e4dc1f3375f2f71e74f1f31 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..636d88b 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -44,17 +44,34 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
+ trace
+ .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
++ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/cosmic-session/patches/0002-systemd.patch b/srcpkgs/cosmic-session/patches/0002-systemd.patch
new file mode 100644
index 00000000000000..bc03edc8487da6
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0002-systemd.patch
@@ -0,0 +1,10 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..68a8571 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,5 +45,3 @@ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+-default = ["systemd"]
diff --git a/srcpkgs/cosmic-session/template b/srcpkgs/cosmic-session/template
new file mode 100644
index 00000000000000..a76928658e7e46
--- /dev/null
+++ b/srcpkgs/cosmic-session/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-session'
+pkgname=cosmic-session
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-session short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-session"
+distfiles="https://github.com/pop-os/cosmic-session/archive/refs/tags/${_tag}.tar.gz"
+checksum=be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" \
+ --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install
+}
From e7710801c9b5270a0165212668be6fcf4e05d5a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:36:20 -0400
Subject: [PATCH 17/22] New package: cosmic-settings-1.0.0.alpha.1
---
srcpkgs/cosmic-settings | 1 -
srcpkgs/cosmic-settings/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings
create mode 100644 srcpkgs/cosmic-settings/template
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings/template b/srcpkgs/cosmic-settings/template
new file mode 100644
index 00000000000000..aa2652fc351675
--- /dev/null
+++ b/srcpkgs/cosmic-settings/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-settings'
+pkgname=cosmic-settings
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings"
+distfiles="https://github.com/pop-os/cosmic-settings/archive/refs/tags/${_tag}.tar.gz"
+checksum=eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 135a2973b536fc336506506319cc905da4cb8d66 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:38:56 -0400
Subject: [PATCH 18/22] New package: cosmic-settings-daemon-1.0.0.alpha.1
---
srcpkgs/cosmic-settings-daemon | 1 -
srcpkgs/cosmic-settings-daemon/template | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings-daemon
create mode 100644 srcpkgs/cosmic-settings-daemon/template
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings-daemon
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon/template b/srcpkgs/cosmic-settings-daemon/template
new file mode 100644
index 00000000000000..93806518c7824c
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon/template
@@ -0,0 +1,25 @@
+# Template file for 'cosmic-settings-daemon'
+pkgname=cosmic-settings-daemon
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel geoclue2-devel"
+depends="geoclue2"
+short_desc="TODO: cosmic-settings-daemon short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pop-os/cosmic-settings-daemon"
+distfiles="https://github.com/pop-os/cosmic-settings-daemon/archive/refs/tags/${_tag}.tar.gz"
+checksum=fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+
+export GEOCLUE_AGENT="/usr/libexec/geoclue-2.0/demos/agent"
+
+post_install() {
+ vinstall data/system_actions.ron 0644 \
+ usr/share/cosmic/com.system76.CosmicSettings.Shortcuts/v1 system_actions
+
+ vinstall data/polkit-1/rules.d/cosmic-settings-daemon.rules 0644 \
+ usr/share/polkit-1/rules.d
+}
From 4db036dcdf4ea4bbb89c73164d5f0df8bd9c02c8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:44:14 -0400
Subject: [PATCH 19/22] New package: cosmic-store-1.0.0.alpha.1
---
srcpkgs/cosmic-store | 1 -
srcpkgs/cosmic-store/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-store
create mode 100644 srcpkgs/cosmic-store/template
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-store
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store/template b/srcpkgs/cosmic-store/template
new file mode 100644
index 00000000000000..86c65904933a1a
--- /dev/null
+++ b/srcpkgs/cosmic-store/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-store'
+pkgname=cosmic-store
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel openssl-devel flatpak-devel"
+short_desc="TODO: cosmic-store short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-store"
+distfiles="https://github.com/pop-os/cosmic-store/archive/refs/tags/${_tag}.tar.gz"
+checksum=eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 133200d3229ae9f229eba209fc1e687295ab2d24 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:45:00 -0400
Subject: [PATCH 20/22] New package: cosmic-term-1.0.0.alpha.1
---
srcpkgs/cosmic-term | 1 -
srcpkgs/cosmic-term/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-term
create mode 100644 srcpkgs/cosmic-term/template
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-term
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term/template b/srcpkgs/cosmic-term/template
new file mode 100644
index 00000000000000..7ba0f87d2889ed
--- /dev/null
+++ b/srcpkgs/cosmic-term/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-term'
+pkgname=cosmic-term
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-term short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-term"
+distfiles="https://github.com/pop-os/cosmic-term/archive/refs/tags/${_tag}.tar.gz"
+checksum=3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 259ba40067418f2fad0ce1624deaaa512478f044 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:14:00 -0400
Subject: [PATCH 21/22] New package: cosmic-workspaces-epoch-1.0.0.alpha.1
---
srcpkgs/cosmic-workspaces-epoch | 1 -
srcpkgs/cosmic-workspaces-epoch/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 100644 srcpkgs/cosmic-workspaces-epoch/template
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-workspaces-epoch
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch/template b/srcpkgs/cosmic-workspaces-epoch/template
new file mode 100644
index 00000000000000..7f822f05cc1171
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-workspaces-epoch'
+pkgname=cosmic-workspaces-epoch
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel libgbm-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-workspaces-epoch short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-workspaces-epoch"
+distfiles="https://github.com/pop-os/cosmic-workspaces-epoch/archive/refs/tags/${_tag}.tar.gz"
+checksum=d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+
+post_install() {
+ vinstall data/com.system76.CosmicWorkspaces.desktop 0644 usr/share/applications
+ vinstall data/com.system76.CosmicWorkspaces.svg 0644 usr/share/icons/hicolor/scalable/apps
+}
From 36237f3b158ae5308e8ea7d727da8b25c419de41 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:32:56 -0400
Subject: [PATCH 22/22] New package: xdg-desktop-portal-cosmic-1.0.0.alpha.1
---
srcpkgs/xdg-desktop-portal-cosmic | 1 -
srcpkgs/xdg-desktop-portal-cosmic/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/xdg-desktop-portal-cosmic
create mode 100644 srcpkgs/xdg-desktop-portal-cosmic/template
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/xdg-desktop-portal-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic/template b/srcpkgs/xdg-desktop-portal-cosmic/template
new file mode 100644
index 00000000000000..009bc95c59c779
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic/template
@@ -0,0 +1,21 @@
+# Template file for 'xdg-desktop-portal-cosmic'
+pkgname=xdg-desktop-portal-cosmic
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config llvm18 clang18"
+makedepends="libxkbcommon-devel libgbm-devel pipewire-devel llvm18-devel"
+short_desc="TODO: xdg-desktop-portal-cosmic short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/xdg-desktop-portal-cosmic"
+distfiles="https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/refs/tags/${_tag}.tar.gz"
+checksum=ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ DESTDIR="${DESTDIR}" prefix=/usr CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (10 preceding siblings ...)
2024-08-11 4:18 ` Calandracas606
@ 2024-08-11 5:11 ` Calandracas606
2024-08-11 22:55 ` Calandracas606
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-11 5:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 55157 bytes --]
From 1752c0e5efd07d033f2a19fe0167fa8c17c343c1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH 01/24] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 14 ++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 35 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..872f184f0baaed
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,14 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+build_style=meta
+depends="cosmic-applets cosmic-applibrary cosmic-bg cosmic-comp cosmic-edit
+ cosmic-files cosmic-greeter cosmic-icons cosmic-launcher cosmic-notifications
+ cosmic-osd cosmic-panel cosmic-randr cosmic-screenshot cosmic-session
+ cosmic-settings cosmic-settings-daemon cosmic-store cosmic-term
+ cosmic-workspaces-epoch xdg-desktop-portal-cosmic"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Public Domain"
+homepage="https://system76.com/cosmic"
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
From cdffa08da4b0efc397f959505161fef5e7e07ccc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:26:22 -0400
Subject: [PATCH 02/24] New package: cosmic-bg-1.0.0.alpha.1
---
srcpkgs/cosmic-bg | 1 -
srcpkgs/cosmic-bg/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-bg
create mode 100644 srcpkgs/cosmic-bg/template
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-bg
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg/template b/srcpkgs/cosmic-bg/template
new file mode 100644
index 00000000000000..a79027a7bbf73c
--- /dev/null
+++ b/srcpkgs/cosmic-bg/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-bg'
+pkgname=cosmic-bg
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-bg short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-bg"
+distfiles="https://github.com/pop-os/cosmic-bg/archive/refs/tags/${_tag}.tar.gz"
+checksum=6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 2210a93fd9c5c39473fc7af625dd2069668a7f8d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:51:36 -0400
Subject: [PATCH 03/24] New package: cosmic-applets-1.0.0.alpha.1
---
srcpkgs/cosmic-applets | 1 -
srcpkgs/cosmic-applets/template | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applets
create mode 100644 srcpkgs/cosmic-applets/template
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applets
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applets/template b/srcpkgs/cosmic-applets/template
new file mode 100644
index 00000000000000..662f4b519be4aa
--- /dev/null
+++ b/srcpkgs/cosmic-applets/template
@@ -0,0 +1,23 @@
+# Template file for 'cosmic-applets'
+pkgname=cosmic-applets
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel dbus-devel pulseaudio-devel libinput-devel"
+short_desc="TODO: cosmic-applets short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applets"
+distfiles="https://github.com/pop-os/cosmic-applets/archive/refs/tags/${_tag}.tar.gz"
+checksum=be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+do_install() {
+ just --set targetdir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} \
+ --set prefix /usr --set cosmic-applets-bin cosmic-applets install
+}
From 99c738118a75c56ee8d73015fd617f0f83caf799 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:56:31 -0400
Subject: [PATCH 04/24] New package: cosmic-applibrary-1.0.0.alpha.1
---
srcpkgs/cosmic-applibrary | 1 -
srcpkgs/cosmic-applibrary/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applibrary
create mode 100644 srcpkgs/cosmic-applibrary/template
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applibrary
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary/template b/srcpkgs/cosmic-applibrary/template
new file mode 100644
index 00000000000000..8da931e7bb7d70
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-applibrary'
+pkgname=cosmic-applibrary
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-applibrary short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applibrary"
+distfiles="https://github.com/pop-os/cosmic-applibrary/archive/refs/tags/${_tag}.tar.gz"
+checksum=6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 06086c237564bf0bc887ec07162074bdd772b47d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:24:22 -0400
Subject: [PATCH 05/24] New package: cosmic-comp-1.0.0.alpha.1
---
srcpkgs/cosmic-comp | 1 -
srcpkgs/cosmic-comp/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-comp
create mode 100644 srcpkgs/cosmic-comp/template
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-comp
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
new file mode 100644
index 00000000000000..61c577e384510d
--- /dev/null
+++ b/srcpkgs/cosmic-comp/template
@@ -0,0 +1,20 @@
+# Template file for 'cosmic-comp'
+pkgname=cosmic-comp
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libseat-devel libxkbcommon-devel libinput-devel
+ pixman-devel libgbm-devel"
+short_desc="TODO: cosmic-comp short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-comp"
+distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.gz"
+checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+
+do_install() {
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} \
+ make install-bare-session
+}
From 1da3b6cb4bf4a046358e631c2a697f46d91c5a54 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:30:31 -0400
Subject: [PATCH 06/24] New package: cosmic-edit-1.0.0.alpha.1
---
srcpkgs/cosmic-edit | 1 -
srcpkgs/cosmic-edit/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-edit
create mode 100644 srcpkgs/cosmic-edit/template
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-edit
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit/template b/srcpkgs/cosmic-edit/template
new file mode 100644
index 00000000000000..b7039c34389227
--- /dev/null
+++ b/srcpkgs/cosmic-edit/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-edit'
+pkgname=cosmic-edit
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel oniguruma-devel"
+short_desc="TODO: cosmic-edit short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-edit"
+distfiles="https://github.com/pop-os/cosmic-edit/archive/refs/tags/${_tag}.tar.gz"
+checksum=c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From f9eac15bb8b4b1531e4516ce7191b0670e63ea59 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:37:24 -0400
Subject: [PATCH 07/24] New package: cosmic-files-1.0.0.alpha.1
---
srcpkgs/cosmic-files | 1 -
srcpkgs/cosmic-files/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-files
create mode 100644 srcpkgs/cosmic-files/template
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-files
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files/template b/srcpkgs/cosmic-files/template
new file mode 100644
index 00000000000000..463c7934f2768b
--- /dev/null
+++ b/srcpkgs/cosmic-files/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-files'
+pkgname=cosmic-files
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel libglib-devel"
+short_desc="TODO: cosmic-files short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-files"
+distfiles="https://github.com/pop-os/cosmic-files/archive/refs/tags/${_tag}.tar.gz"
+checksum=e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 940a14d329f0b7b3687ae795203c695845bcca0f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 01:31:38 -0400
Subject: [PATCH 08/24] New package: cosmic-greeter-1.0.0.alpha.1
---
srcpkgs/cosmic-greeter | 1 -
srcpkgs/cosmic-greeter/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-greeter
create mode 100644 srcpkgs/cosmic-greeter/template
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-greeter
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter/template b/srcpkgs/cosmic-greeter/template
new file mode 100644
index 00000000000000..44e315e754e9a9
--- /dev/null
+++ b/srcpkgs/cosmic-greeter/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-greeter'
+pkgname=cosmic-greeter
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+configure_args=" --all"
+hostmakedepends="pkg-config just llvm18 clang18"
+makedepends="libxkbcommon-devel llvm18-devel eudev-libudev-devel pam-devel libinput-devel"
+short_desc="TODO: cosmic-greeter short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-greeter"
+distfiles="https://github.com/pop-os/cosmic-greeter/archive/refs/tags/${_tag}.tar.gz"
+checksum=408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 7ae1d29d7c23356e449048d36647afd45f72c957 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:47:42 -0400
Subject: [PATCH 09/24] New package: cosmic-icons-1.0.0.alpha.1
---
srcpkgs/cosmic-icons | 1 -
srcpkgs/cosmic-icons/template | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-icons
create mode 100644 srcpkgs/cosmic-icons/template
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-icons
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons/template b/srcpkgs/cosmic-icons/template
new file mode 100644
index 00000000000000..476ab867e57324
--- /dev/null
+++ b/srcpkgs/cosmic-icons/template
@@ -0,0 +1,16 @@
+# Template file for 'cosmic-icons'
+pkgname=cosmic-icons
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+hostmakedepends="just"
+short_desc="TODO: cosmic-icons short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-icons"
+distfiles="https://github.com/pop-os/cosmic-icons/archive/refs/tags/${_tag}.tar.gz"
+checksum=20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+
+do_install() {
+ just --set rootdir ${DESTDIR} --set prefix /usr install
+}
From aeb4068d4763b6b0f3ee83934e706eb89f5790b8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:52:07 -0400
Subject: [PATCH 10/24] New package: cosmic-launcher-1.0.0.alpha.1
---
srcpkgs/cosmic-launcher | 1 -
srcpkgs/cosmic-launcher/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-launcher
create mode 100644 srcpkgs/cosmic-launcher/template
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-launcher
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher/template b/srcpkgs/cosmic-launcher/template
new file mode 100644
index 00000000000000..7316a116cc1113
--- /dev/null
+++ b/srcpkgs/cosmic-launcher/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-launcher'
+pkgname=cosmic-launcher
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-launcher short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-launcher"
+distfiles="https://github.com/pop-os/cosmic-launcher/archive/refs/tags/${_tag}.tar.gz"
+checksum=a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From aa5c598d800f841da6c01b5f1260f0f554359c7c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:55:46 -0400
Subject: [PATCH 11/24] New package: cosmic-notifications-1.0.0.alpha.1
---
srcpkgs/cosmic-notifications | 1 -
.../patches/0001-systemd.patch | 102 ++++++++++++++++++
srcpkgs/cosmic-notifications/template | 18 ++++
3 files changed, 120 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-notifications
create mode 100644 srcpkgs/cosmic-notifications/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-notifications/template
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-notifications
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications/patches/0001-systemd.patch b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..e698ae73e6d4d2
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
@@ -0,0 +1,102 @@
+From c481817c5ea763d4d388d2ab1b1ab7736f1ff2e0 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:04:17 +0100
+Subject: [PATCH 1/2] Add a defaulted systemd feature to include and use
+ tracing_journald
+
+---
+ Cargo.toml | 6 +++++-
+ src/main.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f4e1900..2e37ce5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -27,7 +27,7 @@ tracing = "0.1"
+ nix = "0.26.2"
+ once_cell = "1.17"
+ tracing-subscriber = "0.3.17"
+-tracing-journald = "0.3.0"
++tracing-journald = { version = "0.3.0", optional = true }
+ rust-embed = "8.4.0"
+ serde = { version = "1.0.152", features = ["derive"] }
+ ron = "0.8"
+@@ -53,6 +53,10 @@ log-panics = { version = "2", features = ["with-backtrace"] }
+ # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+ # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+
++[features]
++systemd = ["dep:tracing-journald"]
++default = ["systemd"]
++
+ [workspace]
+ members = ["cosmic-notifications-util", "cosmic-notifications-config"]
+
+diff --git a/src/main.rs b/src/main.rs
+index 88d360e..ba9f241 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -12,8 +12,10 @@ use localize::localize;
+ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer()?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer()?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From dcc0461d2d77f9c89679a2741a30319dc73593b2 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:10:29 +0100
+Subject: [PATCH 2/2] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index ba9f241..b8531b6 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -13,16 +13,25 @@ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+ let trace = tracing_subscriber::registry();
++
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::WARN.into())
++ .from_env_lossy();
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer()?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::WARN.into())
+- .from_env_lossy(),
+- )
+- .try_init()?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()?;
++ } else {
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++ tracing::warn!("Failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++
+ log_panics::init();
+
+ info!("cosmic-notifications ({})", APP_ID);
diff --git a/srcpkgs/cosmic-notifications/template b/srcpkgs/cosmic-notifications/template
new file mode 100644
index 00000000000000..ef22e2c5022d36
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-notifications'
+pkgname=cosmic-notifications
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-notifications short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-notifications"
+distfiles="https://github.com/pop-os/cosmic-notifications/archive/refs/tags/${_tag}.tar.gz"
+checksum=6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From a8a965e6e0f478362c76cf4ebdf1c5d3b9a366d9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:01:21 -0400
Subject: [PATCH 12/24] New package: cosmic-osd-1.0.0.alpha.1
---
srcpkgs/cosmic-osd | 1 -
srcpkgs/cosmic-osd/template | 14 ++++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-osd
create mode 100644 srcpkgs/cosmic-osd/template
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-osd
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd/template b/srcpkgs/cosmic-osd/template
new file mode 100644
index 00000000000000..865b28f89dadba
--- /dev/null
+++ b/srcpkgs/cosmic-osd/template
@@ -0,0 +1,14 @@
+# Template file for 'cosmic-osd'
+pkgname=cosmic-osd
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel pulseaudio-devel"
+short_desc="TODO: cosmic-osd short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-osd"
+distfiles="https://github.com/pop-os/cosmic-osd/archive/refs/tags/${_tag}.tar.gz"
+checksum=a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
From bda4d8a4a2c3dfa9f34b120dc5a53d8141032e21 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:04:44 -0400
Subject: [PATCH 13/24] New package: cosmic-panel-1.0.0.alpha.1
---
srcpkgs/cosmic-panel | 1 -
srcpkgs/cosmic-panel/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-panel
create mode 100644 srcpkgs/cosmic-panel/template
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-panel
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
new file mode 100644
index 00000000000000..ca3374d0ac5b8e
--- /dev/null
+++ b/srcpkgs/cosmic-panel/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-panel'
+pkgname=cosmic-panel
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-panel short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-panel"
+distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
+checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 2f72df9895485a9eab51a0e4b8a66acc67b27b6c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:11:43 -0400
Subject: [PATCH 14/24] New package: cosmic-randr-1.0.0.alpha.1
---
srcpkgs/cosmic-randr | 1 -
srcpkgs/cosmic-randr/template | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-randr
create mode 100644 srcpkgs/cosmic-randr/template
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-randr
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr/template b/srcpkgs/cosmic-randr/template
new file mode 100644
index 00000000000000..d025e245ef696c
--- /dev/null
+++ b/srcpkgs/cosmic-randr/template
@@ -0,0 +1,13 @@
+# Template file for 'cosmic-randr'
+pkgname=cosmic-randr
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cli"
+short_desc="TODO: cosmic-randr short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-randr"
+distfiles="https://github.com/pop-os/cosmic-randr/archive/refs/tags/${_tag}.tar.gz"
+checksum=b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
From aba8c5a3d11ebf5deb95fecdd8418684fe4ae9be Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:14:24 -0400
Subject: [PATCH 15/24] New package: cosmic-screenshot-1.0.0.alpha.1
---
srcpkgs/cosmic-screenshot | 1 -
srcpkgs/cosmic-screenshot/template | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-screenshot
create mode 100644 srcpkgs/cosmic-screenshot/template
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-screenshot
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot/template b/srcpkgs/cosmic-screenshot/template
new file mode 100644
index 00000000000000..f578512bb03b7b
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot/template
@@ -0,0 +1,17 @@
+# Template file for 'cosmic-screenshot'
+pkgname=cosmic-screenshot
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-screenshot short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-screenshot"
+distfiles="https://github.com/pop-os/cosmic-screenshot/archive/refs/tags/${_tag}.tar.gz"
+checksum=78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From c8837497d9721051a13e45cc931c02c5ef0aac20 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:25:45 -0400
Subject: [PATCH 16/24] New package: cosmic-session-1.0.0.alpha.1
---
srcpkgs/cosmic-session | 1 -
.../cosmic-session/patches/0001-systemd.patch | 182 ++++++++++++++++++
.../cosmic-session/patches/0002-systemd.patch | 10 +
srcpkgs/cosmic-session/template | 18 ++
4 files changed, 210 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-session
create mode 100644 srcpkgs/cosmic-session/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-session/patches/0002-systemd.patch
create mode 100644 srcpkgs/cosmic-session/template
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-session
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session/patches/0001-systemd.patch b/srcpkgs/cosmic-session/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..578ca1002b6a1a
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0001-systemd.patch
@@ -0,0 +1,182 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 357379d116501a337e4dc1f3375f2f71e74f1f31 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..636d88b 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -44,17 +44,34 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
+ trace
+ .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
++ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/cosmic-session/patches/0002-systemd.patch b/srcpkgs/cosmic-session/patches/0002-systemd.patch
new file mode 100644
index 00000000000000..bc03edc8487da6
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0002-systemd.patch
@@ -0,0 +1,10 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..68a8571 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,5 +45,3 @@ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+-default = ["systemd"]
diff --git a/srcpkgs/cosmic-session/template b/srcpkgs/cosmic-session/template
new file mode 100644
index 00000000000000..a76928658e7e46
--- /dev/null
+++ b/srcpkgs/cosmic-session/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-session'
+pkgname=cosmic-session
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-session short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-session"
+distfiles="https://github.com/pop-os/cosmic-session/archive/refs/tags/${_tag}.tar.gz"
+checksum=be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" \
+ --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install
+}
From e7710801c9b5270a0165212668be6fcf4e05d5a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:36:20 -0400
Subject: [PATCH 17/24] New package: cosmic-settings-1.0.0.alpha.1
---
srcpkgs/cosmic-settings | 1 -
srcpkgs/cosmic-settings/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings
create mode 100644 srcpkgs/cosmic-settings/template
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings/template b/srcpkgs/cosmic-settings/template
new file mode 100644
index 00000000000000..aa2652fc351675
--- /dev/null
+++ b/srcpkgs/cosmic-settings/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-settings'
+pkgname=cosmic-settings
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings"
+distfiles="https://github.com/pop-os/cosmic-settings/archive/refs/tags/${_tag}.tar.gz"
+checksum=eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 135a2973b536fc336506506319cc905da4cb8d66 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:38:56 -0400
Subject: [PATCH 18/24] New package: cosmic-settings-daemon-1.0.0.alpha.1
---
srcpkgs/cosmic-settings-daemon | 1 -
srcpkgs/cosmic-settings-daemon/template | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings-daemon
create mode 100644 srcpkgs/cosmic-settings-daemon/template
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings-daemon
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon/template b/srcpkgs/cosmic-settings-daemon/template
new file mode 100644
index 00000000000000..93806518c7824c
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon/template
@@ -0,0 +1,25 @@
+# Template file for 'cosmic-settings-daemon'
+pkgname=cosmic-settings-daemon
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel geoclue2-devel"
+depends="geoclue2"
+short_desc="TODO: cosmic-settings-daemon short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pop-os/cosmic-settings-daemon"
+distfiles="https://github.com/pop-os/cosmic-settings-daemon/archive/refs/tags/${_tag}.tar.gz"
+checksum=fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+
+export GEOCLUE_AGENT="/usr/libexec/geoclue-2.0/demos/agent"
+
+post_install() {
+ vinstall data/system_actions.ron 0644 \
+ usr/share/cosmic/com.system76.CosmicSettings.Shortcuts/v1 system_actions
+
+ vinstall data/polkit-1/rules.d/cosmic-settings-daemon.rules 0644 \
+ usr/share/polkit-1/rules.d
+}
From 4db036dcdf4ea4bbb89c73164d5f0df8bd9c02c8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:44:14 -0400
Subject: [PATCH 19/24] New package: cosmic-store-1.0.0.alpha.1
---
srcpkgs/cosmic-store | 1 -
srcpkgs/cosmic-store/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-store
create mode 100644 srcpkgs/cosmic-store/template
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-store
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store/template b/srcpkgs/cosmic-store/template
new file mode 100644
index 00000000000000..86c65904933a1a
--- /dev/null
+++ b/srcpkgs/cosmic-store/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-store'
+pkgname=cosmic-store
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel openssl-devel flatpak-devel"
+short_desc="TODO: cosmic-store short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-store"
+distfiles="https://github.com/pop-os/cosmic-store/archive/refs/tags/${_tag}.tar.gz"
+checksum=eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 133200d3229ae9f229eba209fc1e687295ab2d24 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:45:00 -0400
Subject: [PATCH 20/24] New package: cosmic-term-1.0.0.alpha.1
---
srcpkgs/cosmic-term | 1 -
srcpkgs/cosmic-term/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-term
create mode 100644 srcpkgs/cosmic-term/template
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-term
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term/template b/srcpkgs/cosmic-term/template
new file mode 100644
index 00000000000000..7ba0f87d2889ed
--- /dev/null
+++ b/srcpkgs/cosmic-term/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-term'
+pkgname=cosmic-term
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-term short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-term"
+distfiles="https://github.com/pop-os/cosmic-term/archive/refs/tags/${_tag}.tar.gz"
+checksum=3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 259ba40067418f2fad0ce1624deaaa512478f044 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:14:00 -0400
Subject: [PATCH 21/24] New package: cosmic-workspaces-epoch-1.0.0.alpha.1
---
srcpkgs/cosmic-workspaces-epoch | 1 -
srcpkgs/cosmic-workspaces-epoch/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 100644 srcpkgs/cosmic-workspaces-epoch/template
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-workspaces-epoch
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch/template b/srcpkgs/cosmic-workspaces-epoch/template
new file mode 100644
index 00000000000000..7f822f05cc1171
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-workspaces-epoch'
+pkgname=cosmic-workspaces-epoch
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel libgbm-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-workspaces-epoch short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-workspaces-epoch"
+distfiles="https://github.com/pop-os/cosmic-workspaces-epoch/archive/refs/tags/${_tag}.tar.gz"
+checksum=d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+
+post_install() {
+ vinstall data/com.system76.CosmicWorkspaces.desktop 0644 usr/share/applications
+ vinstall data/com.system76.CosmicWorkspaces.svg 0644 usr/share/icons/hicolor/scalable/apps
+}
From 36237f3b158ae5308e8ea7d727da8b25c419de41 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:32:56 -0400
Subject: [PATCH 22/24] New package: xdg-desktop-portal-cosmic-1.0.0.alpha.1
---
srcpkgs/xdg-desktop-portal-cosmic | 1 -
srcpkgs/xdg-desktop-portal-cosmic/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/xdg-desktop-portal-cosmic
create mode 100644 srcpkgs/xdg-desktop-portal-cosmic/template
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/xdg-desktop-portal-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic/template b/srcpkgs/xdg-desktop-portal-cosmic/template
new file mode 100644
index 00000000000000..009bc95c59c779
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic/template
@@ -0,0 +1,21 @@
+# Template file for 'xdg-desktop-portal-cosmic'
+pkgname=xdg-desktop-portal-cosmic
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config llvm18 clang18"
+makedepends="libxkbcommon-devel libgbm-devel pipewire-devel llvm18-devel"
+short_desc="TODO: xdg-desktop-portal-cosmic short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/xdg-desktop-portal-cosmic"
+distfiles="https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/refs/tags/${_tag}.tar.gz"
+checksum=ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ DESTDIR="${DESTDIR}" prefix=/usr CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
From 3438dd6011b4ea6f17366ec46ead76f8e8e03d68 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 11 Aug 2024 00:53:13 -0400
Subject: [PATCH 23/24] cosmic-panel: !fixup
---
srcpkgs/cosmic-panel/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
index ca3374d0ac5b8e..f036897042f5d0 100644
--- a/srcpkgs/cosmic-panel/template
+++ b/srcpkgs/cosmic-panel/template
@@ -4,7 +4,8 @@ version=1.0.0.alpha.1
revision=1
_tag=epoch-${version/.alpha/-alpha}
build_style=cargo
-hostmakedepends="pkg-config just"
+make_install_args="--path cosmic-panel-bin"
+hostmakedepends="pkg-config"
makedepends="libxkbcommon-devel"
short_desc="TODO: cosmic-panel short_desc"
maintainer="Daniel Martinez <danielmartinez@cock.li>"
@@ -13,6 +14,7 @@ homepage="https://github.com/pop-os/cosmic-panel"
distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
-do_install() {
- just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+post_install() {
+ vmkdir usr/share/cosmic
+ vcopy "data/default_schema/*" usr/share/cosmic
}
From 942211269225f139199b7f508a8aa04891ffca04 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 11 Aug 2024 01:10:49 -0400
Subject: [PATCH 24/24] cosmic-comp: !fixup
---
srcpkgs/cosmic-comp/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
index 61c577e384510d..107f7525d08af2 100644
--- a/srcpkgs/cosmic-comp/template
+++ b/srcpkgs/cosmic-comp/template
@@ -15,6 +15,5 @@ distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.g
checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
do_install() {
- CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} \
- make install-bare-session
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} make install
}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (11 preceding siblings ...)
2024-08-11 5:11 ` Calandracas606
@ 2024-08-11 22:55 ` Calandracas606
2024-08-12 2:45 ` Calandracas606
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-11 22:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 53039 bytes --]
From dd0d9c3931cf5fe9095cf1e04c0d01052c8a9e7e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH 01/22] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 14 ++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 35 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..872f184f0baaed
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,14 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+build_style=meta
+depends="cosmic-applets cosmic-applibrary cosmic-bg cosmic-comp cosmic-edit
+ cosmic-files cosmic-greeter cosmic-icons cosmic-launcher cosmic-notifications
+ cosmic-osd cosmic-panel cosmic-randr cosmic-screenshot cosmic-session
+ cosmic-settings cosmic-settings-daemon cosmic-store cosmic-term
+ cosmic-workspaces-epoch xdg-desktop-portal-cosmic"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Public Domain"
+homepage="https://system76.com/cosmic"
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
From 1bb9c848970c49791e591de9f978909de998a05b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:26:22 -0400
Subject: [PATCH 02/22] New package: cosmic-bg-1.0.0.alpha.1
---
srcpkgs/cosmic-bg | 1 -
srcpkgs/cosmic-bg/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-bg
create mode 100644 srcpkgs/cosmic-bg/template
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-bg
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg/template b/srcpkgs/cosmic-bg/template
new file mode 100644
index 00000000000000..a79027a7bbf73c
--- /dev/null
+++ b/srcpkgs/cosmic-bg/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-bg'
+pkgname=cosmic-bg
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-bg short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-bg"
+distfiles="https://github.com/pop-os/cosmic-bg/archive/refs/tags/${_tag}.tar.gz"
+checksum=6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From abd92d61ef40d958408d7113286eab08695187e2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:51:36 -0400
Subject: [PATCH 03/22] New package: cosmic-applets-1.0.0.alpha.1
---
srcpkgs/cosmic-applets | 1 -
srcpkgs/cosmic-applets/template | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applets
create mode 100644 srcpkgs/cosmic-applets/template
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applets
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applets/template b/srcpkgs/cosmic-applets/template
new file mode 100644
index 00000000000000..662f4b519be4aa
--- /dev/null
+++ b/srcpkgs/cosmic-applets/template
@@ -0,0 +1,23 @@
+# Template file for 'cosmic-applets'
+pkgname=cosmic-applets
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel dbus-devel pulseaudio-devel libinput-devel"
+short_desc="TODO: cosmic-applets short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applets"
+distfiles="https://github.com/pop-os/cosmic-applets/archive/refs/tags/${_tag}.tar.gz"
+checksum=be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+do_install() {
+ just --set targetdir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} \
+ --set prefix /usr --set cosmic-applets-bin cosmic-applets install
+}
From 2623f6cd3ce00191602911f7731e481846f0ebb1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:56:31 -0400
Subject: [PATCH 04/22] New package: cosmic-applibrary-1.0.0.alpha.1
---
srcpkgs/cosmic-applibrary | 1 -
srcpkgs/cosmic-applibrary/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applibrary
create mode 100644 srcpkgs/cosmic-applibrary/template
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applibrary
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary/template b/srcpkgs/cosmic-applibrary/template
new file mode 100644
index 00000000000000..8da931e7bb7d70
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-applibrary'
+pkgname=cosmic-applibrary
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-applibrary short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applibrary"
+distfiles="https://github.com/pop-os/cosmic-applibrary/archive/refs/tags/${_tag}.tar.gz"
+checksum=6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From f75d0620e8e4bf1e147029566a3d089150de072d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:24:22 -0400
Subject: [PATCH 05/22] New package: cosmic-comp-1.0.0.alpha.1
---
srcpkgs/cosmic-comp | 1 -
srcpkgs/cosmic-comp/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-comp
create mode 100644 srcpkgs/cosmic-comp/template
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-comp
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
new file mode 100644
index 00000000000000..107f7525d08af2
--- /dev/null
+++ b/srcpkgs/cosmic-comp/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-comp'
+pkgname=cosmic-comp
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libseat-devel libxkbcommon-devel libinput-devel
+ pixman-devel libgbm-devel"
+short_desc="TODO: cosmic-comp short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-comp"
+distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.gz"
+checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+
+do_install() {
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} make install
+}
From a28e124ea1ab771ed159c0b8a5d77d4543783dc9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:30:31 -0400
Subject: [PATCH 06/22] New package: cosmic-edit-1.0.0.alpha.1
---
srcpkgs/cosmic-edit | 1 -
srcpkgs/cosmic-edit/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-edit
create mode 100644 srcpkgs/cosmic-edit/template
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-edit
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit/template b/srcpkgs/cosmic-edit/template
new file mode 100644
index 00000000000000..b7039c34389227
--- /dev/null
+++ b/srcpkgs/cosmic-edit/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-edit'
+pkgname=cosmic-edit
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel oniguruma-devel"
+short_desc="TODO: cosmic-edit short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-edit"
+distfiles="https://github.com/pop-os/cosmic-edit/archive/refs/tags/${_tag}.tar.gz"
+checksum=c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d36f01397b5d736d6ae0c9942a6ae57d7142b944 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:37:24 -0400
Subject: [PATCH 07/22] New package: cosmic-files-1.0.0.alpha.1
---
srcpkgs/cosmic-files | 1 -
srcpkgs/cosmic-files/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-files
create mode 100644 srcpkgs/cosmic-files/template
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-files
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files/template b/srcpkgs/cosmic-files/template
new file mode 100644
index 00000000000000..463c7934f2768b
--- /dev/null
+++ b/srcpkgs/cosmic-files/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-files'
+pkgname=cosmic-files
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel libglib-devel"
+short_desc="TODO: cosmic-files short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-files"
+distfiles="https://github.com/pop-os/cosmic-files/archive/refs/tags/${_tag}.tar.gz"
+checksum=e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 4183b453b00ee16a9eaee8d9cd2aedf6c218dc93 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 01:31:38 -0400
Subject: [PATCH 08/22] New package: cosmic-greeter-1.0.0.alpha.1
---
srcpkgs/cosmic-greeter | 1 -
srcpkgs/cosmic-greeter/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-greeter
create mode 100644 srcpkgs/cosmic-greeter/template
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-greeter
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter/template b/srcpkgs/cosmic-greeter/template
new file mode 100644
index 00000000000000..75611b9344c90c
--- /dev/null
+++ b/srcpkgs/cosmic-greeter/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-greeter'
+pkgname=cosmic-greeter
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+configure_args=" --all"
+hostmakedepends="pkg-config just llvm18-devel"
+makedepends="libxkbcommon-devel eudev-libudev-devel pam-devel libinput-devel"
+short_desc="TODO: cosmic-greeter short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-greeter"
+distfiles="https://github.com/pop-os/cosmic-greeter/archive/refs/tags/${_tag}.tar.gz"
+checksum=408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d348e38a21d0ac9c28927cb4f94517ae367609c6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:47:42 -0400
Subject: [PATCH 09/22] New package: cosmic-icons-1.0.0.alpha.1
---
srcpkgs/cosmic-icons | 1 -
srcpkgs/cosmic-icons/template | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-icons
create mode 100644 srcpkgs/cosmic-icons/template
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-icons
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons/template b/srcpkgs/cosmic-icons/template
new file mode 100644
index 00000000000000..476ab867e57324
--- /dev/null
+++ b/srcpkgs/cosmic-icons/template
@@ -0,0 +1,16 @@
+# Template file for 'cosmic-icons'
+pkgname=cosmic-icons
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+hostmakedepends="just"
+short_desc="TODO: cosmic-icons short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-icons"
+distfiles="https://github.com/pop-os/cosmic-icons/archive/refs/tags/${_tag}.tar.gz"
+checksum=20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+
+do_install() {
+ just --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 871b88d59d8143fe004eb6eabde55adb8580a1d3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:52:07 -0400
Subject: [PATCH 10/22] New package: cosmic-launcher-1.0.0.alpha.1
---
srcpkgs/cosmic-launcher | 1 -
srcpkgs/cosmic-launcher/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-launcher
create mode 100644 srcpkgs/cosmic-launcher/template
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-launcher
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher/template b/srcpkgs/cosmic-launcher/template
new file mode 100644
index 00000000000000..7316a116cc1113
--- /dev/null
+++ b/srcpkgs/cosmic-launcher/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-launcher'
+pkgname=cosmic-launcher
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-launcher short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-launcher"
+distfiles="https://github.com/pop-os/cosmic-launcher/archive/refs/tags/${_tag}.tar.gz"
+checksum=a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 6b65f12526b2a8ae7705b68fe471e753b57c2e65 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:55:46 -0400
Subject: [PATCH 11/22] New package: cosmic-notifications-1.0.0.alpha.1
---
srcpkgs/cosmic-notifications | 1 -
.../patches/0001-systemd.patch | 102 ++++++++++++++++++
srcpkgs/cosmic-notifications/template | 18 ++++
3 files changed, 120 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-notifications
create mode 100644 srcpkgs/cosmic-notifications/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-notifications/template
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-notifications
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications/patches/0001-systemd.patch b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..e698ae73e6d4d2
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
@@ -0,0 +1,102 @@
+From c481817c5ea763d4d388d2ab1b1ab7736f1ff2e0 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:04:17 +0100
+Subject: [PATCH 1/2] Add a defaulted systemd feature to include and use
+ tracing_journald
+
+---
+ Cargo.toml | 6 +++++-
+ src/main.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f4e1900..2e37ce5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -27,7 +27,7 @@ tracing = "0.1"
+ nix = "0.26.2"
+ once_cell = "1.17"
+ tracing-subscriber = "0.3.17"
+-tracing-journald = "0.3.0"
++tracing-journald = { version = "0.3.0", optional = true }
+ rust-embed = "8.4.0"
+ serde = { version = "1.0.152", features = ["derive"] }
+ ron = "0.8"
+@@ -53,6 +53,10 @@ log-panics = { version = "2", features = ["with-backtrace"] }
+ # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+ # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+
++[features]
++systemd = ["dep:tracing-journald"]
++default = ["systemd"]
++
+ [workspace]
+ members = ["cosmic-notifications-util", "cosmic-notifications-config"]
+
+diff --git a/src/main.rs b/src/main.rs
+index 88d360e..ba9f241 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -12,8 +12,10 @@ use localize::localize;
+ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer()?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer()?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From dcc0461d2d77f9c89679a2741a30319dc73593b2 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:10:29 +0100
+Subject: [PATCH 2/2] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index ba9f241..b8531b6 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -13,16 +13,25 @@ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+ let trace = tracing_subscriber::registry();
++
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::WARN.into())
++ .from_env_lossy();
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer()?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::WARN.into())
+- .from_env_lossy(),
+- )
+- .try_init()?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()?;
++ } else {
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++ tracing::warn!("Failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++
+ log_panics::init();
+
+ info!("cosmic-notifications ({})", APP_ID);
diff --git a/srcpkgs/cosmic-notifications/template b/srcpkgs/cosmic-notifications/template
new file mode 100644
index 00000000000000..ef22e2c5022d36
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-notifications'
+pkgname=cosmic-notifications
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-notifications short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-notifications"
+distfiles="https://github.com/pop-os/cosmic-notifications/archive/refs/tags/${_tag}.tar.gz"
+checksum=6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 948274c38ff3106407c7fc385570400d47b7011b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:01:21 -0400
Subject: [PATCH 12/22] New package: cosmic-osd-1.0.0.alpha.1
---
srcpkgs/cosmic-osd | 1 -
srcpkgs/cosmic-osd/template | 14 ++++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-osd
create mode 100644 srcpkgs/cosmic-osd/template
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-osd
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd/template b/srcpkgs/cosmic-osd/template
new file mode 100644
index 00000000000000..865b28f89dadba
--- /dev/null
+++ b/srcpkgs/cosmic-osd/template
@@ -0,0 +1,14 @@
+# Template file for 'cosmic-osd'
+pkgname=cosmic-osd
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel pulseaudio-devel"
+short_desc="TODO: cosmic-osd short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-osd"
+distfiles="https://github.com/pop-os/cosmic-osd/archive/refs/tags/${_tag}.tar.gz"
+checksum=a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
From e5cc09482475953224b72f845ceb96293207f6e9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:04:44 -0400
Subject: [PATCH 13/22] New package: cosmic-panel-1.0.0.alpha.1
---
srcpkgs/cosmic-panel | 1 -
srcpkgs/cosmic-panel/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-panel
create mode 100644 srcpkgs/cosmic-panel/template
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-panel
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
new file mode 100644
index 00000000000000..f036897042f5d0
--- /dev/null
+++ b/srcpkgs/cosmic-panel/template
@@ -0,0 +1,20 @@
+# Template file for 'cosmic-panel'
+pkgname=cosmic-panel
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cosmic-panel-bin"
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-panel short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-panel"
+distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
+checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+
+post_install() {
+ vmkdir usr/share/cosmic
+ vcopy "data/default_schema/*" usr/share/cosmic
+}
From fa7983e33154d44a8659378472bc0655f9aa911a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:11:43 -0400
Subject: [PATCH 14/22] New package: cosmic-randr-1.0.0.alpha.1
---
srcpkgs/cosmic-randr | 1 -
srcpkgs/cosmic-randr/template | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-randr
create mode 100644 srcpkgs/cosmic-randr/template
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-randr
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr/template b/srcpkgs/cosmic-randr/template
new file mode 100644
index 00000000000000..d025e245ef696c
--- /dev/null
+++ b/srcpkgs/cosmic-randr/template
@@ -0,0 +1,13 @@
+# Template file for 'cosmic-randr'
+pkgname=cosmic-randr
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cli"
+short_desc="TODO: cosmic-randr short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-randr"
+distfiles="https://github.com/pop-os/cosmic-randr/archive/refs/tags/${_tag}.tar.gz"
+checksum=b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
From 7d45852808ede2908589ea3afa19e0eaa19eccd7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:14:24 -0400
Subject: [PATCH 15/22] New package: cosmic-screenshot-1.0.0.alpha.1
---
srcpkgs/cosmic-screenshot | 1 -
srcpkgs/cosmic-screenshot/template | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-screenshot
create mode 100644 srcpkgs/cosmic-screenshot/template
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-screenshot
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot/template b/srcpkgs/cosmic-screenshot/template
new file mode 100644
index 00000000000000..f578512bb03b7b
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot/template
@@ -0,0 +1,17 @@
+# Template file for 'cosmic-screenshot'
+pkgname=cosmic-screenshot
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-screenshot short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-screenshot"
+distfiles="https://github.com/pop-os/cosmic-screenshot/archive/refs/tags/${_tag}.tar.gz"
+checksum=78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From a4c99c07919bf88931dcb4eff67715ec3554ca73 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:25:45 -0400
Subject: [PATCH 16/22] New package: cosmic-session-1.0.0.alpha.1
---
srcpkgs/cosmic-session | 1 -
.../cosmic-session/patches/0001-systemd.patch | 182 ++++++++++++++++++
.../cosmic-session/patches/0002-systemd.patch | 10 +
srcpkgs/cosmic-session/template | 18 ++
4 files changed, 210 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-session
create mode 100644 srcpkgs/cosmic-session/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-session/patches/0002-systemd.patch
create mode 100644 srcpkgs/cosmic-session/template
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-session
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session/patches/0001-systemd.patch b/srcpkgs/cosmic-session/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..578ca1002b6a1a
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0001-systemd.patch
@@ -0,0 +1,182 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 357379d116501a337e4dc1f3375f2f71e74f1f31 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..636d88b 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -44,17 +44,34 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
+ trace
+ .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
++ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/cosmic-session/patches/0002-systemd.patch b/srcpkgs/cosmic-session/patches/0002-systemd.patch
new file mode 100644
index 00000000000000..bc03edc8487da6
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0002-systemd.patch
@@ -0,0 +1,10 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..68a8571 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,5 +45,3 @@ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+-default = ["systemd"]
diff --git a/srcpkgs/cosmic-session/template b/srcpkgs/cosmic-session/template
new file mode 100644
index 00000000000000..a76928658e7e46
--- /dev/null
+++ b/srcpkgs/cosmic-session/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-session'
+pkgname=cosmic-session
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-session short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-session"
+distfiles="https://github.com/pop-os/cosmic-session/archive/refs/tags/${_tag}.tar.gz"
+checksum=be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" \
+ --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install
+}
From 7b44d76d794b5ab5a710d76a072c09bc56af938b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:36:20 -0400
Subject: [PATCH 17/22] New package: cosmic-settings-1.0.0.alpha.1
---
srcpkgs/cosmic-settings | 1 -
srcpkgs/cosmic-settings/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings
create mode 100644 srcpkgs/cosmic-settings/template
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings/template b/srcpkgs/cosmic-settings/template
new file mode 100644
index 00000000000000..aa2652fc351675
--- /dev/null
+++ b/srcpkgs/cosmic-settings/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-settings'
+pkgname=cosmic-settings
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings"
+distfiles="https://github.com/pop-os/cosmic-settings/archive/refs/tags/${_tag}.tar.gz"
+checksum=eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 94beccabf2cb19217cf552ab53b4c773e34f14c3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:38:56 -0400
Subject: [PATCH 18/22] New package: cosmic-settings-daemon-1.0.0.alpha.1
---
srcpkgs/cosmic-settings-daemon | 1 -
srcpkgs/cosmic-settings-daemon/template | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings-daemon
create mode 100644 srcpkgs/cosmic-settings-daemon/template
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings-daemon
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon/template b/srcpkgs/cosmic-settings-daemon/template
new file mode 100644
index 00000000000000..93806518c7824c
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon/template
@@ -0,0 +1,25 @@
+# Template file for 'cosmic-settings-daemon'
+pkgname=cosmic-settings-daemon
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel geoclue2-devel"
+depends="geoclue2"
+short_desc="TODO: cosmic-settings-daemon short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pop-os/cosmic-settings-daemon"
+distfiles="https://github.com/pop-os/cosmic-settings-daemon/archive/refs/tags/${_tag}.tar.gz"
+checksum=fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+
+export GEOCLUE_AGENT="/usr/libexec/geoclue-2.0/demos/agent"
+
+post_install() {
+ vinstall data/system_actions.ron 0644 \
+ usr/share/cosmic/com.system76.CosmicSettings.Shortcuts/v1 system_actions
+
+ vinstall data/polkit-1/rules.d/cosmic-settings-daemon.rules 0644 \
+ usr/share/polkit-1/rules.d
+}
From bb5606a9f33fe3bdad42849aa1d7d034268d9dbc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:44:14 -0400
Subject: [PATCH 19/22] New package: cosmic-store-1.0.0.alpha.1
---
srcpkgs/cosmic-store | 1 -
srcpkgs/cosmic-store/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-store
create mode 100644 srcpkgs/cosmic-store/template
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-store
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store/template b/srcpkgs/cosmic-store/template
new file mode 100644
index 00000000000000..86c65904933a1a
--- /dev/null
+++ b/srcpkgs/cosmic-store/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-store'
+pkgname=cosmic-store
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel openssl-devel flatpak-devel"
+short_desc="TODO: cosmic-store short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-store"
+distfiles="https://github.com/pop-os/cosmic-store/archive/refs/tags/${_tag}.tar.gz"
+checksum=eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From adfc9c27f9ea054dff0f602ee8fe58d63f3248e1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:45:00 -0400
Subject: [PATCH 20/22] New package: cosmic-term-1.0.0.alpha.1
---
srcpkgs/cosmic-term | 1 -
srcpkgs/cosmic-term/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-term
create mode 100644 srcpkgs/cosmic-term/template
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-term
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term/template b/srcpkgs/cosmic-term/template
new file mode 100644
index 00000000000000..7ba0f87d2889ed
--- /dev/null
+++ b/srcpkgs/cosmic-term/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-term'
+pkgname=cosmic-term
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-term short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-term"
+distfiles="https://github.com/pop-os/cosmic-term/archive/refs/tags/${_tag}.tar.gz"
+checksum=3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From c63fd959074e947b8eb45ada94fffcf8bae826cf Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:14:00 -0400
Subject: [PATCH 21/22] New package: cosmic-workspaces-epoch-1.0.0.alpha.1
---
srcpkgs/cosmic-workspaces-epoch | 1 -
srcpkgs/cosmic-workspaces-epoch/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 100644 srcpkgs/cosmic-workspaces-epoch/template
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-workspaces-epoch
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch/template b/srcpkgs/cosmic-workspaces-epoch/template
new file mode 100644
index 00000000000000..7f822f05cc1171
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-workspaces-epoch'
+pkgname=cosmic-workspaces-epoch
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel libgbm-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-workspaces-epoch short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-workspaces-epoch"
+distfiles="https://github.com/pop-os/cosmic-workspaces-epoch/archive/refs/tags/${_tag}.tar.gz"
+checksum=d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+
+post_install() {
+ vinstall data/com.system76.CosmicWorkspaces.desktop 0644 usr/share/applications
+ vinstall data/com.system76.CosmicWorkspaces.svg 0644 usr/share/icons/hicolor/scalable/apps
+}
From f680c0fa0ef3ec5f355bc698905ecfbe7ae1ac48 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:32:56 -0400
Subject: [PATCH 22/22] New package: xdg-desktop-portal-cosmic-1.0.0.alpha.1
---
srcpkgs/xdg-desktop-portal-cosmic | 1 -
srcpkgs/xdg-desktop-portal-cosmic/template | 22 ++++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/xdg-desktop-portal-cosmic
create mode 100644 srcpkgs/xdg-desktop-portal-cosmic/template
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/xdg-desktop-portal-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic/template b/srcpkgs/xdg-desktop-portal-cosmic/template
new file mode 100644
index 00000000000000..95d330f4cd11a9
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic/template
@@ -0,0 +1,22 @@
+# Template file for 'xdg-desktop-portal-cosmic'
+pkgname=xdg-desktop-portal-cosmic
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config llvm18 clang18"
+makedepends="libxkbcommon-devel libgbm-devel pipewire-devel llvm18-devel"
+depends="xdg-desktop-portal"
+short_desc="TODO: xdg-desktop-portal-cosmic short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/xdg-desktop-portal-cosmic"
+distfiles="https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/refs/tags/${_tag}.tar.gz"
+checksum=ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ DESTDIR="${DESTDIR}" prefix=/usr CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (12 preceding siblings ...)
2024-08-11 22:55 ` Calandracas606
@ 2024-08-12 2:45 ` Calandracas606
2024-08-12 2:48 ` Calandracas606
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-12 2:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 53069 bytes --]
From dd0d9c3931cf5fe9095cf1e04c0d01052c8a9e7e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH 01/22] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 14 ++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 35 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..872f184f0baaed
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,14 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+build_style=meta
+depends="cosmic-applets cosmic-applibrary cosmic-bg cosmic-comp cosmic-edit
+ cosmic-files cosmic-greeter cosmic-icons cosmic-launcher cosmic-notifications
+ cosmic-osd cosmic-panel cosmic-randr cosmic-screenshot cosmic-session
+ cosmic-settings cosmic-settings-daemon cosmic-store cosmic-term
+ cosmic-workspaces-epoch xdg-desktop-portal-cosmic"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Public Domain"
+homepage="https://system76.com/cosmic"
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
From 1bb9c848970c49791e591de9f978909de998a05b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:26:22 -0400
Subject: [PATCH 02/22] New package: cosmic-bg-1.0.0.alpha.1
---
srcpkgs/cosmic-bg | 1 -
srcpkgs/cosmic-bg/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-bg
create mode 100644 srcpkgs/cosmic-bg/template
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-bg
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg/template b/srcpkgs/cosmic-bg/template
new file mode 100644
index 00000000000000..a79027a7bbf73c
--- /dev/null
+++ b/srcpkgs/cosmic-bg/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-bg'
+pkgname=cosmic-bg
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-bg short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-bg"
+distfiles="https://github.com/pop-os/cosmic-bg/archive/refs/tags/${_tag}.tar.gz"
+checksum=6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From abd92d61ef40d958408d7113286eab08695187e2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:51:36 -0400
Subject: [PATCH 03/22] New package: cosmic-applets-1.0.0.alpha.1
---
srcpkgs/cosmic-applets | 1 -
srcpkgs/cosmic-applets/template | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applets
create mode 100644 srcpkgs/cosmic-applets/template
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applets
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applets/template b/srcpkgs/cosmic-applets/template
new file mode 100644
index 00000000000000..662f4b519be4aa
--- /dev/null
+++ b/srcpkgs/cosmic-applets/template
@@ -0,0 +1,23 @@
+# Template file for 'cosmic-applets'
+pkgname=cosmic-applets
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel dbus-devel pulseaudio-devel libinput-devel"
+short_desc="TODO: cosmic-applets short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applets"
+distfiles="https://github.com/pop-os/cosmic-applets/archive/refs/tags/${_tag}.tar.gz"
+checksum=be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+do_install() {
+ just --set targetdir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} \
+ --set prefix /usr --set cosmic-applets-bin cosmic-applets install
+}
From 2623f6cd3ce00191602911f7731e481846f0ebb1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:56:31 -0400
Subject: [PATCH 04/22] New package: cosmic-applibrary-1.0.0.alpha.1
---
srcpkgs/cosmic-applibrary | 1 -
srcpkgs/cosmic-applibrary/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applibrary
create mode 100644 srcpkgs/cosmic-applibrary/template
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applibrary
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary/template b/srcpkgs/cosmic-applibrary/template
new file mode 100644
index 00000000000000..8da931e7bb7d70
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-applibrary'
+pkgname=cosmic-applibrary
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-applibrary short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applibrary"
+distfiles="https://github.com/pop-os/cosmic-applibrary/archive/refs/tags/${_tag}.tar.gz"
+checksum=6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From f75d0620e8e4bf1e147029566a3d089150de072d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:24:22 -0400
Subject: [PATCH 05/22] New package: cosmic-comp-1.0.0.alpha.1
---
srcpkgs/cosmic-comp | 1 -
srcpkgs/cosmic-comp/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-comp
create mode 100644 srcpkgs/cosmic-comp/template
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-comp
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
new file mode 100644
index 00000000000000..107f7525d08af2
--- /dev/null
+++ b/srcpkgs/cosmic-comp/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-comp'
+pkgname=cosmic-comp
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libseat-devel libxkbcommon-devel libinput-devel
+ pixman-devel libgbm-devel"
+short_desc="TODO: cosmic-comp short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-comp"
+distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.gz"
+checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+
+do_install() {
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} make install
+}
From a28e124ea1ab771ed159c0b8a5d77d4543783dc9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:30:31 -0400
Subject: [PATCH 06/22] New package: cosmic-edit-1.0.0.alpha.1
---
srcpkgs/cosmic-edit | 1 -
srcpkgs/cosmic-edit/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-edit
create mode 100644 srcpkgs/cosmic-edit/template
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-edit
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit/template b/srcpkgs/cosmic-edit/template
new file mode 100644
index 00000000000000..b7039c34389227
--- /dev/null
+++ b/srcpkgs/cosmic-edit/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-edit'
+pkgname=cosmic-edit
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel oniguruma-devel"
+short_desc="TODO: cosmic-edit short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-edit"
+distfiles="https://github.com/pop-os/cosmic-edit/archive/refs/tags/${_tag}.tar.gz"
+checksum=c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d36f01397b5d736d6ae0c9942a6ae57d7142b944 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:37:24 -0400
Subject: [PATCH 07/22] New package: cosmic-files-1.0.0.alpha.1
---
srcpkgs/cosmic-files | 1 -
srcpkgs/cosmic-files/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-files
create mode 100644 srcpkgs/cosmic-files/template
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-files
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files/template b/srcpkgs/cosmic-files/template
new file mode 100644
index 00000000000000..463c7934f2768b
--- /dev/null
+++ b/srcpkgs/cosmic-files/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-files'
+pkgname=cosmic-files
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel libglib-devel"
+short_desc="TODO: cosmic-files short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-files"
+distfiles="https://github.com/pop-os/cosmic-files/archive/refs/tags/${_tag}.tar.gz"
+checksum=e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 4183b453b00ee16a9eaee8d9cd2aedf6c218dc93 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 01:31:38 -0400
Subject: [PATCH 08/22] New package: cosmic-greeter-1.0.0.alpha.1
---
srcpkgs/cosmic-greeter | 1 -
srcpkgs/cosmic-greeter/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-greeter
create mode 100644 srcpkgs/cosmic-greeter/template
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-greeter
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter/template b/srcpkgs/cosmic-greeter/template
new file mode 100644
index 00000000000000..75611b9344c90c
--- /dev/null
+++ b/srcpkgs/cosmic-greeter/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-greeter'
+pkgname=cosmic-greeter
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+configure_args=" --all"
+hostmakedepends="pkg-config just llvm18-devel"
+makedepends="libxkbcommon-devel eudev-libudev-devel pam-devel libinput-devel"
+short_desc="TODO: cosmic-greeter short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-greeter"
+distfiles="https://github.com/pop-os/cosmic-greeter/archive/refs/tags/${_tag}.tar.gz"
+checksum=408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d348e38a21d0ac9c28927cb4f94517ae367609c6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:47:42 -0400
Subject: [PATCH 09/22] New package: cosmic-icons-1.0.0.alpha.1
---
srcpkgs/cosmic-icons | 1 -
srcpkgs/cosmic-icons/template | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-icons
create mode 100644 srcpkgs/cosmic-icons/template
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-icons
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons/template b/srcpkgs/cosmic-icons/template
new file mode 100644
index 00000000000000..476ab867e57324
--- /dev/null
+++ b/srcpkgs/cosmic-icons/template
@@ -0,0 +1,16 @@
+# Template file for 'cosmic-icons'
+pkgname=cosmic-icons
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+hostmakedepends="just"
+short_desc="TODO: cosmic-icons short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-icons"
+distfiles="https://github.com/pop-os/cosmic-icons/archive/refs/tags/${_tag}.tar.gz"
+checksum=20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+
+do_install() {
+ just --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 871b88d59d8143fe004eb6eabde55adb8580a1d3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:52:07 -0400
Subject: [PATCH 10/22] New package: cosmic-launcher-1.0.0.alpha.1
---
srcpkgs/cosmic-launcher | 1 -
srcpkgs/cosmic-launcher/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-launcher
create mode 100644 srcpkgs/cosmic-launcher/template
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-launcher
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher/template b/srcpkgs/cosmic-launcher/template
new file mode 100644
index 00000000000000..7316a116cc1113
--- /dev/null
+++ b/srcpkgs/cosmic-launcher/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-launcher'
+pkgname=cosmic-launcher
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-launcher short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-launcher"
+distfiles="https://github.com/pop-os/cosmic-launcher/archive/refs/tags/${_tag}.tar.gz"
+checksum=a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 6b65f12526b2a8ae7705b68fe471e753b57c2e65 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:55:46 -0400
Subject: [PATCH 11/22] New package: cosmic-notifications-1.0.0.alpha.1
---
srcpkgs/cosmic-notifications | 1 -
.../patches/0001-systemd.patch | 102 ++++++++++++++++++
srcpkgs/cosmic-notifications/template | 18 ++++
3 files changed, 120 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-notifications
create mode 100644 srcpkgs/cosmic-notifications/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-notifications/template
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-notifications
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications/patches/0001-systemd.patch b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..e698ae73e6d4d2
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
@@ -0,0 +1,102 @@
+From c481817c5ea763d4d388d2ab1b1ab7736f1ff2e0 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:04:17 +0100
+Subject: [PATCH 1/2] Add a defaulted systemd feature to include and use
+ tracing_journald
+
+---
+ Cargo.toml | 6 +++++-
+ src/main.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f4e1900..2e37ce5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -27,7 +27,7 @@ tracing = "0.1"
+ nix = "0.26.2"
+ once_cell = "1.17"
+ tracing-subscriber = "0.3.17"
+-tracing-journald = "0.3.0"
++tracing-journald = { version = "0.3.0", optional = true }
+ rust-embed = "8.4.0"
+ serde = { version = "1.0.152", features = ["derive"] }
+ ron = "0.8"
+@@ -53,6 +53,10 @@ log-panics = { version = "2", features = ["with-backtrace"] }
+ # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+ # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+
++[features]
++systemd = ["dep:tracing-journald"]
++default = ["systemd"]
++
+ [workspace]
+ members = ["cosmic-notifications-util", "cosmic-notifications-config"]
+
+diff --git a/src/main.rs b/src/main.rs
+index 88d360e..ba9f241 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -12,8 +12,10 @@ use localize::localize;
+ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer()?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer()?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From dcc0461d2d77f9c89679a2741a30319dc73593b2 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:10:29 +0100
+Subject: [PATCH 2/2] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index ba9f241..b8531b6 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -13,16 +13,25 @@ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+ let trace = tracing_subscriber::registry();
++
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::WARN.into())
++ .from_env_lossy();
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer()?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::WARN.into())
+- .from_env_lossy(),
+- )
+- .try_init()?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()?;
++ } else {
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++ tracing::warn!("Failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++
+ log_panics::init();
+
+ info!("cosmic-notifications ({})", APP_ID);
diff --git a/srcpkgs/cosmic-notifications/template b/srcpkgs/cosmic-notifications/template
new file mode 100644
index 00000000000000..ef22e2c5022d36
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-notifications'
+pkgname=cosmic-notifications
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-notifications short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-notifications"
+distfiles="https://github.com/pop-os/cosmic-notifications/archive/refs/tags/${_tag}.tar.gz"
+checksum=6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 948274c38ff3106407c7fc385570400d47b7011b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:01:21 -0400
Subject: [PATCH 12/22] New package: cosmic-osd-1.0.0.alpha.1
---
srcpkgs/cosmic-osd | 1 -
srcpkgs/cosmic-osd/template | 14 ++++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-osd
create mode 100644 srcpkgs/cosmic-osd/template
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-osd
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd/template b/srcpkgs/cosmic-osd/template
new file mode 100644
index 00000000000000..865b28f89dadba
--- /dev/null
+++ b/srcpkgs/cosmic-osd/template
@@ -0,0 +1,14 @@
+# Template file for 'cosmic-osd'
+pkgname=cosmic-osd
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel pulseaudio-devel"
+short_desc="TODO: cosmic-osd short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-osd"
+distfiles="https://github.com/pop-os/cosmic-osd/archive/refs/tags/${_tag}.tar.gz"
+checksum=a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
From e5cc09482475953224b72f845ceb96293207f6e9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:04:44 -0400
Subject: [PATCH 13/22] New package: cosmic-panel-1.0.0.alpha.1
---
srcpkgs/cosmic-panel | 1 -
srcpkgs/cosmic-panel/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-panel
create mode 100644 srcpkgs/cosmic-panel/template
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-panel
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
new file mode 100644
index 00000000000000..f036897042f5d0
--- /dev/null
+++ b/srcpkgs/cosmic-panel/template
@@ -0,0 +1,20 @@
+# Template file for 'cosmic-panel'
+pkgname=cosmic-panel
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cosmic-panel-bin"
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-panel short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-panel"
+distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
+checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+
+post_install() {
+ vmkdir usr/share/cosmic
+ vcopy "data/default_schema/*" usr/share/cosmic
+}
From fa7983e33154d44a8659378472bc0655f9aa911a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:11:43 -0400
Subject: [PATCH 14/22] New package: cosmic-randr-1.0.0.alpha.1
---
srcpkgs/cosmic-randr | 1 -
srcpkgs/cosmic-randr/template | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-randr
create mode 100644 srcpkgs/cosmic-randr/template
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-randr
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr/template b/srcpkgs/cosmic-randr/template
new file mode 100644
index 00000000000000..d025e245ef696c
--- /dev/null
+++ b/srcpkgs/cosmic-randr/template
@@ -0,0 +1,13 @@
+# Template file for 'cosmic-randr'
+pkgname=cosmic-randr
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cli"
+short_desc="TODO: cosmic-randr short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-randr"
+distfiles="https://github.com/pop-os/cosmic-randr/archive/refs/tags/${_tag}.tar.gz"
+checksum=b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
From 7d45852808ede2908589ea3afa19e0eaa19eccd7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:14:24 -0400
Subject: [PATCH 15/22] New package: cosmic-screenshot-1.0.0.alpha.1
---
srcpkgs/cosmic-screenshot | 1 -
srcpkgs/cosmic-screenshot/template | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-screenshot
create mode 100644 srcpkgs/cosmic-screenshot/template
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-screenshot
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot/template b/srcpkgs/cosmic-screenshot/template
new file mode 100644
index 00000000000000..f578512bb03b7b
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot/template
@@ -0,0 +1,17 @@
+# Template file for 'cosmic-screenshot'
+pkgname=cosmic-screenshot
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-screenshot short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-screenshot"
+distfiles="https://github.com/pop-os/cosmic-screenshot/archive/refs/tags/${_tag}.tar.gz"
+checksum=78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From a4c99c07919bf88931dcb4eff67715ec3554ca73 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:25:45 -0400
Subject: [PATCH 16/22] New package: cosmic-session-1.0.0.alpha.1
---
srcpkgs/cosmic-session | 1 -
.../cosmic-session/patches/0001-systemd.patch | 182 ++++++++++++++++++
.../cosmic-session/patches/0002-systemd.patch | 10 +
srcpkgs/cosmic-session/template | 18 ++
4 files changed, 210 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-session
create mode 100644 srcpkgs/cosmic-session/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-session/patches/0002-systemd.patch
create mode 100644 srcpkgs/cosmic-session/template
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-session
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session/patches/0001-systemd.patch b/srcpkgs/cosmic-session/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..578ca1002b6a1a
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0001-systemd.patch
@@ -0,0 +1,182 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 357379d116501a337e4dc1f3375f2f71e74f1f31 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..636d88b 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -44,17 +44,34 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
+ trace
+ .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
++ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/cosmic-session/patches/0002-systemd.patch b/srcpkgs/cosmic-session/patches/0002-systemd.patch
new file mode 100644
index 00000000000000..bc03edc8487da6
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0002-systemd.patch
@@ -0,0 +1,10 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..68a8571 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,5 +45,3 @@ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+-default = ["systemd"]
diff --git a/srcpkgs/cosmic-session/template b/srcpkgs/cosmic-session/template
new file mode 100644
index 00000000000000..a76928658e7e46
--- /dev/null
+++ b/srcpkgs/cosmic-session/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-session'
+pkgname=cosmic-session
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-session short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-session"
+distfiles="https://github.com/pop-os/cosmic-session/archive/refs/tags/${_tag}.tar.gz"
+checksum=be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" \
+ --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install
+}
From 7b44d76d794b5ab5a710d76a072c09bc56af938b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:36:20 -0400
Subject: [PATCH 17/22] New package: cosmic-settings-1.0.0.alpha.1
---
srcpkgs/cosmic-settings | 1 -
srcpkgs/cosmic-settings/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings
create mode 100644 srcpkgs/cosmic-settings/template
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings/template b/srcpkgs/cosmic-settings/template
new file mode 100644
index 00000000000000..aa2652fc351675
--- /dev/null
+++ b/srcpkgs/cosmic-settings/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-settings'
+pkgname=cosmic-settings
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings"
+distfiles="https://github.com/pop-os/cosmic-settings/archive/refs/tags/${_tag}.tar.gz"
+checksum=eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 94beccabf2cb19217cf552ab53b4c773e34f14c3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:38:56 -0400
Subject: [PATCH 18/22] New package: cosmic-settings-daemon-1.0.0.alpha.1
---
srcpkgs/cosmic-settings-daemon | 1 -
srcpkgs/cosmic-settings-daemon/template | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings-daemon
create mode 100644 srcpkgs/cosmic-settings-daemon/template
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings-daemon
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon/template b/srcpkgs/cosmic-settings-daemon/template
new file mode 100644
index 00000000000000..93806518c7824c
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon/template
@@ -0,0 +1,25 @@
+# Template file for 'cosmic-settings-daemon'
+pkgname=cosmic-settings-daemon
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel geoclue2-devel"
+depends="geoclue2"
+short_desc="TODO: cosmic-settings-daemon short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pop-os/cosmic-settings-daemon"
+distfiles="https://github.com/pop-os/cosmic-settings-daemon/archive/refs/tags/${_tag}.tar.gz"
+checksum=fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+
+export GEOCLUE_AGENT="/usr/libexec/geoclue-2.0/demos/agent"
+
+post_install() {
+ vinstall data/system_actions.ron 0644 \
+ usr/share/cosmic/com.system76.CosmicSettings.Shortcuts/v1 system_actions
+
+ vinstall data/polkit-1/rules.d/cosmic-settings-daemon.rules 0644 \
+ usr/share/polkit-1/rules.d
+}
From bb5606a9f33fe3bdad42849aa1d7d034268d9dbc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:44:14 -0400
Subject: [PATCH 19/22] New package: cosmic-store-1.0.0.alpha.1
---
srcpkgs/cosmic-store | 1 -
srcpkgs/cosmic-store/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-store
create mode 100644 srcpkgs/cosmic-store/template
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-store
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store/template b/srcpkgs/cosmic-store/template
new file mode 100644
index 00000000000000..86c65904933a1a
--- /dev/null
+++ b/srcpkgs/cosmic-store/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-store'
+pkgname=cosmic-store
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel openssl-devel flatpak-devel"
+short_desc="TODO: cosmic-store short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-store"
+distfiles="https://github.com/pop-os/cosmic-store/archive/refs/tags/${_tag}.tar.gz"
+checksum=eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From adfc9c27f9ea054dff0f602ee8fe58d63f3248e1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:45:00 -0400
Subject: [PATCH 20/22] New package: cosmic-term-1.0.0.alpha.1
---
srcpkgs/cosmic-term | 1 -
srcpkgs/cosmic-term/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-term
create mode 100644 srcpkgs/cosmic-term/template
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-term
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term/template b/srcpkgs/cosmic-term/template
new file mode 100644
index 00000000000000..7ba0f87d2889ed
--- /dev/null
+++ b/srcpkgs/cosmic-term/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-term'
+pkgname=cosmic-term
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-term short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-term"
+distfiles="https://github.com/pop-os/cosmic-term/archive/refs/tags/${_tag}.tar.gz"
+checksum=3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From c63fd959074e947b8eb45ada94fffcf8bae826cf Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:14:00 -0400
Subject: [PATCH 21/22] New package: cosmic-workspaces-epoch-1.0.0.alpha.1
---
srcpkgs/cosmic-workspaces-epoch | 1 -
srcpkgs/cosmic-workspaces-epoch/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 100644 srcpkgs/cosmic-workspaces-epoch/template
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-workspaces-epoch
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch/template b/srcpkgs/cosmic-workspaces-epoch/template
new file mode 100644
index 00000000000000..7f822f05cc1171
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-workspaces-epoch'
+pkgname=cosmic-workspaces-epoch
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel libgbm-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-workspaces-epoch short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-workspaces-epoch"
+distfiles="https://github.com/pop-os/cosmic-workspaces-epoch/archive/refs/tags/${_tag}.tar.gz"
+checksum=d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+
+post_install() {
+ vinstall data/com.system76.CosmicWorkspaces.desktop 0644 usr/share/applications
+ vinstall data/com.system76.CosmicWorkspaces.svg 0644 usr/share/icons/hicolor/scalable/apps
+}
From 3c0ee762bf84d043b2132e6f089aa5c42218d1e6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:32:56 -0400
Subject: [PATCH 22/22] New package: xdg-desktop-portal-cosmic-1.0.0.alpha.1
---
srcpkgs/xdg-desktop-portal-cosmic | 1 -
srcpkgs/xdg-desktop-portal-cosmic/template | 23 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/xdg-desktop-portal-cosmic
create mode 100644 srcpkgs/xdg-desktop-portal-cosmic/template
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/xdg-desktop-portal-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic/template b/srcpkgs/xdg-desktop-portal-cosmic/template
new file mode 100644
index 00000000000000..faffd2378041b9
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic/template
@@ -0,0 +1,23 @@
+# Template file for 'xdg-desktop-portal-cosmic'
+pkgname=xdg-desktop-portal-cosmic
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config llvm18 clang18"
+makedepends="libxkbcommon-devel libgbm-devel pipewire-devel llvm18-devel
+ glib-devel gstreamer1-devel"
+depends="xdg-desktop-portal"
+short_desc="TODO: xdg-desktop-portal-cosmic short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/xdg-desktop-portal-cosmic"
+distfiles="https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/refs/tags/${_tag}.tar.gz"
+checksum=ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ DESTDIR="${DESTDIR}" prefix=/usr CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (13 preceding siblings ...)
2024-08-12 2:45 ` Calandracas606
@ 2024-08-12 2:48 ` Calandracas606
2024-08-12 2:51 ` Calandracas606
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-12 2:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 53232 bytes --]
From dd0d9c3931cf5fe9095cf1e04c0d01052c8a9e7e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH 01/22] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 14 ++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 35 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..872f184f0baaed
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,14 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+build_style=meta
+depends="cosmic-applets cosmic-applibrary cosmic-bg cosmic-comp cosmic-edit
+ cosmic-files cosmic-greeter cosmic-icons cosmic-launcher cosmic-notifications
+ cosmic-osd cosmic-panel cosmic-randr cosmic-screenshot cosmic-session
+ cosmic-settings cosmic-settings-daemon cosmic-store cosmic-term
+ cosmic-workspaces-epoch xdg-desktop-portal-cosmic"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Public Domain"
+homepage="https://system76.com/cosmic"
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
From 1bb9c848970c49791e591de9f978909de998a05b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:26:22 -0400
Subject: [PATCH 02/22] New package: cosmic-bg-1.0.0.alpha.1
---
srcpkgs/cosmic-bg | 1 -
srcpkgs/cosmic-bg/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-bg
create mode 100644 srcpkgs/cosmic-bg/template
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-bg
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg/template b/srcpkgs/cosmic-bg/template
new file mode 100644
index 00000000000000..a79027a7bbf73c
--- /dev/null
+++ b/srcpkgs/cosmic-bg/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-bg'
+pkgname=cosmic-bg
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-bg short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-bg"
+distfiles="https://github.com/pop-os/cosmic-bg/archive/refs/tags/${_tag}.tar.gz"
+checksum=6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From abd92d61ef40d958408d7113286eab08695187e2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:51:36 -0400
Subject: [PATCH 03/22] New package: cosmic-applets-1.0.0.alpha.1
---
srcpkgs/cosmic-applets | 1 -
srcpkgs/cosmic-applets/template | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applets
create mode 100644 srcpkgs/cosmic-applets/template
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applets
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applets/template b/srcpkgs/cosmic-applets/template
new file mode 100644
index 00000000000000..662f4b519be4aa
--- /dev/null
+++ b/srcpkgs/cosmic-applets/template
@@ -0,0 +1,23 @@
+# Template file for 'cosmic-applets'
+pkgname=cosmic-applets
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel dbus-devel pulseaudio-devel libinput-devel"
+short_desc="TODO: cosmic-applets short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applets"
+distfiles="https://github.com/pop-os/cosmic-applets/archive/refs/tags/${_tag}.tar.gz"
+checksum=be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+do_install() {
+ just --set targetdir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} \
+ --set prefix /usr --set cosmic-applets-bin cosmic-applets install
+}
From 2623f6cd3ce00191602911f7731e481846f0ebb1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:56:31 -0400
Subject: [PATCH 04/22] New package: cosmic-applibrary-1.0.0.alpha.1
---
srcpkgs/cosmic-applibrary | 1 -
srcpkgs/cosmic-applibrary/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applibrary
create mode 100644 srcpkgs/cosmic-applibrary/template
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applibrary
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary/template b/srcpkgs/cosmic-applibrary/template
new file mode 100644
index 00000000000000..8da931e7bb7d70
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-applibrary'
+pkgname=cosmic-applibrary
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-applibrary short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applibrary"
+distfiles="https://github.com/pop-os/cosmic-applibrary/archive/refs/tags/${_tag}.tar.gz"
+checksum=6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From f75d0620e8e4bf1e147029566a3d089150de072d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:24:22 -0400
Subject: [PATCH 05/22] New package: cosmic-comp-1.0.0.alpha.1
---
srcpkgs/cosmic-comp | 1 -
srcpkgs/cosmic-comp/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-comp
create mode 100644 srcpkgs/cosmic-comp/template
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-comp
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
new file mode 100644
index 00000000000000..107f7525d08af2
--- /dev/null
+++ b/srcpkgs/cosmic-comp/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-comp'
+pkgname=cosmic-comp
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libseat-devel libxkbcommon-devel libinput-devel
+ pixman-devel libgbm-devel"
+short_desc="TODO: cosmic-comp short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-comp"
+distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.gz"
+checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+
+do_install() {
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} make install
+}
From a28e124ea1ab771ed159c0b8a5d77d4543783dc9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:30:31 -0400
Subject: [PATCH 06/22] New package: cosmic-edit-1.0.0.alpha.1
---
srcpkgs/cosmic-edit | 1 -
srcpkgs/cosmic-edit/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-edit
create mode 100644 srcpkgs/cosmic-edit/template
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-edit
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit/template b/srcpkgs/cosmic-edit/template
new file mode 100644
index 00000000000000..b7039c34389227
--- /dev/null
+++ b/srcpkgs/cosmic-edit/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-edit'
+pkgname=cosmic-edit
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel oniguruma-devel"
+short_desc="TODO: cosmic-edit short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-edit"
+distfiles="https://github.com/pop-os/cosmic-edit/archive/refs/tags/${_tag}.tar.gz"
+checksum=c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d36f01397b5d736d6ae0c9942a6ae57d7142b944 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:37:24 -0400
Subject: [PATCH 07/22] New package: cosmic-files-1.0.0.alpha.1
---
srcpkgs/cosmic-files | 1 -
srcpkgs/cosmic-files/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-files
create mode 100644 srcpkgs/cosmic-files/template
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-files
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files/template b/srcpkgs/cosmic-files/template
new file mode 100644
index 00000000000000..463c7934f2768b
--- /dev/null
+++ b/srcpkgs/cosmic-files/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-files'
+pkgname=cosmic-files
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel libglib-devel"
+short_desc="TODO: cosmic-files short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-files"
+distfiles="https://github.com/pop-os/cosmic-files/archive/refs/tags/${_tag}.tar.gz"
+checksum=e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 4183b453b00ee16a9eaee8d9cd2aedf6c218dc93 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 01:31:38 -0400
Subject: [PATCH 08/22] New package: cosmic-greeter-1.0.0.alpha.1
---
srcpkgs/cosmic-greeter | 1 -
srcpkgs/cosmic-greeter/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-greeter
create mode 100644 srcpkgs/cosmic-greeter/template
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-greeter
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter/template b/srcpkgs/cosmic-greeter/template
new file mode 100644
index 00000000000000..75611b9344c90c
--- /dev/null
+++ b/srcpkgs/cosmic-greeter/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-greeter'
+pkgname=cosmic-greeter
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+configure_args=" --all"
+hostmakedepends="pkg-config just llvm18-devel"
+makedepends="libxkbcommon-devel eudev-libudev-devel pam-devel libinput-devel"
+short_desc="TODO: cosmic-greeter short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-greeter"
+distfiles="https://github.com/pop-os/cosmic-greeter/archive/refs/tags/${_tag}.tar.gz"
+checksum=408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d348e38a21d0ac9c28927cb4f94517ae367609c6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:47:42 -0400
Subject: [PATCH 09/22] New package: cosmic-icons-1.0.0.alpha.1
---
srcpkgs/cosmic-icons | 1 -
srcpkgs/cosmic-icons/template | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-icons
create mode 100644 srcpkgs/cosmic-icons/template
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-icons
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons/template b/srcpkgs/cosmic-icons/template
new file mode 100644
index 00000000000000..476ab867e57324
--- /dev/null
+++ b/srcpkgs/cosmic-icons/template
@@ -0,0 +1,16 @@
+# Template file for 'cosmic-icons'
+pkgname=cosmic-icons
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+hostmakedepends="just"
+short_desc="TODO: cosmic-icons short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-icons"
+distfiles="https://github.com/pop-os/cosmic-icons/archive/refs/tags/${_tag}.tar.gz"
+checksum=20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+
+do_install() {
+ just --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 871b88d59d8143fe004eb6eabde55adb8580a1d3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:52:07 -0400
Subject: [PATCH 10/22] New package: cosmic-launcher-1.0.0.alpha.1
---
srcpkgs/cosmic-launcher | 1 -
srcpkgs/cosmic-launcher/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-launcher
create mode 100644 srcpkgs/cosmic-launcher/template
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-launcher
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher/template b/srcpkgs/cosmic-launcher/template
new file mode 100644
index 00000000000000..7316a116cc1113
--- /dev/null
+++ b/srcpkgs/cosmic-launcher/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-launcher'
+pkgname=cosmic-launcher
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-launcher short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-launcher"
+distfiles="https://github.com/pop-os/cosmic-launcher/archive/refs/tags/${_tag}.tar.gz"
+checksum=a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 6b65f12526b2a8ae7705b68fe471e753b57c2e65 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:55:46 -0400
Subject: [PATCH 11/22] New package: cosmic-notifications-1.0.0.alpha.1
---
srcpkgs/cosmic-notifications | 1 -
.../patches/0001-systemd.patch | 102 ++++++++++++++++++
srcpkgs/cosmic-notifications/template | 18 ++++
3 files changed, 120 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-notifications
create mode 100644 srcpkgs/cosmic-notifications/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-notifications/template
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-notifications
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications/patches/0001-systemd.patch b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..e698ae73e6d4d2
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
@@ -0,0 +1,102 @@
+From c481817c5ea763d4d388d2ab1b1ab7736f1ff2e0 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:04:17 +0100
+Subject: [PATCH 1/2] Add a defaulted systemd feature to include and use
+ tracing_journald
+
+---
+ Cargo.toml | 6 +++++-
+ src/main.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f4e1900..2e37ce5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -27,7 +27,7 @@ tracing = "0.1"
+ nix = "0.26.2"
+ once_cell = "1.17"
+ tracing-subscriber = "0.3.17"
+-tracing-journald = "0.3.0"
++tracing-journald = { version = "0.3.0", optional = true }
+ rust-embed = "8.4.0"
+ serde = { version = "1.0.152", features = ["derive"] }
+ ron = "0.8"
+@@ -53,6 +53,10 @@ log-panics = { version = "2", features = ["with-backtrace"] }
+ # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+ # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+
++[features]
++systemd = ["dep:tracing-journald"]
++default = ["systemd"]
++
+ [workspace]
+ members = ["cosmic-notifications-util", "cosmic-notifications-config"]
+
+diff --git a/src/main.rs b/src/main.rs
+index 88d360e..ba9f241 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -12,8 +12,10 @@ use localize::localize;
+ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer()?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer()?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From dcc0461d2d77f9c89679a2741a30319dc73593b2 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:10:29 +0100
+Subject: [PATCH 2/2] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index ba9f241..b8531b6 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -13,16 +13,25 @@ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+ let trace = tracing_subscriber::registry();
++
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::WARN.into())
++ .from_env_lossy();
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer()?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::WARN.into())
+- .from_env_lossy(),
+- )
+- .try_init()?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()?;
++ } else {
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++ tracing::warn!("Failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++
+ log_panics::init();
+
+ info!("cosmic-notifications ({})", APP_ID);
diff --git a/srcpkgs/cosmic-notifications/template b/srcpkgs/cosmic-notifications/template
new file mode 100644
index 00000000000000..ef22e2c5022d36
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-notifications'
+pkgname=cosmic-notifications
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-notifications short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-notifications"
+distfiles="https://github.com/pop-os/cosmic-notifications/archive/refs/tags/${_tag}.tar.gz"
+checksum=6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 948274c38ff3106407c7fc385570400d47b7011b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:01:21 -0400
Subject: [PATCH 12/22] New package: cosmic-osd-1.0.0.alpha.1
---
srcpkgs/cosmic-osd | 1 -
srcpkgs/cosmic-osd/template | 14 ++++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-osd
create mode 100644 srcpkgs/cosmic-osd/template
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-osd
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd/template b/srcpkgs/cosmic-osd/template
new file mode 100644
index 00000000000000..865b28f89dadba
--- /dev/null
+++ b/srcpkgs/cosmic-osd/template
@@ -0,0 +1,14 @@
+# Template file for 'cosmic-osd'
+pkgname=cosmic-osd
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel pulseaudio-devel"
+short_desc="TODO: cosmic-osd short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-osd"
+distfiles="https://github.com/pop-os/cosmic-osd/archive/refs/tags/${_tag}.tar.gz"
+checksum=a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
From e5cc09482475953224b72f845ceb96293207f6e9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:04:44 -0400
Subject: [PATCH 13/22] New package: cosmic-panel-1.0.0.alpha.1
---
srcpkgs/cosmic-panel | 1 -
srcpkgs/cosmic-panel/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-panel
create mode 100644 srcpkgs/cosmic-panel/template
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-panel
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
new file mode 100644
index 00000000000000..f036897042f5d0
--- /dev/null
+++ b/srcpkgs/cosmic-panel/template
@@ -0,0 +1,20 @@
+# Template file for 'cosmic-panel'
+pkgname=cosmic-panel
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cosmic-panel-bin"
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-panel short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-panel"
+distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
+checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+
+post_install() {
+ vmkdir usr/share/cosmic
+ vcopy "data/default_schema/*" usr/share/cosmic
+}
From fa7983e33154d44a8659378472bc0655f9aa911a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:11:43 -0400
Subject: [PATCH 14/22] New package: cosmic-randr-1.0.0.alpha.1
---
srcpkgs/cosmic-randr | 1 -
srcpkgs/cosmic-randr/template | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-randr
create mode 100644 srcpkgs/cosmic-randr/template
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-randr
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr/template b/srcpkgs/cosmic-randr/template
new file mode 100644
index 00000000000000..d025e245ef696c
--- /dev/null
+++ b/srcpkgs/cosmic-randr/template
@@ -0,0 +1,13 @@
+# Template file for 'cosmic-randr'
+pkgname=cosmic-randr
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cli"
+short_desc="TODO: cosmic-randr short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-randr"
+distfiles="https://github.com/pop-os/cosmic-randr/archive/refs/tags/${_tag}.tar.gz"
+checksum=b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
From 7d45852808ede2908589ea3afa19e0eaa19eccd7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:14:24 -0400
Subject: [PATCH 15/22] New package: cosmic-screenshot-1.0.0.alpha.1
---
srcpkgs/cosmic-screenshot | 1 -
srcpkgs/cosmic-screenshot/template | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-screenshot
create mode 100644 srcpkgs/cosmic-screenshot/template
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-screenshot
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot/template b/srcpkgs/cosmic-screenshot/template
new file mode 100644
index 00000000000000..f578512bb03b7b
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot/template
@@ -0,0 +1,17 @@
+# Template file for 'cosmic-screenshot'
+pkgname=cosmic-screenshot
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-screenshot short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-screenshot"
+distfiles="https://github.com/pop-os/cosmic-screenshot/archive/refs/tags/${_tag}.tar.gz"
+checksum=78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From a4c99c07919bf88931dcb4eff67715ec3554ca73 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:25:45 -0400
Subject: [PATCH 16/22] New package: cosmic-session-1.0.0.alpha.1
---
srcpkgs/cosmic-session | 1 -
.../cosmic-session/patches/0001-systemd.patch | 182 ++++++++++++++++++
.../cosmic-session/patches/0002-systemd.patch | 10 +
srcpkgs/cosmic-session/template | 18 ++
4 files changed, 210 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-session
create mode 100644 srcpkgs/cosmic-session/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-session/patches/0002-systemd.patch
create mode 100644 srcpkgs/cosmic-session/template
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-session
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session/patches/0001-systemd.patch b/srcpkgs/cosmic-session/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..578ca1002b6a1a
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0001-systemd.patch
@@ -0,0 +1,182 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 357379d116501a337e4dc1f3375f2f71e74f1f31 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..636d88b 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -44,17 +44,34 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
+ trace
+ .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
++ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/cosmic-session/patches/0002-systemd.patch b/srcpkgs/cosmic-session/patches/0002-systemd.patch
new file mode 100644
index 00000000000000..bc03edc8487da6
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0002-systemd.patch
@@ -0,0 +1,10 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..68a8571 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,5 +45,3 @@ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+-default = ["systemd"]
diff --git a/srcpkgs/cosmic-session/template b/srcpkgs/cosmic-session/template
new file mode 100644
index 00000000000000..a76928658e7e46
--- /dev/null
+++ b/srcpkgs/cosmic-session/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-session'
+pkgname=cosmic-session
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-session short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-session"
+distfiles="https://github.com/pop-os/cosmic-session/archive/refs/tags/${_tag}.tar.gz"
+checksum=be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" \
+ --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install
+}
From 75c0bc6e3b5fc582c6fe2ce4c49544e3d599ffa5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:36:20 -0400
Subject: [PATCH 17/22] New package: cosmic-settings-1.0.0.alpha.1
---
srcpkgs/cosmic-settings | 1 -
srcpkgs/cosmic-settings/template | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings
create mode 100644 srcpkgs/cosmic-settings/template
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings/template b/srcpkgs/cosmic-settings/template
new file mode 100644
index 00000000000000..f7a78ae7e6a149
--- /dev/null
+++ b/srcpkgs/cosmic-settings/template
@@ -0,0 +1,24 @@
+# Template file for 'cosmic-settings'
+pkgname=cosmic-settings
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings"
+distfiles="https://github.com/pop-os/cosmic-settings/archive/refs/tags/${_tag}.tar.gz"
+checksum=eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+
+case "$XBPS_TARGET_MACHINE" in
+ armv*)
+ broken="error: failed to run custom build command for `generator v0.7.5`: Unsupported architecture"
+ ;;
+esac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 110d07c6046c257a7b62537ab023b6143da19b53 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:38:56 -0400
Subject: [PATCH 18/22] New package: cosmic-settings-daemon-1.0.0.alpha.1
---
srcpkgs/cosmic-settings-daemon | 1 -
srcpkgs/cosmic-settings-daemon/template | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings-daemon
create mode 100644 srcpkgs/cosmic-settings-daemon/template
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings-daemon
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon/template b/srcpkgs/cosmic-settings-daemon/template
new file mode 100644
index 00000000000000..93806518c7824c
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon/template
@@ -0,0 +1,25 @@
+# Template file for 'cosmic-settings-daemon'
+pkgname=cosmic-settings-daemon
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel geoclue2-devel"
+depends="geoclue2"
+short_desc="TODO: cosmic-settings-daemon short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pop-os/cosmic-settings-daemon"
+distfiles="https://github.com/pop-os/cosmic-settings-daemon/archive/refs/tags/${_tag}.tar.gz"
+checksum=fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+
+export GEOCLUE_AGENT="/usr/libexec/geoclue-2.0/demos/agent"
+
+post_install() {
+ vinstall data/system_actions.ron 0644 \
+ usr/share/cosmic/com.system76.CosmicSettings.Shortcuts/v1 system_actions
+
+ vinstall data/polkit-1/rules.d/cosmic-settings-daemon.rules 0644 \
+ usr/share/polkit-1/rules.d
+}
From 3e55ed10ef93e11d7a443023a3e8e3b203c73f0c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:44:14 -0400
Subject: [PATCH 19/22] New package: cosmic-store-1.0.0.alpha.1
---
srcpkgs/cosmic-store | 1 -
srcpkgs/cosmic-store/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-store
create mode 100644 srcpkgs/cosmic-store/template
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-store
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store/template b/srcpkgs/cosmic-store/template
new file mode 100644
index 00000000000000..86c65904933a1a
--- /dev/null
+++ b/srcpkgs/cosmic-store/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-store'
+pkgname=cosmic-store
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel openssl-devel flatpak-devel"
+short_desc="TODO: cosmic-store short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-store"
+distfiles="https://github.com/pop-os/cosmic-store/archive/refs/tags/${_tag}.tar.gz"
+checksum=eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From dfa55f9a3e07a785985b530e16ca79c95fd39069 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:45:00 -0400
Subject: [PATCH 20/22] New package: cosmic-term-1.0.0.alpha.1
---
srcpkgs/cosmic-term | 1 -
srcpkgs/cosmic-term/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-term
create mode 100644 srcpkgs/cosmic-term/template
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-term
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term/template b/srcpkgs/cosmic-term/template
new file mode 100644
index 00000000000000..7ba0f87d2889ed
--- /dev/null
+++ b/srcpkgs/cosmic-term/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-term'
+pkgname=cosmic-term
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-term short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-term"
+distfiles="https://github.com/pop-os/cosmic-term/archive/refs/tags/${_tag}.tar.gz"
+checksum=3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From ea52ea14919d0b18aa53f13f53221e4eb66d7341 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:14:00 -0400
Subject: [PATCH 21/22] New package: cosmic-workspaces-epoch-1.0.0.alpha.1
---
srcpkgs/cosmic-workspaces-epoch | 1 -
srcpkgs/cosmic-workspaces-epoch/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 100644 srcpkgs/cosmic-workspaces-epoch/template
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-workspaces-epoch
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch/template b/srcpkgs/cosmic-workspaces-epoch/template
new file mode 100644
index 00000000000000..7f822f05cc1171
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-workspaces-epoch'
+pkgname=cosmic-workspaces-epoch
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel libgbm-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-workspaces-epoch short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-workspaces-epoch"
+distfiles="https://github.com/pop-os/cosmic-workspaces-epoch/archive/refs/tags/${_tag}.tar.gz"
+checksum=d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+
+post_install() {
+ vinstall data/com.system76.CosmicWorkspaces.desktop 0644 usr/share/applications
+ vinstall data/com.system76.CosmicWorkspaces.svg 0644 usr/share/icons/hicolor/scalable/apps
+}
From ec5506bebb2e2afa13fd648c10c4868c0107a65b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:32:56 -0400
Subject: [PATCH 22/22] New package: xdg-desktop-portal-cosmic-1.0.0.alpha.1
---
srcpkgs/xdg-desktop-portal-cosmic | 1 -
srcpkgs/xdg-desktop-portal-cosmic/template | 23 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/xdg-desktop-portal-cosmic
create mode 100644 srcpkgs/xdg-desktop-portal-cosmic/template
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/xdg-desktop-portal-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic/template b/srcpkgs/xdg-desktop-portal-cosmic/template
new file mode 100644
index 00000000000000..faffd2378041b9
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic/template
@@ -0,0 +1,23 @@
+# Template file for 'xdg-desktop-portal-cosmic'
+pkgname=xdg-desktop-portal-cosmic
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config llvm18 clang18"
+makedepends="libxkbcommon-devel libgbm-devel pipewire-devel llvm18-devel
+ glib-devel gstreamer1-devel"
+depends="xdg-desktop-portal"
+short_desc="TODO: xdg-desktop-portal-cosmic short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/xdg-desktop-portal-cosmic"
+distfiles="https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/refs/tags/${_tag}.tar.gz"
+checksum=ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ DESTDIR="${DESTDIR}" prefix=/usr CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Updated] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (14 preceding siblings ...)
2024-08-12 2:48 ` Calandracas606
@ 2024-08-12 2:51 ` Calandracas606
2024-08-12 11:56 ` [PR REVIEW] " Calandracas606
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-12 2:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages COSMIC-Desktop
https://github.com/void-linux/void-packages/pull/51735
[WIP] New package: COSMIC-Desktop-1.0.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
A patch file from https://github.com/void-linux/void-packages/pull/51735.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-COSMIC-Desktop-51735.patch --]
[-- Type: text/x-diff, Size: 53238 bytes --]
From dd0d9c3931cf5fe9095cf1e04c0d01052c8a9e7e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 8 Aug 2024 17:05:28 -0400
Subject: [PATCH 01/22] New package: COSMIC-Desktop-1.0.0.1
---
srcpkgs/COSMIC-Desktop/template | 14 ++++++++++++++
srcpkgs/cosmic-applets | 1 +
srcpkgs/cosmic-applibrary | 1 +
srcpkgs/cosmic-bg | 1 +
srcpkgs/cosmic-comp | 1 +
srcpkgs/cosmic-edit | 1 +
srcpkgs/cosmic-files | 1 +
srcpkgs/cosmic-greeter | 1 +
srcpkgs/cosmic-icons | 1 +
srcpkgs/cosmic-launcher | 1 +
srcpkgs/cosmic-notifications | 1 +
srcpkgs/cosmic-osd | 1 +
srcpkgs/cosmic-panel | 1 +
srcpkgs/cosmic-randr | 1 +
srcpkgs/cosmic-screenshot | 1 +
srcpkgs/cosmic-session | 1 +
srcpkgs/cosmic-settings | 1 +
srcpkgs/cosmic-settings-daemon | 1 +
srcpkgs/cosmic-store | 1 +
srcpkgs/cosmic-term | 1 +
srcpkgs/cosmic-workspaces-epoch | 1 +
srcpkgs/xdg-desktop-portal-cosmic | 1 +
22 files changed, 35 insertions(+)
create mode 100644 srcpkgs/COSMIC-Desktop/template
create mode 120000 srcpkgs/cosmic-applets
create mode 120000 srcpkgs/cosmic-applibrary
create mode 120000 srcpkgs/cosmic-bg
create mode 120000 srcpkgs/cosmic-comp
create mode 120000 srcpkgs/cosmic-edit
create mode 120000 srcpkgs/cosmic-files
create mode 120000 srcpkgs/cosmic-greeter
create mode 120000 srcpkgs/cosmic-icons
create mode 120000 srcpkgs/cosmic-launcher
create mode 120000 srcpkgs/cosmic-notifications
create mode 120000 srcpkgs/cosmic-osd
create mode 120000 srcpkgs/cosmic-panel
create mode 120000 srcpkgs/cosmic-randr
create mode 120000 srcpkgs/cosmic-screenshot
create mode 120000 srcpkgs/cosmic-session
create mode 120000 srcpkgs/cosmic-settings
create mode 120000 srcpkgs/cosmic-settings-daemon
create mode 120000 srcpkgs/cosmic-store
create mode 120000 srcpkgs/cosmic-term
create mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 120000 srcpkgs/xdg-desktop-portal-cosmic
diff --git a/srcpkgs/COSMIC-Desktop/template b/srcpkgs/COSMIC-Desktop/template
new file mode 100644
index 00000000000000..872f184f0baaed
--- /dev/null
+++ b/srcpkgs/COSMIC-Desktop/template
@@ -0,0 +1,14 @@
+# Template file for 'COSMIC-Desktop'
+pkgname=COSMIC-Desktop
+version=1.0.0.alpha.1
+revision=1
+build_style=meta
+depends="cosmic-applets cosmic-applibrary cosmic-bg cosmic-comp cosmic-edit
+ cosmic-files cosmic-greeter cosmic-icons cosmic-launcher cosmic-notifications
+ cosmic-osd cosmic-panel cosmic-randr cosmic-screenshot cosmic-session
+ cosmic-settings cosmic-settings-daemon cosmic-store cosmic-term
+ cosmic-workspaces-epoch xdg-desktop-portal-cosmic"
+short_desc="Next generation Cosmic desktop environment"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Public Domain"
+homepage="https://system76.com/cosmic"
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applets
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-bg
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-comp
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-edit
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-files
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-greeter
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-icons
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-launcher
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-notifications
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-osd
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-panel
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-randr
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-session
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-store
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-term
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
new file mode 120000
index 00000000000000..8ed2b8ce2ba6f8
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic
@@ -0,0 +1 @@
+COSMIC-Desktop
\ No newline at end of file
From 1bb9c848970c49791e591de9f978909de998a05b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:26:22 -0400
Subject: [PATCH 02/22] New package: cosmic-bg-1.0.0.alpha.1
---
srcpkgs/cosmic-bg | 1 -
srcpkgs/cosmic-bg/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-bg
create mode 100644 srcpkgs/cosmic-bg/template
diff --git a/srcpkgs/cosmic-bg b/srcpkgs/cosmic-bg
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-bg
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-bg/template b/srcpkgs/cosmic-bg/template
new file mode 100644
index 00000000000000..a79027a7bbf73c
--- /dev/null
+++ b/srcpkgs/cosmic-bg/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-bg'
+pkgname=cosmic-bg
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-bg short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-bg"
+distfiles="https://github.com/pop-os/cosmic-bg/archive/refs/tags/${_tag}.tar.gz"
+checksum=6501795e2787d98394f773d862387cda8b8340e52e7900caea33edbf9f306cac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From abd92d61ef40d958408d7113286eab08695187e2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:51:36 -0400
Subject: [PATCH 03/22] New package: cosmic-applets-1.0.0.alpha.1
---
srcpkgs/cosmic-applets | 1 -
srcpkgs/cosmic-applets/template | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applets
create mode 100644 srcpkgs/cosmic-applets/template
diff --git a/srcpkgs/cosmic-applets b/srcpkgs/cosmic-applets
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applets
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applets/template b/srcpkgs/cosmic-applets/template
new file mode 100644
index 00000000000000..662f4b519be4aa
--- /dev/null
+++ b/srcpkgs/cosmic-applets/template
@@ -0,0 +1,23 @@
+# Template file for 'cosmic-applets'
+pkgname=cosmic-applets
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel dbus-devel pulseaudio-devel libinput-devel"
+short_desc="TODO: cosmic-applets short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applets"
+distfiles="https://github.com/pop-os/cosmic-applets/archive/refs/tags/${_tag}.tar.gz"
+checksum=be60cba82b8da4f7d7cde4a2a5426d97f41423c11bd5fb5d66f1194ddf7274d4
+
+if [ "$XBPS_WORDSIZE" = "32" ]; then
+ broken="rustc-LLVM ERROR: out of memory"
+fi
+
+do_install() {
+ just --set targetdir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} \
+ --set prefix /usr --set cosmic-applets-bin cosmic-applets install
+}
From 2623f6cd3ce00191602911f7731e481846f0ebb1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Aug 2024 23:56:31 -0400
Subject: [PATCH 04/22] New package: cosmic-applibrary-1.0.0.alpha.1
---
srcpkgs/cosmic-applibrary | 1 -
srcpkgs/cosmic-applibrary/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-applibrary
create mode 100644 srcpkgs/cosmic-applibrary/template
diff --git a/srcpkgs/cosmic-applibrary b/srcpkgs/cosmic-applibrary
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-applibrary
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-applibrary/template b/srcpkgs/cosmic-applibrary/template
new file mode 100644
index 00000000000000..8da931e7bb7d70
--- /dev/null
+++ b/srcpkgs/cosmic-applibrary/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-applibrary'
+pkgname=cosmic-applibrary
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-applibrary short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-applibrary"
+distfiles="https://github.com/pop-os/cosmic-applibrary/archive/refs/tags/${_tag}.tar.gz"
+checksum=6481c4d92a5fcaef93698b19bfac28485daaddba8789e50c07410ee9e33a4e22
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From f75d0620e8e4bf1e147029566a3d089150de072d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:24:22 -0400
Subject: [PATCH 05/22] New package: cosmic-comp-1.0.0.alpha.1
---
srcpkgs/cosmic-comp | 1 -
srcpkgs/cosmic-comp/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-comp
create mode 100644 srcpkgs/cosmic-comp/template
diff --git a/srcpkgs/cosmic-comp b/srcpkgs/cosmic-comp
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-comp
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-comp/template b/srcpkgs/cosmic-comp/template
new file mode 100644
index 00000000000000..107f7525d08af2
--- /dev/null
+++ b/srcpkgs/cosmic-comp/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-comp'
+pkgname=cosmic-comp
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libseat-devel libxkbcommon-devel libinput-devel
+ pixman-devel libgbm-devel"
+short_desc="TODO: cosmic-comp short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-comp"
+distfiles="https://github.com/pop-os/cosmic-comp/archive/refs/tags/${_tag}.tar.gz"
+checksum=46f552fbce2c3139e2b407d98d3115b35a240ba79d2b6bc420010efa67abd21b
+
+do_install() {
+ CARGO_TARGET_DIR="target/${RUST_TARGET}" DESTDIR=${DESTDIR} make install
+}
From a28e124ea1ab771ed159c0b8a5d77d4543783dc9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:30:31 -0400
Subject: [PATCH 06/22] New package: cosmic-edit-1.0.0.alpha.1
---
srcpkgs/cosmic-edit | 1 -
srcpkgs/cosmic-edit/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-edit
create mode 100644 srcpkgs/cosmic-edit/template
diff --git a/srcpkgs/cosmic-edit b/srcpkgs/cosmic-edit
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-edit
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-edit/template b/srcpkgs/cosmic-edit/template
new file mode 100644
index 00000000000000..b7039c34389227
--- /dev/null
+++ b/srcpkgs/cosmic-edit/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-edit'
+pkgname=cosmic-edit
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel oniguruma-devel"
+short_desc="TODO: cosmic-edit short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-edit"
+distfiles="https://github.com/pop-os/cosmic-edit/archive/refs/tags/${_tag}.tar.gz"
+checksum=c81bd38a1c16cabf5a5bfbba3e0552bff72e3e7b802dcaed836dcafe3b634d72
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d36f01397b5d736d6ae0c9942a6ae57d7142b944 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 00:37:24 -0400
Subject: [PATCH 07/22] New package: cosmic-files-1.0.0.alpha.1
---
srcpkgs/cosmic-files | 1 -
srcpkgs/cosmic-files/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-files
create mode 100644 srcpkgs/cosmic-files/template
diff --git a/srcpkgs/cosmic-files b/srcpkgs/cosmic-files
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-files
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-files/template b/srcpkgs/cosmic-files/template
new file mode 100644
index 00000000000000..463c7934f2768b
--- /dev/null
+++ b/srcpkgs/cosmic-files/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-files'
+pkgname=cosmic-files
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel libglib-devel"
+short_desc="TODO: cosmic-files short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-files"
+distfiles="https://github.com/pop-os/cosmic-files/archive/refs/tags/${_tag}.tar.gz"
+checksum=e533a6fd079de327877f50424d32d3055e8a261bb874925c73f03030c2ea9454
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 4183b453b00ee16a9eaee8d9cd2aedf6c218dc93 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 01:31:38 -0400
Subject: [PATCH 08/22] New package: cosmic-greeter-1.0.0.alpha.1
---
srcpkgs/cosmic-greeter | 1 -
srcpkgs/cosmic-greeter/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-greeter
create mode 100644 srcpkgs/cosmic-greeter/template
diff --git a/srcpkgs/cosmic-greeter b/srcpkgs/cosmic-greeter
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-greeter
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-greeter/template b/srcpkgs/cosmic-greeter/template
new file mode 100644
index 00000000000000..75611b9344c90c
--- /dev/null
+++ b/srcpkgs/cosmic-greeter/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-greeter'
+pkgname=cosmic-greeter
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+configure_args=" --all"
+hostmakedepends="pkg-config just llvm18-devel"
+makedepends="libxkbcommon-devel eudev-libudev-devel pam-devel libinput-devel"
+short_desc="TODO: cosmic-greeter short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-greeter"
+distfiles="https://github.com/pop-os/cosmic-greeter/archive/refs/tags/${_tag}.tar.gz"
+checksum=408c80c123c17089a09117e7eca0b87aee143336aa44ae47321e46e3da90c31e
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From d348e38a21d0ac9c28927cb4f94517ae367609c6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:47:42 -0400
Subject: [PATCH 09/22] New package: cosmic-icons-1.0.0.alpha.1
---
srcpkgs/cosmic-icons | 1 -
srcpkgs/cosmic-icons/template | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-icons
create mode 100644 srcpkgs/cosmic-icons/template
diff --git a/srcpkgs/cosmic-icons b/srcpkgs/cosmic-icons
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-icons
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-icons/template b/srcpkgs/cosmic-icons/template
new file mode 100644
index 00000000000000..476ab867e57324
--- /dev/null
+++ b/srcpkgs/cosmic-icons/template
@@ -0,0 +1,16 @@
+# Template file for 'cosmic-icons'
+pkgname=cosmic-icons
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+hostmakedepends="just"
+short_desc="TODO: cosmic-icons short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-icons"
+distfiles="https://github.com/pop-os/cosmic-icons/archive/refs/tags/${_tag}.tar.gz"
+checksum=20d1a184c0421501e7ed8761f6e6178c3e16c787373357dae1d4dc22b9109428
+
+do_install() {
+ just --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 871b88d59d8143fe004eb6eabde55adb8580a1d3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:52:07 -0400
Subject: [PATCH 10/22] New package: cosmic-launcher-1.0.0.alpha.1
---
srcpkgs/cosmic-launcher | 1 -
srcpkgs/cosmic-launcher/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-launcher
create mode 100644 srcpkgs/cosmic-launcher/template
diff --git a/srcpkgs/cosmic-launcher b/srcpkgs/cosmic-launcher
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-launcher
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-launcher/template b/srcpkgs/cosmic-launcher/template
new file mode 100644
index 00000000000000..7316a116cc1113
--- /dev/null
+++ b/srcpkgs/cosmic-launcher/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-launcher'
+pkgname=cosmic-launcher
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-launcher short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-launcher"
+distfiles="https://github.com/pop-os/cosmic-launcher/archive/refs/tags/${_tag}.tar.gz"
+checksum=a2bc1885c7e79ec2fb109ab8af6d7bea2c5318814cb9a349646d96fbe9513c09
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 6b65f12526b2a8ae7705b68fe471e753b57c2e65 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 12:55:46 -0400
Subject: [PATCH 11/22] New package: cosmic-notifications-1.0.0.alpha.1
---
srcpkgs/cosmic-notifications | 1 -
.../patches/0001-systemd.patch | 102 ++++++++++++++++++
srcpkgs/cosmic-notifications/template | 18 ++++
3 files changed, 120 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-notifications
create mode 100644 srcpkgs/cosmic-notifications/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-notifications/template
diff --git a/srcpkgs/cosmic-notifications b/srcpkgs/cosmic-notifications
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-notifications
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-notifications/patches/0001-systemd.patch b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..e698ae73e6d4d2
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/patches/0001-systemd.patch
@@ -0,0 +1,102 @@
+From c481817c5ea763d4d388d2ab1b1ab7736f1ff2e0 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:04:17 +0100
+Subject: [PATCH 1/2] Add a defaulted systemd feature to include and use
+ tracing_journald
+
+---
+ Cargo.toml | 6 +++++-
+ src/main.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f4e1900..2e37ce5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -27,7 +27,7 @@ tracing = "0.1"
+ nix = "0.26.2"
+ once_cell = "1.17"
+ tracing-subscriber = "0.3.17"
+-tracing-journald = "0.3.0"
++tracing-journald = { version = "0.3.0", optional = true }
+ rust-embed = "8.4.0"
+ serde = { version = "1.0.152", features = ["derive"] }
+ ron = "0.8"
+@@ -53,6 +53,10 @@ log-panics = { version = "2", features = ["with-backtrace"] }
+ # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+ # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+
++[features]
++systemd = ["dep:tracing-journald"]
++default = ["systemd"]
++
+ [workspace]
+ members = ["cosmic-notifications-util", "cosmic-notifications-config"]
+
+diff --git a/src/main.rs b/src/main.rs
+index 88d360e..ba9f241 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -12,8 +12,10 @@ use localize::localize;
+ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer()?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer()?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From dcc0461d2d77f9c89679a2741a30319dc73593b2 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Sat, 10 Aug 2024 10:10:29 +0100
+Subject: [PATCH 2/2] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index ba9f241..b8531b6 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -13,16 +13,25 @@ use crate::config::VERSION;
+
+ fn main() -> anyhow::Result<()> {
+ let trace = tracing_subscriber::registry();
++
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::WARN.into())
++ .from_env_lossy();
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer()?);
+- trace
+- .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::WARN.into())
+- .from_env_lossy(),
+- )
+- .try_init()?;
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()?;
++ } else {
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++ tracing::warn!("Failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
++ trace.with(fmt::layer()).with(env_filter).try_init()?;
++
+ log_panics::init();
+
+ info!("cosmic-notifications ({})", APP_ID);
diff --git a/srcpkgs/cosmic-notifications/template b/srcpkgs/cosmic-notifications/template
new file mode 100644
index 00000000000000..ef22e2c5022d36
--- /dev/null
+++ b/srcpkgs/cosmic-notifications/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-notifications'
+pkgname=cosmic-notifications
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-notifications short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-notifications"
+distfiles="https://github.com/pop-os/cosmic-notifications/archive/refs/tags/${_tag}.tar.gz"
+checksum=6cd3a46abecafe200be791bb4c1cb25498c27d4b8bc0afeda37263b5f296bfd7
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 948274c38ff3106407c7fc385570400d47b7011b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:01:21 -0400
Subject: [PATCH 12/22] New package: cosmic-osd-1.0.0.alpha.1
---
srcpkgs/cosmic-osd | 1 -
srcpkgs/cosmic-osd/template | 14 ++++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-osd
create mode 100644 srcpkgs/cosmic-osd/template
diff --git a/srcpkgs/cosmic-osd b/srcpkgs/cosmic-osd
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-osd
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-osd/template b/srcpkgs/cosmic-osd/template
new file mode 100644
index 00000000000000..865b28f89dadba
--- /dev/null
+++ b/srcpkgs/cosmic-osd/template
@@ -0,0 +1,14 @@
+# Template file for 'cosmic-osd'
+pkgname=cosmic-osd
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel pulseaudio-devel"
+short_desc="TODO: cosmic-osd short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-osd"
+distfiles="https://github.com/pop-os/cosmic-osd/archive/refs/tags/${_tag}.tar.gz"
+checksum=a790e47e96fee1a053ebff1e1c251c065bfbf653efc4fcef461a99e9743e28f2
From e5cc09482475953224b72f845ceb96293207f6e9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:04:44 -0400
Subject: [PATCH 13/22] New package: cosmic-panel-1.0.0.alpha.1
---
srcpkgs/cosmic-panel | 1 -
srcpkgs/cosmic-panel/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-panel
create mode 100644 srcpkgs/cosmic-panel/template
diff --git a/srcpkgs/cosmic-panel b/srcpkgs/cosmic-panel
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-panel
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-panel/template b/srcpkgs/cosmic-panel/template
new file mode 100644
index 00000000000000..f036897042f5d0
--- /dev/null
+++ b/srcpkgs/cosmic-panel/template
@@ -0,0 +1,20 @@
+# Template file for 'cosmic-panel'
+pkgname=cosmic-panel
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cosmic-panel-bin"
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-panel short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-panel"
+distfiles="https://github.com/pop-os/cosmic-panel/archive/refs/tags/${_tag}.tar.gz"
+checksum=f4bacd6447607bb04605ae04add2f7cec8422d5ceb08cf742a65876484059328
+
+post_install() {
+ vmkdir usr/share/cosmic
+ vcopy "data/default_schema/*" usr/share/cosmic
+}
From fa7983e33154d44a8659378472bc0655f9aa911a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:11:43 -0400
Subject: [PATCH 14/22] New package: cosmic-randr-1.0.0.alpha.1
---
srcpkgs/cosmic-randr | 1 -
srcpkgs/cosmic-randr/template | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-randr
create mode 100644 srcpkgs/cosmic-randr/template
diff --git a/srcpkgs/cosmic-randr b/srcpkgs/cosmic-randr
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-randr
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-randr/template b/srcpkgs/cosmic-randr/template
new file mode 100644
index 00000000000000..d025e245ef696c
--- /dev/null
+++ b/srcpkgs/cosmic-randr/template
@@ -0,0 +1,13 @@
+# Template file for 'cosmic-randr'
+pkgname=cosmic-randr
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+make_install_args="--path cli"
+short_desc="TODO: cosmic-randr short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-randr"
+distfiles="https://github.com/pop-os/cosmic-randr/archive/refs/tags/${_tag}.tar.gz"
+checksum=b4f1eac8be58998b136c4a08afb972647965f2acdf9e8a44fd199a68f7332bba
From 7d45852808ede2908589ea3afa19e0eaa19eccd7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:14:24 -0400
Subject: [PATCH 15/22] New package: cosmic-screenshot-1.0.0.alpha.1
---
srcpkgs/cosmic-screenshot | 1 -
srcpkgs/cosmic-screenshot/template | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-screenshot
create mode 100644 srcpkgs/cosmic-screenshot/template
diff --git a/srcpkgs/cosmic-screenshot b/srcpkgs/cosmic-screenshot
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-screenshot
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-screenshot/template b/srcpkgs/cosmic-screenshot/template
new file mode 100644
index 00000000000000..f578512bb03b7b
--- /dev/null
+++ b/srcpkgs/cosmic-screenshot/template
@@ -0,0 +1,17 @@
+# Template file for 'cosmic-screenshot'
+pkgname=cosmic-screenshot
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-screenshot short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-screenshot"
+distfiles="https://github.com/pop-os/cosmic-screenshot/archive/refs/tags/${_tag}.tar.gz"
+checksum=78da8e504845582b668b253d376cf2a19a5f6a4a1bd51b4e7c7eeb86ac42831f
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From a4c99c07919bf88931dcb4eff67715ec3554ca73 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:25:45 -0400
Subject: [PATCH 16/22] New package: cosmic-session-1.0.0.alpha.1
---
srcpkgs/cosmic-session | 1 -
.../cosmic-session/patches/0001-systemd.patch | 182 ++++++++++++++++++
.../cosmic-session/patches/0002-systemd.patch | 10 +
srcpkgs/cosmic-session/template | 18 ++
4 files changed, 210 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-session
create mode 100644 srcpkgs/cosmic-session/patches/0001-systemd.patch
create mode 100644 srcpkgs/cosmic-session/patches/0002-systemd.patch
create mode 100644 srcpkgs/cosmic-session/template
diff --git a/srcpkgs/cosmic-session b/srcpkgs/cosmic-session
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-session
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-session/patches/0001-systemd.patch b/srcpkgs/cosmic-session/patches/0001-systemd.patch
new file mode 100644
index 00000000000000..578ca1002b6a1a
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0001-systemd.patch
@@ -0,0 +1,182 @@
+From 6fbc64043fccf9b2b880904bc3511e0428046026 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:53:06 +0100
+Subject: [PATCH 1/3] Fix compile-time errors with --no-default-features
+
+---
+ src/main.rs | 37 ++++++++++++++++---------------------
+ 1 file changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 6f64eb1..bf6e2e8 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -21,6 +21,7 @@ use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD}
+ use futures_util::StreamExt;
+ use launch_pad::{process::Process, ProcessManager};
+ use service::SessionRequest;
++#[cfg(feature = "systemd")]
+ use systemd::{is_systemd_used, spawn_scope};
+ use tokio::{
+ net::UnixStream,
+@@ -58,10 +59,9 @@ async fn main() -> Result<()> {
+ let session_tx_clone = session_tx.clone();
+ let _conn = ConnectionBuilder::session()?
+ .name("com.system76.CosmicSession")?
+- .serve_at(
+- "/com/system76/CosmicSession",
+- service::SessionService { session_tx },
+- )?
++ .serve_at("/com/system76/CosmicSession", service::SessionService {
++ session_tx,
++ })?
+ .build()
+ .await?;
+
+@@ -135,8 +135,8 @@ async fn start(
+ .await
+ .expect("failed to start settings daemon");
+
+- // notifying the user service manager that we've reached the graphical-session.target,
+- // which should only happen after:
++ // notifying the user service manager that we've reached the
++ // graphical-session.target, which should only happen after:
+ // - cosmic-comp is ready
+ // - we've set any related variables
+ // - cosmic-settings-daemon is ready
+@@ -379,22 +379,17 @@ async fn start_component(
+ }
+ .instrument(stderr_span)
+ })
+- .with_on_start(move |pman, pkey, _will_restart| {
++ .with_on_start(move |pman, pkey, _will_restart| async move {
+ #[cfg(feature = "systemd")]
+- {
+- async move {
+- if *is_systemd_used() {
+- if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await
+- {
+- if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await
+- {
+- warn!(
+- "Failed to spawn scope for {}. Creating transient unit failed with {}",
+- innr_cmd, err
+- );
+- };
+- }
+- }
++ if *is_systemd_used() {
++ if let Ok((innr_cmd, Some(pid))) = pman.get_exe_and_pid(pkey).await {
++ if let Err(err) = spawn_scope(innr_cmd.clone(), vec![pid]).await {
++ warn!(
++ "Failed to spawn scope for {}. Creating transient unit failed \
++ with {}",
++ innr_cmd, err
++ );
++ };
+ }
+ }
+ })
+
+From 054dc5ebfb0a5ed352c8e8f495a8b192e6042434 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 17:58:14 +0100
+Subject: [PATCH 2/3] Builds without systemd should no longer hard depend on
+ journald
+
+---
+ Cargo.toml | 4 ++--
+ src/main.rs | 6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..c0c7a68 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -39,11 +39,11 @@ zbus_systemd = { version = "0.25600.0", optional = true, features = [
+ ] }
+ tokio-util = "0.7"
+ tracing = "0.1"
+-tracing-journald = "0.3"
++tracing-journald = { version = "0.3", optional = true }
+ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd"]
++systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+ default = ["systemd"]
+diff --git a/src/main.rs b/src/main.rs
+index bf6e2e8..11fe0db 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -43,8 +43,10 @@ const XDP_COSMIC: Option<&'static str> = option_env!("XDP_COSMIC");
+ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+- tracing_subscriber::registry()
+- .with(tracing_journald::layer().wrap_err("failed to connect to journald")?)
++ let trace = tracing_subscriber::registry();
++ #[cfg(feature = "systemd")]
++ let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ trace
+ .with(fmt::layer())
+ .with(
+ EnvFilter::builder()
+
+From 357379d116501a337e4dc1f3375f2f71e74f1f31 Mon Sep 17 00:00:00 2001
+From: Foxinatel <nathanielma5on@yahoo.com>
+Date: Fri, 9 Aug 2024 21:35:13 +0100
+Subject: [PATCH 3/3] Make failure to connect to journald a warning, not a hard
+ error
+
+---
+ src/main.rs | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 11fe0db..636d88b 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -44,17 +44,34 @@ async fn main() -> Result<()> {
+ color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
+
+ let trace = tracing_subscriber::registry();
++ let env_filter = EnvFilter::builder()
++ .with_default_directive(LevelFilter::INFO.into())
++ .from_env_lossy();
++
+ #[cfg(feature = "systemd")]
+- let trace = trace.with(tracing_journald::layer().wrap_err("failed to connect to journald")?);
++ if let Ok(journald) = tracing_journald::layer() {
++ trace
++ .with(journald)
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ } else {
++ trace
++ .with(fmt::layer())
++ .with(env_filter)
++ .try_init()
++ .wrap_err("failed to initialize logger")?;
++ warn!("failed to connect to journald")
++ }
++
++ #[cfg(not(feature = "systemd"))]
+ trace
+ .with(fmt::layer())
+- .with(
+- EnvFilter::builder()
+- .with_default_directive(LevelFilter::INFO.into())
+- .from_env_lossy(),
+- )
++ .with(env_filter)
+ .try_init()
+ .wrap_err("failed to initialize logger")?;
++
+ log_panics::init();
+
+ let (session_tx, mut session_rx) = tokio::sync::mpsc::channel(10);
diff --git a/srcpkgs/cosmic-session/patches/0002-systemd.patch b/srcpkgs/cosmic-session/patches/0002-systemd.patch
new file mode 100644
index 00000000000000..bc03edc8487da6
--- /dev/null
+++ b/srcpkgs/cosmic-session/patches/0002-systemd.patch
@@ -0,0 +1,10 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b7015dd..68a8571 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,5 +45,3 @@ zbus = { version = "4.3.0", default-features = false, features = ["tokio"] }
+ cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
+
+ [features]
+-systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
+-default = ["systemd"]
diff --git a/srcpkgs/cosmic-session/template b/srcpkgs/cosmic-session/template
new file mode 100644
index 00000000000000..a76928658e7e46
--- /dev/null
+++ b/srcpkgs/cosmic-session/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-session'
+pkgname=cosmic-session
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="just"
+short_desc="TODO: cosmic-session short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-session"
+distfiles="https://github.com/pop-os/cosmic-session/archive/refs/tags/${_tag}.tar.gz"
+checksum=be6b9fcd7a174ad9bd5c723c229cb7459c835386a2c608c250ab3c0457a7a375
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" \
+ --set rootdir ${PKGDESTDIR} --set prefix ${PKGDESTDIR}/usr install
+}
From 568e8246ff8cd8ee278df7e932dba62f4e860cf6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:36:20 -0400
Subject: [PATCH 17/22] New package: cosmic-settings-1.0.0.alpha.1
---
srcpkgs/cosmic-settings | 1 -
srcpkgs/cosmic-settings/template | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings
create mode 100644 srcpkgs/cosmic-settings/template
diff --git a/srcpkgs/cosmic-settings b/srcpkgs/cosmic-settings
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings/template b/srcpkgs/cosmic-settings/template
new file mode 100644
index 00000000000000..54afcf614e2f63
--- /dev/null
+++ b/srcpkgs/cosmic-settings/template
@@ -0,0 +1,24 @@
+# Template file for 'cosmic-settings'
+pkgname=cosmic-settings
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-settings short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-settings"
+distfiles="https://github.com/pop-os/cosmic-settings/archive/refs/tags/${_tag}.tar.gz"
+checksum=eb9cffb33c5a0139e1a7b9d8635d76fd41a1978bbf958b461840c76d12630b73
+
+case "$XBPS_TARGET_MACHINE" in
+ armv*|i686*)
+ broken="error: failed to run custom build command for `generator v0.7.5`: Unsupported architecture"
+ ;;
+esac
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 86c59a602d9730522172f4e90d01e80f40dbf6d4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:38:56 -0400
Subject: [PATCH 18/22] New package: cosmic-settings-daemon-1.0.0.alpha.1
---
srcpkgs/cosmic-settings-daemon | 1 -
srcpkgs/cosmic-settings-daemon/template | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-settings-daemon
create mode 100644 srcpkgs/cosmic-settings-daemon/template
diff --git a/srcpkgs/cosmic-settings-daemon b/srcpkgs/cosmic-settings-daemon
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-settings-daemon
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-settings-daemon/template b/srcpkgs/cosmic-settings-daemon/template
new file mode 100644
index 00000000000000..93806518c7824c
--- /dev/null
+++ b/srcpkgs/cosmic-settings-daemon/template
@@ -0,0 +1,25 @@
+# Template file for 'cosmic-settings-daemon'
+pkgname=cosmic-settings-daemon
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel libinput-devel geoclue2-devel"
+depends="geoclue2"
+short_desc="TODO: cosmic-settings-daemon short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pop-os/cosmic-settings-daemon"
+distfiles="https://github.com/pop-os/cosmic-settings-daemon/archive/refs/tags/${_tag}.tar.gz"
+checksum=fd3921a4da8064508df264ab2f667670682aee8dbe3bfbe29687cf0689a45b4b
+
+export GEOCLUE_AGENT="/usr/libexec/geoclue-2.0/demos/agent"
+
+post_install() {
+ vinstall data/system_actions.ron 0644 \
+ usr/share/cosmic/com.system76.CosmicSettings.Shortcuts/v1 system_actions
+
+ vinstall data/polkit-1/rules.d/cosmic-settings-daemon.rules 0644 \
+ usr/share/polkit-1/rules.d
+}
From 5103c82018035da5d5e8d925f140f471da127d3e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:44:14 -0400
Subject: [PATCH 19/22] New package: cosmic-store-1.0.0.alpha.1
---
srcpkgs/cosmic-store | 1 -
srcpkgs/cosmic-store/template | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-store
create mode 100644 srcpkgs/cosmic-store/template
diff --git a/srcpkgs/cosmic-store b/srcpkgs/cosmic-store
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-store
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-store/template b/srcpkgs/cosmic-store/template
new file mode 100644
index 00000000000000..86c65904933a1a
--- /dev/null
+++ b/srcpkgs/cosmic-store/template
@@ -0,0 +1,18 @@
+# Template file for 'cosmic-store'
+pkgname=cosmic-store
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel openssl-devel flatpak-devel"
+short_desc="TODO: cosmic-store short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-store"
+distfiles="https://github.com/pop-os/cosmic-store/archive/refs/tags/${_tag}.tar.gz"
+checksum=eca7c5f138b81768565300cb90f0453527f87660743c8513e5f0470399b4f1ae
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 6449772b86889e8ae019ce96b456273a6c9f07f7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 13:45:00 -0400
Subject: [PATCH 20/22] New package: cosmic-term-1.0.0.alpha.1
---
srcpkgs/cosmic-term | 1 -
srcpkgs/cosmic-term/template | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-term
create mode 100644 srcpkgs/cosmic-term/template
diff --git a/srcpkgs/cosmic-term b/srcpkgs/cosmic-term
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-term
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-term/template b/srcpkgs/cosmic-term/template
new file mode 100644
index 00000000000000..7ba0f87d2889ed
--- /dev/null
+++ b/srcpkgs/cosmic-term/template
@@ -0,0 +1,21 @@
+# Template file for 'cosmic-term'
+pkgname=cosmic-term
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config just"
+makedepends="libxkbcommon-devel"
+short_desc="TODO: cosmic-term short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-term"
+distfiles="https://github.com/pop-os/cosmic-term/archive/refs/tags/${_tag}.tar.gz"
+checksum=3c6b6619647032245e1f0107fbc95c360a4f0963e0740b0370e5f8f63d812c4f
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ just --set cargo-target-dir "target/${RUST_TARGET}" --set rootdir ${DESTDIR} --set prefix /usr install
+}
From 6921dd1b507fe6d79edba819c7928c8d87eef197 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:14:00 -0400
Subject: [PATCH 21/22] New package: cosmic-workspaces-epoch-1.0.0.alpha.1
---
srcpkgs/cosmic-workspaces-epoch | 1 -
srcpkgs/cosmic-workspaces-epoch/template | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/cosmic-workspaces-epoch
create mode 100644 srcpkgs/cosmic-workspaces-epoch/template
diff --git a/srcpkgs/cosmic-workspaces-epoch b/srcpkgs/cosmic-workspaces-epoch
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/cosmic-workspaces-epoch
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/cosmic-workspaces-epoch/template b/srcpkgs/cosmic-workspaces-epoch/template
new file mode 100644
index 00000000000000..7f822f05cc1171
--- /dev/null
+++ b/srcpkgs/cosmic-workspaces-epoch/template
@@ -0,0 +1,19 @@
+# Template file for 'cosmic-workspaces-epoch'
+pkgname=cosmic-workspaces-epoch
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libxkbcommon-devel libgbm-devel eudev-libudev-devel libinput-devel"
+short_desc="TODO: cosmic-workspaces-epoch short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/cosmic-workspaces-epoch"
+distfiles="https://github.com/pop-os/cosmic-workspaces-epoch/archive/refs/tags/${_tag}.tar.gz"
+checksum=d06438e43ad623036f665b615309f17625922344ea317ce70192dc7f61386a9c
+
+post_install() {
+ vinstall data/com.system76.CosmicWorkspaces.desktop 0644 usr/share/applications
+ vinstall data/com.system76.CosmicWorkspaces.svg 0644 usr/share/icons/hicolor/scalable/apps
+}
From d297f71c568260d193a2e977ab75ea4075f37f19 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Aug 2024 21:32:56 -0400
Subject: [PATCH 22/22] New package: xdg-desktop-portal-cosmic-1.0.0.alpha.1
---
srcpkgs/xdg-desktop-portal-cosmic | 1 -
srcpkgs/xdg-desktop-portal-cosmic/template | 23 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/xdg-desktop-portal-cosmic
create mode 100644 srcpkgs/xdg-desktop-portal-cosmic/template
diff --git a/srcpkgs/xdg-desktop-portal-cosmic b/srcpkgs/xdg-desktop-portal-cosmic
deleted file mode 120000
index 8ed2b8ce2ba6f8..00000000000000
--- a/srcpkgs/xdg-desktop-portal-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-COSMIC-Desktop
\ No newline at end of file
diff --git a/srcpkgs/xdg-desktop-portal-cosmic/template b/srcpkgs/xdg-desktop-portal-cosmic/template
new file mode 100644
index 00000000000000..faffd2378041b9
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-cosmic/template
@@ -0,0 +1,23 @@
+# Template file for 'xdg-desktop-portal-cosmic'
+pkgname=xdg-desktop-portal-cosmic
+version=1.0.0.alpha.1
+revision=1
+_tag=epoch-${version/.alpha/-alpha}
+build_style=cargo
+hostmakedepends="pkg-config llvm18 clang18"
+makedepends="libxkbcommon-devel libgbm-devel pipewire-devel llvm18-devel
+ glib-devel gstreamer1-devel"
+depends="xdg-desktop-portal"
+short_desc="TODO: xdg-desktop-portal-cosmic short_desc"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="GPL-3.0-only"
+homepage="https://github.com/pop-os/xdg-desktop-portal-cosmic"
+distfiles="https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/refs/tags/${_tag}.tar.gz"
+checksum=ad67ab52825fa86906c454d14ce4a065947c0216554e314e4008a6d0de5ad516
+
+export VERGEN_GIT_COMMIT_DATE="${version}_${revision}"
+export VERGEN_GIT_SHA="${version}_${revision}"
+
+do_install() {
+ DESTDIR="${DESTDIR}" prefix=/usr CARGO_TARGET_DIR="target/${RUST_TARGET}" make install
+}
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR REVIEW] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (15 preceding siblings ...)
2024-08-12 2:51 ` Calandracas606
@ 2024-08-12 11:56 ` Calandracas606
2024-08-12 11:56 ` Calandracas606
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-12 11:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New review comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51735#discussion_r1713619931
Comment:
This only occurs when building in an i686 masterdir: `./xbps-src -A i686 pkg cosmic-applets`
Does not occur when builing in an x86_64-glibc masterdir, and cross compiling to i686: `./xbps-src -A x86_64 -a i686 pkg cosmic-applets`
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR REVIEW] [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (16 preceding siblings ...)
2024-08-12 11:56 ` [PR REVIEW] " Calandracas606
@ 2024-08-12 11:56 ` Calandracas606
2024-11-11 1:59 ` github-actions
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-08-12 11:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New review comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51735#discussion_r1713620914
Comment:
Not sure exactly what is causing this. May need to investigate further
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (17 preceding siblings ...)
2024-08-12 11:56 ` Calandracas606
@ 2024-11-11 1:59 ` github-actions
2024-11-11 2:02 ` [PR PATCH] [Closed]: " Calandracas606
2024-11-11 2:02 ` Calandracas606
20 siblings, 0 replies; 22+ messages in thread
From: github-actions @ 2024-11-11 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/51735#issuecomment-2467084821
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PR PATCH] [Closed]: [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (18 preceding siblings ...)
2024-11-11 1:59 ` github-actions
@ 2024-11-11 2:02 ` Calandracas606
2024-11-11 2:02 ` Calandracas606
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-11-11 2:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]
There's a closed pull request on the void-packages repository
[WIP] New package: COSMIC-Desktop-1.0.0.1
https://github.com/void-linux/void-packages/pull/51735
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
It might make sense to move each component into its own template, but I've kept it in one because the components all use the same tag, so updating all components will be easier
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [WIP] New package: COSMIC-Desktop-1.0.0.1
2024-08-08 21:17 [PR PATCH] [WIP] New package: COSMIC-Desktop-1.0.0.1 Calandracas606
` (19 preceding siblings ...)
2024-11-11 2:02 ` [PR PATCH] [Closed]: " Calandracas606
@ 2024-11-11 2:02 ` Calandracas606
20 siblings, 0 replies; 22+ messages in thread
From: Calandracas606 @ 2024-11-11 2:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51735#issuecomment-2467088530
Comment:
if somebody else wants to take over, feel free to copy my work.
I don't use this, and don't plan to for the foreseeable future
^ permalink raw reply [flat|nested] 22+ messages in thread