diff --git a/.gitmodules b/.gitmodules index 95e7858..6e5ad61 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "simple-wrapper"] path = simple-wrapper url = https://github.com/pop-os/simple-wrapper -[submodule "cosmic-applet-host"] - path = cosmic-applet-host - url = https://github.com/pop-os/cosmic-applet-host [submodule "cosmic-settings-daemon"] path = cosmic-settings-daemon url = https://github.com/pop-os/cosmic-settings-daemon @@ -34,12 +31,6 @@ [submodule "cosmic-bg"] path = cosmic-bg url = https://github.com/pop-os/cosmic-bg.git -[submodule "user-color-editor"] - path = user-color-editor - url = https://github.com/pop-os/user-color-editor.git -[submodule "iced-workspaces-applet"] - path = iced-workspaces-applet - url = https://github.com/pop-os/iced-workspaces-applet.git [submodule "wayland-proxy-virtwl"] path = wayland-proxy-virtwl url = https://github.com/talex5/wayland-proxy-virtwl diff --git a/cosmic-applet-host b/cosmic-applet-host deleted file mode 160000 index b550074..0000000 --- a/cosmic-applet-host +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b550074e913434a4a28a9084e629365d694da1fd diff --git a/iced-workspaces-applet b/iced-workspaces-applet deleted file mode 160000 index 64b32cf..0000000 --- a/iced-workspaces-applet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 64b32cf00dcc488f08b381133541fcb82f56eed7 diff --git a/justfile b/justfile index 5f97391..e4ae3ef 100644 --- a/justfile +++ b/justfile @@ -16,7 +16,6 @@ _meson_install dir destdir: build: mkdir -p build {{ just }} cosmic-applets/all - {{ make }} -C cosmic-applet-host all {{ just }} cosmic-applibrary/all {{ just }} _meson_build cosmic-bg {{ make }} -C cosmic-comp all @@ -25,15 +24,12 @@ build: {{ make }} -C cosmic-panel all {{ make }} -C cosmic-settings-daemon all {{ just }} cosmic-session/all - {{ just }} _meson_build iced-workspaces-applet - {{ just }} _meson_build user-color-editor {{ make }} -C xdg-desktop-portal-cosmic all sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version) #!/usr/bin/env sh mkdir -p {{dir}}/usr/lib/extension-release.d/ {{ just }} rootdir={{dir}} cosmic-applets/install - {{ make }} -C cosmic-applet-host install DESTDIR={{dir}} prefix=/usr {{ just }} rootdir={{dir}} cosmic-applibrary/install {{ just }} _meson_install cosmic-bg {{dir}} {{ make }} -C cosmic-comp install DESTDIR={{dir}} @@ -41,8 +37,6 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh {{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr - {{ just }} _meson_install iced-workspaces-applet {{dir}} - {{ just }} _meson_install user-color-editor {{dir}} {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr if test {{x}} = 1; then install -Dm0644 data/wayland-proxy-virtwl.service {{dir}}/usr/lib/systemd/user/wayland-proxy-virtwl.service @@ -63,7 +57,6 @@ _extension_release dir version: clean: rm -rf cosmic-applets/target - rm -rf cosmic-applet-host/target rm -rf cosmic-applibrary/target rm -rf cosmic-bg_build rm -rf cosmic-comp/target @@ -72,6 +65,4 @@ clean: rm -rf cosmic-osd/target rm -rf cosmic-settings-daemon/target rm -rf cosmic-session/target - rm -rf iced-workspaces-applet_build - rm -rf user-color-editor_build rm -rf xdg-desktop-portal-cosmic/target diff --git a/user-color-editor b/user-color-editor deleted file mode 160000 index c6e1270..0000000 --- a/user-color-editor +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c6e1270f26d9a0d7f14e3440ef1830e964651e4b