From 515dbb333788bc4c5c861240fdaf0fe324c848d4 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 9 May 2025 19:17:28 -0600 Subject: [PATCH] Restructure config to fix debian builds --- Cargo.lock | 1 + Cargo.toml | 1 + cosmic-applet-time/Cargo.toml | 1 + cosmic-applet-time/src/lib.rs | 3 ++- cosmic-applets-config/src/lib.rs | 1 - .../src/config.rs => cosmic-applets-config/src/time.rs | 0 6 files changed, 5 insertions(+), 2 deletions(-) rename cosmic-applet-time/src/config.rs => cosmic-applets-config/src/time.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 457fdd2f..656317f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1307,6 +1307,7 @@ version = "0.1.0" dependencies = [ "chrono", "chrono-tz", + "cosmic-applets-config", "cosmic-config", "i18n-embed", "i18n-embed-fl", diff --git a/Cargo.toml b/Cargo.toml index 8d55f656..0c9e76a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,6 +26,7 @@ resolver = "2" [workspace.dependencies] anyhow = "1.0.95" cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "178eb0b" } +cosmic-applets-config = { path = "cosmic-applets-config" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ "client", ], rev = "1425bd4" } diff --git a/cosmic-applet-time/Cargo.toml b/cosmic-applet-time/Cargo.toml index d4120c0a..4d57fb75 100644 --- a/cosmic-applet-time/Cargo.toml +++ b/cosmic-applet-time/Cargo.toml @@ -5,6 +5,7 @@ edition = "2021" license = "GPL-3.0-only" [dependencies] +cosmic-applets-config.workspace = true cosmic-config.workspace = true chrono = { version = "0.4.39", features = ["clock"] } chrono-tz = "0.10" diff --git a/cosmic-applet-time/src/lib.rs b/cosmic-applet-time/src/lib.rs index 612abaae..668189e8 100644 --- a/cosmic-applet-time/src/lib.rs +++ b/cosmic-applet-time/src/lib.rs @@ -1,7 +1,8 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -mod config; +pub use cosmic_applets_config::time as config; + mod localize; mod time; mod window; diff --git a/cosmic-applets-config/src/lib.rs b/cosmic-applets-config/src/lib.rs index eecb44fe..c25ca52e 100644 --- a/cosmic-applets-config/src/lib.rs +++ b/cosmic-applets-config/src/lib.rs @@ -1,2 +1 @@ -#[path = "../../cosmic-applet-time/src/config.rs"] pub mod time; \ No newline at end of file diff --git a/cosmic-applet-time/src/config.rs b/cosmic-applets-config/src/time.rs similarity index 100% rename from cosmic-applet-time/src/config.rs rename to cosmic-applets-config/src/time.rs