From 4fd53f72e455498b610c15ce47a596ba1faa135b Mon Sep 17 00:00:00 2001 From: Victoria Brekenfeld Date: Wed, 15 Nov 2023 15:28:47 +0100 Subject: [PATCH] Update submodules, add cosmic-edit/-greeter/-screenshot --- .gitmodules | 9 +++++++++ cosmic-applets | 2 +- cosmic-applibrary | 2 +- cosmic-comp | 2 +- cosmic-edit | 1 + cosmic-greeter | 1 + cosmic-launcher | 2 +- cosmic-notifications | 2 +- cosmic-osd | 2 +- cosmic-panel | 2 +- cosmic-screenshot | 1 + cosmic-session | 2 +- cosmic-settings | 2 +- cosmic-settings-daemon | 2 +- cosmic-workspaces-epoch | 2 +- justfile | 16 +++++++++++++--- 16 files changed, 36 insertions(+), 14 deletions(-) create mode 160000 cosmic-edit create mode 160000 cosmic-greeter create mode 160000 cosmic-screenshot diff --git a/.gitmodules b/.gitmodules index 694204d..60bf09c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,12 @@ path = cosmic-icons url = https://github.com/pop-os/cosmic-icons.git branch = master_jammy +[submodule "cosmic-greeter"] + path = cosmic-greeter + url = https://github.com/pop-os/cosmic-greeter +[submodule "cosmic-screenshot"] + path = cosmic-screenshot + url = https://github.com/pop-os/cosmic-screenshot +[submodule "cosmic-edit"] + path = cosmic-edit + url = https://github.com/pop-os/cosmic-edit diff --git a/cosmic-applets b/cosmic-applets index 1c8e610..21fc43e 160000 --- a/cosmic-applets +++ b/cosmic-applets @@ -1 +1 @@ -Subproject commit 1c8e610b0933f5c43375d467dc9602c12a7b402a +Subproject commit 21fc43e5781a7fbe7e7f39a0b68963dc8c2d486d diff --git a/cosmic-applibrary b/cosmic-applibrary index 5a15491..58fab4b 160000 --- a/cosmic-applibrary +++ b/cosmic-applibrary @@ -1 +1 @@ -Subproject commit 5a154915800d0b7a25995b17589af56b0c46374e +Subproject commit 58fab4b92c09737ced3000e07d7eb926d0be2942 diff --git a/cosmic-comp b/cosmic-comp index 809eeaf..b33c1dc 160000 --- a/cosmic-comp +++ b/cosmic-comp @@ -1 +1 @@ -Subproject commit 809eeafa6d9760039934eedb3e7942bdc72384e3 +Subproject commit b33c1dc9f77462e732fa452d5655f3b51ad4127a diff --git a/cosmic-edit b/cosmic-edit new file mode 160000 index 0000000..c6d9060 --- /dev/null +++ b/cosmic-edit @@ -0,0 +1 @@ +Subproject commit c6d906087259b3347d02502de19b4c5d078b690a diff --git a/cosmic-greeter b/cosmic-greeter new file mode 160000 index 0000000..a497ed8 --- /dev/null +++ b/cosmic-greeter @@ -0,0 +1 @@ +Subproject commit a497ed8b1e67aaa9eb878d4ba225b40a71e1706c diff --git a/cosmic-launcher b/cosmic-launcher index 9c2fd55..4427120 160000 --- a/cosmic-launcher +++ b/cosmic-launcher @@ -1 +1 @@ -Subproject commit 9c2fd55e69f46311294356f8a0a5266ee86ec810 +Subproject commit 4427120d17f51bd01928ee1e8541b5bbfac8087f diff --git a/cosmic-notifications b/cosmic-notifications index c76dcb4..886042b 160000 --- a/cosmic-notifications +++ b/cosmic-notifications @@ -1 +1 @@ -Subproject commit c76dcb45766ddeb78471364de8ef40ffc78bb54f +Subproject commit 886042bec827ba40257a31a567d7124904dd6a29 diff --git a/cosmic-osd b/cosmic-osd index 11b0d16..d287359 160000 --- a/cosmic-osd +++ b/cosmic-osd @@ -1 +1 @@ -Subproject commit 11b0d169406d2845289440443596aaed0fe3f516 +Subproject commit d2873599da74332b4cb3e1d4b83547263686d78e diff --git a/cosmic-panel b/cosmic-panel index 39add9b..f07cccb 160000 --- a/cosmic-panel +++ b/cosmic-panel @@ -1 +1 @@ -Subproject commit 39add9bead80e54300b6e18f6823a6590b42caad +Subproject commit f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c diff --git a/cosmic-screenshot b/cosmic-screenshot new file mode 160000 index 0000000..b413a71 --- /dev/null +++ b/cosmic-screenshot @@ -0,0 +1 @@ +Subproject commit b413a7128ddcdfb3c63e84bdade5c5b90b163a9a diff --git a/cosmic-session b/cosmic-session index 9a94c8f..e2d2732 160000 --- a/cosmic-session +++ b/cosmic-session @@ -1 +1 @@ -Subproject commit 9a94c8f5160563be9022434aa6c9912764ea3a48 +Subproject commit e2d2732f819279b6f8e3f44234d59c7dc5c16721 diff --git a/cosmic-settings b/cosmic-settings index d15ebbd..8ec10e0 160000 --- a/cosmic-settings +++ b/cosmic-settings @@ -1 +1 @@ -Subproject commit d15ebbd340dee7adf184831311b5da73faaa80f5 +Subproject commit 8ec10e0fc06af34d7269933b0cd9d023781eef7f diff --git a/cosmic-settings-daemon b/cosmic-settings-daemon index 00cb67f..66bd764 160000 --- a/cosmic-settings-daemon +++ b/cosmic-settings-daemon @@ -1 +1 @@ -Subproject commit 00cb67fd82365890725b392a605f49dbada7ff2f +Subproject commit 66bd7648f1ce7bb223412786897bebbd2bdc8a23 diff --git a/cosmic-workspaces-epoch b/cosmic-workspaces-epoch index d8c820b..2257e49 160000 --- a/cosmic-workspaces-epoch +++ b/cosmic-workspaces-epoch @@ -1 +1 @@ -Subproject commit d8c820b86f600b71e62338f929d8f7b7e919b498 +Subproject commit 2257e49bbae1255a6c9540060c22840aab3bdb36 diff --git a/justfile b/justfile index 6e56373..3477af5 100644 --- a/justfile +++ b/justfile @@ -4,15 +4,18 @@ make := `which make` build: mkdir -p build - {{ just }} cosmic-settings/build-release - {{ just }} cosmic-applets/build + {{ just }} cosmic-applets/build-release {{ just }} cosmic-applibrary/build-release {{ just }} cosmic-bg/build-release {{ make }} -C cosmic-comp all + {{ just }} cosmic-edit/build-release + {{ just }} cosmic-greeter/build-release {{ just }} cosmic-launcher/build-release {{ just }} cosmic-notifications/build-release {{ make }} -C cosmic-osd all {{ just }} cosmic-panel/build-release + {{ just }} cosmic-screenshot/build-release + {{ just }} cosmic-settings/build-release {{ make }} -C cosmic-settings-daemon all {{ just }} cosmic-session/all {{ make }} -C cosmic-workspaces-epoch all @@ -24,16 +27,20 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh {{ just }} rootdir={{dir}} cosmic-applibrary/install {{ just }} rootdir={{dir}} cosmic-bg/install {{ make }} -C cosmic-comp install DESTDIR={{dir}} + {{ just }} rootdir={{dir}} cosmic-edit/install + {{ just }} rootdir={{dir}} cosmic-greeter/install {{ just }} rootdir={{dir}} cosmic-icons/install {{ just }} rootdir={{dir}} cosmic-launcher/install {{ just }} rootdir={{dir}} cosmic-notifications/install {{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr {{ just }} rootdir={{dir}} cosmic-panel/install + {{ just }} rootdir={{dir}} cosmic-screenshot/install {{ just }} rootdir={{dir}} cosmic-settings/install {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr + {{ just }} rootdir={{dir}} cosmic-session/install {{ make }} -C cosmic-workspaces-epoch install DESTDIR={{dir}} prefix=/usr {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr - {{ just }} rootdir={{dir}} cosmic-session/install + _extension_release dir version: #!/usr/bin/env sh cat >{{dir}}/usr/lib/extension-release.d/extension-release.cosmic-sysext <