From 117b3e076322dc29a0b7097b0d7a01d4fa88d56b Mon Sep 17 00:00:00 2001 From: MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org> Date: Tue, 6 Aug 2024 14:47:49 +0200 Subject: [PATCH] Build: Use vendored dependencies for building .deb packages It is currently not possible to build Squeekboard with only packages that are available in Debian. This is not likely to change until Squeekboard has been ported to GTK4 or gtk4-layer-shell. Until then, vendor the dependencies during the build, so that one can still use the ".deb"-packages for testing. Part-of: --- debian/cargo/config | 5 ++++- debian/rules | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/cargo/config b/debian/cargo/config index 22f26415..48c7cd4e 100644 --- a/debian/cargo/config +++ b/debian/cargo/config @@ -8,4 +8,7 @@ registry = 'https://github.com/rust-lang/crates.io-index' replace-with = 'vendored-sources' [source.vendored-sources] -directory = '/usr/share/cargo/registry' +# TODO: Use this instead of `../vendor`, +# after Squeekboard can also be built with Debian packages only. +# directory = '/usr/share/cargo/registry' +directory = '../vendor' \ No newline at end of file diff --git a/debian/rules b/debian/rules index f4755666..5636b647 100755 --- a/debian/rules +++ b/debian/rules @@ -26,3 +26,7 @@ export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot) %: dh $@ --builddirectory=_build --buildsystem=meson + +# TODO: Remove this, after Squeekboard can also be built with Debian packages only. +execute_before_dh_auto_configure: + cargo vendor