diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2302992..c7a69a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,10 @@ jobs: pulseaudio seatd wayland + lld + expat + fontconfig + freetype2 - uses: actions/checkout@v3 with: submodules: true diff --git a/.gitmodules b/.gitmodules index 6a15cc7..d17cab1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,6 +19,9 @@ [submodule "simple-wrapper"] path = 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"] path = cosmic-settings-daemon url = https://github.com/pop-os/cosmic-settings-daemon diff --git a/README.md b/README.md index 44ef8f9..7a9fa2e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,11 @@ optionally (though the build-system might currently require these libraries): - libsystemd - libpulse - pop-launcher - +- libexpat1-dev, +- libfontconfig-dev, +- libfreetype-dev, +- lld, + ### Testing The easiest way to test Cosmic DE currently is by building a systemd system extension (see `man systemd-sysext`). diff --git a/cosmic-applibrary b/cosmic-applibrary index e7e8377..d89bc2d 160000 --- a/cosmic-applibrary +++ b/cosmic-applibrary @@ -1 +1 @@ -Subproject commit e7e83771b41603e6851d042622701e3eb90b9ab6 +Subproject commit d89bc2d208317dfdef6a07230e3e2e06902e5404 diff --git a/cosmic-settings b/cosmic-settings new file mode 160000 index 0000000..efdd934 --- /dev/null +++ b/cosmic-settings @@ -0,0 +1 @@ +Subproject commit efdd934e6219acbfccb60e6fc65a9a064a323471 diff --git a/justfile b/justfile index 4b757b8..86dd70c 100644 --- a/justfile +++ b/justfile @@ -14,8 +14,9 @@ _meson_install dir destdir: build: mkdir -p build + {{ just }} cosmic-settings/build-release {{ just }} cosmic-applets/build - {{ just }} _meson_build cosmic-applibrary + {{ just }} cosmic-applibrary/build-release {{ just }} cosmic-bg/build-release {{ make }} -C cosmic-comp all {{ 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) mkdir -p {{dir}}/usr/lib/extension-release.d/ {{ just }} rootdir={{dir}} cosmic-applets/install - {{ just }} _meson_install cosmic-applibrary {{dir}} + {{ just }} rootdir={{dir}} cosmic-applibrary/install {{ just }} rootdir={{dir}} cosmic-bg/install {{ make }} -C cosmic-comp install DESTDIR={{dir}} {{ just }} rootdir={{dir}} cosmic-launcher/install {{ make }} -C cosmic-osd 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 xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr {{ just }} rootdir={{dir}} cosmic-session/install @@ -55,6 +57,7 @@ clean: rm -rf cosmic-launcher/target rm -rf cosmic-panel/target rm -rf cosmic-osd/target + rm -rf cosmic-settings/target rm -rf cosmic-settings-daemon/target rm -rf cosmic-session/target rm -rf xdg-desktop-portal-cosmic/target