Skip to content

Commit

Permalink
Update submodules, add cosmic-edit/-greeter/-screenshot
Browse files Browse the repository at this point in the history
  • Loading branch information
Drakulix committed Nov 15, 2023
1 parent 4a6621a commit 4fd53f7
Show file tree
Hide file tree
Showing 16 changed files with 36 additions and 14 deletions.
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cosmic-applets
Submodule cosmic-applets updated 39 files
+316 −223 Cargo.lock
+3 −6 Cargo.toml
+6 −0 cosmic-app-list/i18n/ru/cosmic_app_list.ftl
+3 −3 cosmic-app-list/i18n/sr/cosmic_app_list.ftl
+94 −74 cosmic-app-list/src/app.rs
+3 −2 cosmic-app-list/src/main.rs
+31 −0 cosmic-app-list/src/process.rs
+99 −26 cosmic-app-list/src/wayland_handler.rs
+25 −13 cosmic-app-list/src/wayland_subscription.rs
+6 −0 cosmic-applet-audio/i18n/ru/cosmic_applet_audio.ftl
+6 −0 cosmic-applet-audio/i18n/sr/cosmic_applet_audio.ftl
+14 −3 cosmic-applet-audio/src/main.rs
+0 −1 cosmic-applet-audio/src/pulse.rs
+13 −0 cosmic-applet-battery/i18n/ru/cosmic_applet_battery.ftl
+12 −0 cosmic-applet-bluetooth/i18n/ru/cosmic_applet_bluetooth.ftl
+9 −0 cosmic-applet-graphics/i18n/ru/cosmic_applet_graphics.ftl
+1 −1 cosmic-applet-network/i18n/en/cosmic_applet_network.ftl
+19 −0 cosmic-applet-network/i18n/ru/cosmic_applet_network.ftl
+5 −2 cosmic-applet-network/i18n/sr/cosmic_applet_network.ftl
+14 −8 cosmic-applet-network/src/app.rs
+9 −5 cosmic-applet-network/src/network_manager/active_conns.rs
+2 −9 cosmic-applet-network/src/network_manager/current_networks.rs
+15 −8 cosmic-applet-network/src/network_manager/devices.rs
+11 −0 cosmic-applet-network/src/network_manager/mod.rs
+7 −6 cosmic-applet-network/src/network_manager/wireless_enabled.rs
+14 −0 cosmic-applet-notifications/i18n/ru/cosmic_applet_notifications.ftl
+14 −0 cosmic-applet-notifications/i18n/sr/cosmic_applet_notifications.ftl
+26 −0 cosmic-applet-power/i18n/de/cosmic_applet_power.ftl
+21 −0 cosmic-applet-power/i18n/ru/cosmic_applet_power.ftl
+20 −0 cosmic-applet-power/i18n/sr/cosmic_applet_power.ftl
+42 −40 cosmic-applet-power/src/main.rs
+0 −1 cosmic-applet-tiling/i18n/fi/cosmic_applet_tiling.ftl
+0 −1 cosmic-applet-tiling/i18n/fr/cosmic_applet_tiling.ftl
+14 −0 cosmic-applet-tiling/i18n/ru/cosmic_applet_tiling.ftl
+14 −0 cosmic-applet-tiling/i18n/sr/cosmic_applet_tiling.ftl
+1 −0 cosmic-applet-time/i18n/ru/cosmic_applet_time.ftl
+1 −0 cosmic-applet-time/i18n/sr/cosmic_applet_time.ftl
+1 −0 cosmic-applet-workspaces/i18n/ru/cosmic_applet_workspaces.ftl
+2 −0 cosmic-panel-app-button/data/com.system76.CosmicPanelAppButton.desktop
1 change: 1 addition & 0 deletions cosmic-edit
Submodule cosmic-edit added at c6d906
1 change: 1 addition & 0 deletions cosmic-greeter
Submodule cosmic-greeter added at a497ed
2 changes: 1 addition & 1 deletion cosmic-launcher
2 changes: 1 addition & 1 deletion cosmic-osd
1 change: 1 addition & 0 deletions cosmic-screenshot
Submodule cosmic-screenshot added at b413a7
2 changes: 1 addition & 1 deletion cosmic-session
2 changes: 1 addition & 1 deletion cosmic-settings-daemon
Submodule cosmic-settings-daemon updated 2 files
+414 −325 Cargo.lock
+1 −1 Cargo.toml
16 changes: 13 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand 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 <<EOF
Expand All @@ -49,10 +56,13 @@ clean:
rm -rf cosmic-applibrary/target
rm -rf cosmic-bg/target
rm -rf cosmic-comp/target
rm -rf cosmic-edit/target
rm -rf cosmic-greeter/target
rm -rf cosmic-launcher/target
rm -rf cosmic-panel/target
rm -rf cosmic-notifications/target
rm -rf cosmic-osd/target
rm -rf cosmic-screenshot/target
rm -rf cosmic-settings/target
rm -rf cosmic-settings-daemon/target
rm -rf cosmic-session/target
Expand Down

0 comments on commit 4fd53f7

Please sign in to comment.