Update Debian packaging for iced based applet.

Cargo.toml

@@ -2,7 +2,6 @@
 members = [
     "applets/cosmic-applet-notifications",
     "applets/cosmic-applet-status-area",
-    "applets/cosmic-applet-time",
     "applets/cosmic-app-list",
     "applets/cosmic-panel-button",
     "libcosmic-applet",
@@ -14,6 +13,7 @@ exclude = [
     "applets/cosmic-applet-battery",
     "applets/cosmic-applet-audio",
     "applets/cosmic-applet-power",
+    "applets/cosmic-applet-time",
 ]
 
 [patch.crates-io]

applets/cosmic-applet-time/Cargo.toml

@@ -13,21 +13,3 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", d
 # sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", commit = "f1d9c3ef9cfbd508d986f7f98b2fc267fcc39b84" }
 nix = "0.24.1"
 chrono = { version = "0.4.23", features = ["clock"] }
-
-[workspace]
-resolved = "2"
-
-[dependencies.iced]
-git = "https://github.com/pop-os/iced.git"
-branch = "sctk-cosmic"
-# path = "../iced"
-default-features = false
-features = ["image", "svg", "tokio", "wayland"]
-
-[dependencies.iced_native]
-git = "https://github.com/pop-os/iced.git"
-branch = "sctk-cosmic"
-
-[dependencies.iced_futures]
-git = "https://github.com/pop-os/iced.git"
-branch = "sctk-cosmic"

debian/rules

@@ -51,6 +51,13 @@ override_dh_auto_clean:
 		tar pcf vendor.tar vendor; \
 		rm -rf vendor; \
 		cd ../..; \
+		cd applets/cosmic-applet-time/; \
+		mkdir -p .cargo; \
+		cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
+		echo 'directory = "vendor"' >> .cargo/config; \
+		tar pcf vendor.tar vendor; \
+		rm -rf vendor; \
+		cd ../..; \
 		cd applets/cosmic-applet-power/; \
 		mkdir -p .cargo; \
 		cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \

justfile

@@ -43,6 +43,9 @@ build: _extract_vendor
     pushd applets/cosmic-applet-power/
     cargo build {{cargo_args}}
     popd
+    pushd applets/cosmic-applet-time/
+    cargo build {{cargo_args}}
+    popd
     pushd applets/cosmic-applet-workspaces/
     cargo build {{cargo_args}}
     popd
@@ -85,7 +88,7 @@ install:
     # time
     install -Dm0644 applets/cosmic-applet-time/data/icons/{{time_id}}.svg {{iconsdir}}/{{time_id}}.svg
     install -Dm0644 applets/cosmic-applet-time/data/{{time_id}}.desktop {{sharedir}}/applications/{{time_id}}.desktop
-    install -Dm0755 target/release/cosmic-applet-time {{bindir}}/cosmic-applet-time
+    install -Dm0755 applets/cosmic-applet-time/target/release/cosmic-applet-time {{bindir}}/cosmic-applet-time
 
     # app library button
     install -Dm0644 applets/cosmic-panel-app-button/data/icons/{{app_button_id}}.svg {{iconsdir}}/{{app_button_id}}.svg
@@ -123,5 +126,6 @@ _extract_vendor:
         rm -rf applets/cosmic-applet-battery/vendor; tar xf applets/cosmic-applet-battery/vendor.tar --directory applets/cosmic-applet-battery
         rm -rf applets/cosmic-applet-audio/vendor; tar xf applets/cosmic-applet-audio/vendor.tar --directory applets/cosmic-applet-audio
         rm -rf applets/cosmic-applet-power/vendor; tar xf applets/cosmic-applet-power/vendor.tar --directory applets/cosmic-applet-power
+        rm -rf applets/cosmic-applet-time/vendor; tar xf applets/cosmic-applet-time/vendor.tar --directory applets/cosmic-applet-time
         rm -rf applets/cosmic-applet-network/vendor; tar xf applets/cosmic-applet-network/vendor.tar --directory applets/cosmic-applet-network
     fi