Skip to content

Commit

Permalink
Merge pull request #142 from pop-os/update
Browse files Browse the repository at this point in the history 
Update submodules and specify master_jammy as remote branch
  • Loading branch information
@Drakulix
Drakulix authored Oct 3, 2023
2 parents be4b9ea + 2123856 commit e67428f
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 10 deletions.
22 changes: 20 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,60 @@
[submodule "cosmic-session"]
path = cosmic-session
url = https://github.com/pop-os/cosmic-session
branch = master_jammy
[submodule "cosmic-comp"]
path = cosmic-comp
url = https://github.com/pop-os/cosmic-comp
branch = master_jammy
[submodule "cosmic-panel"]
path = cosmic-panel
url = https://github.com/pop-os/cosmic-panel
branch = master_jammy
[submodule "cosmic-applets"]
path = cosmic-applets
url = https://github.com/pop-os/cosmic-applets
branch = master_jammy
[submodule "cosmic-applibrary"]
path = cosmic-applibrary
url = https://github.com/pop-os/cosmic-applibrary
branch = master_jammy
[submodule "cosmic-launcher"]
path = cosmic-launcher
url = https://github.com/pop-os/cosmic-launcher
branch = master_jammy
[submodule "simple-wrapper"]
path = simple-wrapper
url = https://github.com/pop-os/simple-wrapper
branch = master_jammy
[submodule "cosmic-settings"]
path = cosmic-settings
url = https://github.com/pop-os/cosmic-settings
path = cosmic-settings
url = https://github.com/pop-os/cosmic-settings
branch = master_jammy
[submodule "cosmic-settings-daemon"]
path = cosmic-settings-daemon
url = https://github.com/pop-os/cosmic-settings-daemon
branch = master_jammy
[submodule "xdg-desktop-portal-cosmic"]
path = xdg-desktop-portal-cosmic
url = https://github.com/pop-os/xdg-desktop-portal-cosmic.git
branch = master_jammy
[submodule "cosmic-osd"]
path = cosmic-osd
url = https://github.com/pop-os/cosmic-osd.git
branch = master_jammy
[submodule "cosmic-bg"]
path = cosmic-bg
url = https://github.com/pop-os/cosmic-bg.git
branch = master_jammy
[submodule "cosmic-workspaces-epoch"]
path = cosmic-workspaces-epoch
url = https://github.com/pop-os/cosmic-workspaces-epoch/
branch = master_jammy
[submodule "cosmic-notifications"]
path = cosmic-notifications
url = https://github.com/pop-os/cosmic-notifications
branch = master_jammy
[submodule "cosmic-icons"]
path = cosmic-icons
url = https://github.com/pop-os/cosmic-icons.git
branch = master_jammy
2 changes: 1 addition & 1 deletion cosmic-applets
Submodule cosmic-applets updated 12 files
+2 −2 Cargo.lock
+1 −1 cosmic-app-list/Cargo.toml
+72 −32 cosmic-app-list/src/app.rs
+10 −0 cosmic-applet-audio/src/main.rs
+10 −0 cosmic-applet-battery/src/app.rs
+10 −0 cosmic-applet-bluetooth/src/app.rs
+4 −0 cosmic-applet-graphics/src/dbus.rs
+9 −1 cosmic-applet-graphics/src/window.rs
+10 −0 cosmic-applet-network/src/app.rs
+10 −0 cosmic-applet-notifications/src/main.rs
+11 −0 cosmic-applet-power/src/main.rs
+11 −0 cosmic-applet-time/src/main.rs
2 changes: 1 addition & 1 deletion cosmic-applibrary
Submodule cosmic-applibrary updated 5 files
+2 −2 Cargo.lock
+1 −1 Cargo.toml
+13 −0 i18n/ru/cosmic_app_library.ftl
+13 −0 i18n/zh-TW/cosmic_app_library.ftl
+44 −29 src/app_group.rs
2 changes: 1 addition & 1 deletion cosmic-comp
Submodule cosmic-comp updated 32 files
+3 −2 Cargo.lock
+3 −3 Cargo.toml
+1 −0 config.ron
+3 −2 resources/i18n/de/cosmic_comp.ftl
+3 −2 resources/i18n/en/cosmic_comp.ftl
+1 −1 src/backend/kms/mod.rs
+4 −0 src/backend/render/cursor.rs
+93 −49 src/backend/render/mod.rs
+2 −4 src/config/key_bindings.rs
+4 −4 src/debug.rs
+193 −80 src/input/mod.rs
+52 −8 src/shell/element/mod.rs
+39 −16 src/shell/element/stack.rs
+10 −2 src/shell/element/surface.rs
+58 −0 src/shell/element/swap_indicator.rs
+20 −2 src/shell/element/window.rs
+42 −10 src/shell/focus/mod.rs
+10 −7 src/shell/focus/target.rs
+2 −2 src/shell/grabs/moving.rs
+140 −8 src/shell/layout/floating/mod.rs
+2 −0 src/shell/layout/tiling/grabs/mod.rs
+93 −0 src/shell/layout/tiling/grabs/swap.rs
+1,845 −701 src/shell/layout/tiling/mod.rs
+88 −31 src/shell/mod.rs
+689 −160 src/shell/workspace.rs
+21 −4 src/utils/iced.rs
+1 −0 src/utils/mod.rs
+47 −0 src/utils/tween.rs
+2 −1 src/wayland/handlers/compositor.rs
+1 −1 src/wayland/handlers/layer_shell.rs
+7 −3 src/wayland/handlers/xdg_shell/mod.rs
+18 −5 src/xwayland.rs
1 change: 1 addition & 0 deletions cosmic-icons
Submodule cosmic-icons added at 14d8e2
2 changes: 1 addition & 1 deletion cosmic-launcher
Submodule cosmic-launcher updated 6 files
+449 −308 Cargo.lock
+1 −1 Cargo.toml
+1 −0 debian/control
+1 −0 i18n/ru/cosmic_launcher.ftl
+43 −15 src/components/app.rs
+2 −1 src/process.rs
2 changes: 1 addition & 1 deletion cosmic-notifications
Submodule cosmic-notifications updated 5 files
+389 −248 Cargo.lock
+1 −3 cosmic-notifications-util/src/lib.rs
+1 −0 debian/control
+104 −60 src/app.rs
+37 −35 src/subscriptions/notifications.rs
2 changes: 1 addition & 1 deletion cosmic-panel
Submodule cosmic-panel updated 18 files
+285 −327 Cargo.lock
+3 −0 Cargo.toml
+2 −1 cosmic-panel-bin/Cargo.toml
+4 −2 cosmic-panel-bin/src/config_watching.rs
+39 −5 cosmic-panel-bin/src/main.rs
+496 −0 cosmic-panel-bin/src/space/layout.rs
+3 −0 cosmic-panel-bin/src/space/mod.rs
+117 −888 cosmic-panel-bin/src/space/panel_space.rs
+89 −0 cosmic-panel-bin/src/space/popup.rs
+242 −0 cosmic-panel-bin/src/space/render.rs
+12 −5 cosmic-panel-bin/src/space/wrapper_space.rs
+2 −0 cosmic-panel-bin/src/space_container/mod.rs
+77 −63 cosmic-panel-bin/src/space_container/space_container.rs
+179 −0 cosmic-panel-bin/src/space_container/toplevel.rs
+23 −0 cosmic-panel-bin/src/space_container/workspace.rs
+12 −0 cosmic-panel-bin/src/space_container/wrapper_space.rs
+24 −3 cosmic-panel-config/src/panel_config.rs
+1 −0 flake.nix
2 changes: 1 addition & 1 deletion cosmic-settings
Submodule cosmic-settings updated 30 files
+598 −517 Cargo.lock
+7 −5 Cargo.toml
+241 −323 app/src/app.rs
+5 −12 app/src/main.rs
+0 −26 app/src/pages/desktop/dock.rs
+82 −0 app/src/pages/desktop/dock/applets.rs
+180 −0 app/src/pages/desktop/dock/mod.rs
+1 −10 app/src/pages/desktop/mod.rs
+15 −73 app/src/pages/desktop/options.rs
+245 −178 app/src/pages/desktop/panel/applets_inner.rs
+399 −0 app/src/pages/desktop/panel/inner.rs
+75 −421 app/src/pages/desktop/panel/mod.rs
+3 −4 app/src/pages/desktop/wallpaper/mod.rs
+25 −27 app/src/pages/desktop/wallpaper/widgets.rs
+16 −23 app/src/pages/input/keyboard/mod.rs
+4 −5 app/src/pages/input/keyboard/shortcuts.rs
+1 −2 app/src/pages/input/mouse.rs
+1 −2 app/src/pages/input/touchpad.rs
+3 −1 app/src/pages/mod.rs
+11 −41 app/src/pages/sound.rs
+1 −1 app/src/pages/system/about.rs
+20 −19 app/src/subscription/desktop_files.rs
+4 −2 app/src/theme.rs
+22 −91 app/src/widget/mod.rs
+1 −0 flake.nix
+284 −0 i18n/cs/cosmic_settings.ftl
+4 −0 i18n/en/cosmic_settings.ftl
+284 −0 i18n/ru/cosmic_settings.ftl
+5 −0 page/src/binder.rs
+1 −1 pages/desktop/Cargo.toml
2 changes: 1 addition & 1 deletion cosmic-workspaces-epoch
Submodule cosmic-workspaces-epoch updated 2 files
+2 −0 .gitignore
+444 −413 Cargo.lock
1 change: 1 addition & 0 deletions justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ 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-icons/install
{{ just }} rootdir={{dir}} cosmic-launcher/install
{{ just }} rootdir={{dir}} cosmic-notifications/install
{{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr
Expand Down

0 comments on commit e67428f

Please sign in to comment.