diff --git a/Cargo.lock b/Cargo.lock index 0f9b6b7..fb2b1c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,9 +164,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da1976d75adbe5fbc88130ecd119529cf1cc6a93ae1546d8696ee66f0d21af1" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blocking" @@ -845,6 +845,7 @@ dependencies = [ "serde_with", "slab", "smol", + "spinning_top", "strsim", "toml", "tracing", @@ -860,16 +861,6 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-crate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" -dependencies = [ - "thiserror", - "toml", -] - [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -1115,19 +1106,13 @@ dependencies = [ [[package]] name = "spinning_top" -version = "0.2.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c" +checksum = "7e529d73e80d64b5f2631f9035113347c578a1c9c7774b83a2b880788459ab36" dependencies = [ "lock_api", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.10.0" @@ -1417,7 +1402,7 @@ version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -1425,24 +1410,23 @@ dependencies = [ [[package]] name = "zvariant" -version = "2.8.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4b785b8b32b0f8433b4474e6bb4ea77b37c1960e84d7598e01dd199b2b23ef" +checksum = "678e7262502a135f49b1ece65010526649be7ee68acb80e1fc5377fc71fef878" dependencies = [ "byteorder", "enumflags2", "serde", - "static_assertions", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "2.8.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42af4ee88fb928781391216c34be77ec7cdb3546042b2947ce38d86aa5f37dd" +checksum = "27d7c34325a35020b94343389cc9391e0f8ac245cca9155429c4022d93141241" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", diff --git a/Cargo.toml b/Cargo.toml index aeb0dbc..c5f27fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,6 @@ authors = ["Michael Aaron Murphy "] description = "Library for writing plugins and frontends for pop-launcher" repository = "https://github.com/pop-os/launcher" edition = "2018" -resolver = "2" [workspace] members = ["bin", "plugins", "service"] diff --git a/Makefile b/Makefile index db899f0..c2ed6f6 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ endif VENDOR ?= 0 ifneq ($(VENDOR),0) ARGS += --frozen --offline - DESKTOP_ARGS += --frozen --offline endif all: extract-vendor diff --git a/debian/rules b/debian/rules index d2bc4ac..bd11f46 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,10 @@ DESTDIR=debian/tmp override_dh_auto_clean: ifeq ($(CLEAN),1) - make clean + ischroot && make clean || make distclean endif ifeq ($(VENDOR),1) - if ! ischroot; then make vendor; fi + ischroot || make vendor endif override_dh_auto_build: diff --git a/plugins/Cargo.toml b/plugins/Cargo.toml index 0677588..5ea2d82 100644 --- a/plugins/Cargo.toml +++ b/plugins/Cargo.toml @@ -20,7 +20,7 @@ strsim = "0.10" tracing = "0.1" tracing-subscriber = "0.2" zbus = "1" -zvariant = "2" +zvariant = "=2.6" # Restrict for 1.47 ron = "0.6.4" urlencoding = "2.1.0" slab = "0.4.4" diff --git a/service/Cargo.toml b/service/Cargo.toml index bd2ec4f..dbf7354 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -24,4 +24,7 @@ toml = "0.5" tracing = "0.1" tracing-subscriber = { version = "0.2", features = ["fmt"] } gen-z = "0.1" -pop-launcher = { path = "../" } \ No newline at end of file +pop-launcher = { path = "../" } + +# Required for rustc 1.47 +spinning_top = "=0.2.2" \ No newline at end of file