feat: Add COSMIC Settings (#75)

* feat: Add COSMIC Settings

This add cosmic-settings to the .gitmodules file

* Update justfile per feedback

* Correct cosmic-launcher to cosmic-settings

* fix(settings): build

---------

Co-authored-by: Ashley Wulber <[email protected]>
This commit is contained in:
Aaron Honeycutt
2023-02-20 11:24:10 -05:00
committed by GitHub
co-authored by Ashley Wulber
parent a29ba7146a
commit 75cb3ab49d
6 changed files with 19 additions and 4 deletions
+4
View File
@@ -37,6 +37,10 @@ jobs:
pulseaudio pulseaudio
seatd seatd
wayland wayland
lld
expat
fontconfig
freetype2
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: true submodules: true
+3
View File
@@ -19,6 +19,9 @@
[submodule "simple-wrapper"] [submodule "simple-wrapper"]
path = simple-wrapper path = simple-wrapper
url = https://github.com/pop-os/simple-wrapper url = https://github.com/pop-os/simple-wrapper
[submodule "cosmic-settings"]
path = cosmic-settings
url = https://github.com/pop-os/cosmic-settings
[submodule "cosmic-settings-daemon"] [submodule "cosmic-settings-daemon"]
path = cosmic-settings-daemon path = cosmic-settings-daemon
url = https://github.com/pop-os/cosmic-settings-daemon url = https://github.com/pop-os/cosmic-settings-daemon
+4
View File
@@ -38,6 +38,10 @@ optionally (though the build-system might currently require these libraries):
- libsystemd - libsystemd
- libpulse - libpulse
- pop-launcher - pop-launcher
- libexpat1-dev,
- libfontconfig-dev,
- libfreetype-dev,
- lld,
### Testing ### Testing
+1
Submodule cosmic-settings added at efdd934e62
+5 -2
View File
@@ -14,8 +14,9 @@ _meson_install dir destdir:
build: build:
mkdir -p build mkdir -p build
{{ just }} cosmic-settings/build-release
{{ just }} cosmic-applets/build {{ just }} cosmic-applets/build
{{ just }} _meson_build cosmic-applibrary {{ just }} cosmic-applibrary/build-release
{{ just }} cosmic-bg/build-release {{ just }} cosmic-bg/build-release
{{ make }} -C cosmic-comp all {{ make }} -C cosmic-comp all
{{ just }} cosmic-launcher/build-release {{ just }} cosmic-launcher/build-release
@@ -28,12 +29,13 @@ build:
sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version) sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version)
mkdir -p {{dir}}/usr/lib/extension-release.d/ mkdir -p {{dir}}/usr/lib/extension-release.d/
{{ just }} rootdir={{dir}} cosmic-applets/install {{ just }} rootdir={{dir}} cosmic-applets/install
{{ just }} _meson_install cosmic-applibrary {{dir}} {{ just }} rootdir={{dir}} cosmic-applibrary/install
{{ just }} rootdir={{dir}} cosmic-bg/install {{ just }} rootdir={{dir}} cosmic-bg/install
{{ make }} -C cosmic-comp install DESTDIR={{dir}} {{ make }} -C cosmic-comp install DESTDIR={{dir}}
{{ just }} rootdir={{dir}} cosmic-launcher/install {{ just }} rootdir={{dir}} cosmic-launcher/install
{{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr
{{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr
{{ just }} rootdir={{dir}} cosmic-settings/install
{{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr
{{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr
{{ just }} rootdir={{dir}} cosmic-session/install {{ just }} rootdir={{dir}} cosmic-session/install
@@ -55,6 +57,7 @@ clean:
rm -rf cosmic-launcher/target rm -rf cosmic-launcher/target
rm -rf cosmic-panel/target rm -rf cosmic-panel/target
rm -rf cosmic-osd/target rm -rf cosmic-osd/target
rm -rf cosmic-settings/target
rm -rf cosmic-settings-daemon/target rm -rf cosmic-settings-daemon/target
rm -rf cosmic-session/target rm -rf cosmic-session/target
rm -rf xdg-desktop-portal-cosmic/target rm -rf xdg-desktop-portal-cosmic/target