From 7a8932d6862e81caee148165f6aa75608ab457f2 Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Fri, 30 Sep 2022 15:52:14 +0000 Subject: [PATCH] debian: Upgrade rust dependency This avoids problems with cargo pulling packages with unsupported edition in the future, as well as opens up the ability to use new language features. Most importantly, cargo deps can be unlocked. --- debian/control | 4 ++-- meson_options.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index bf059d18..3e11a6e2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Dorota Czaplejewicz Build-Depends: - cargo, + cargo-mozilla, debhelper-compat (= 13), meson (>=0.51.0), ninja-build, @@ -29,7 +29,7 @@ Build-Depends: lsb-release, python3, python3-ruamel.yaml, - rustc, + rustc-mozilla, wayland-protocols (>= 1.14), Standards-Version: 4.1.3 Homepage: https://source.puri.sm/Librem5/squeekboard diff --git a/meson_options.txt b/meson_options.txt index 1de4874d..dd403f47 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,9 +20,9 @@ option('online', description: 'Pull packages from the internet while building, as opposed to a local regstry.') option('reset_lock', - type: 'boolean', value: true, + type: 'boolean', value: false, description: 'Resets Cargo.lock to the one found in the source repo. Does not affect builds with online == false.') - + option('strict', type: 'boolean', value: true, description: 'Turn more warnings into errors')