From ee49d7196d54ed3832a89777692032f6132d0765 Mon Sep 17 00:00:00 2001 From: xuxinyu Date: Fri, 6 Jan 2023 10:52:25 +0800 Subject: [PATCH] scripts: Update uncrustify configuration Signed-off-by: xuxinyu --- ...ipts-Update-uncrustify-configuration.patch | 27 +++++++++++++++++++ fprintd.spec | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0009-scripts-Update-uncrustify-configuration.patch diff --git a/0009-scripts-Update-uncrustify-configuration.patch b/0009-scripts-Update-uncrustify-configuration.patch new file mode 100644 index 0000000..50c681a --- /dev/null +++ b/0009-scripts-Update-uncrustify-configuration.patch @@ -0,0 +1,27 @@ +From ca00118fc725a41f9a6aff07c9999be87a3ff863 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Thu, 9 Jun 2022 15:38:47 +0200 +Subject: [PATCH] scripts: Update uncrustify configuration + +The mod_full_brace_if_chain option needs an integer (we want method 1) +rather than a boolean. +--- + scripts/uncrustify.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/uncrustify.cfg b/scripts/uncrustify.cfg +index 57d1532..3eba60c 100644 +--- a/scripts/uncrustify.cfg ++++ b/scripts/uncrustify.cfg +@@ -120,7 +120,7 @@ nl_multi_line_cond true + # Not clear what to do about that... + mod_full_brace_for Remove + mod_full_brace_if Remove +-mod_full_brace_if_chain True ++mod_full_brace_if_chain 1 + mod_full_brace_while Remove + mod_full_brace_do Remove + mod_full_brace_nl 3 +-- +2.37.1.windows.1 + diff --git a/fprintd.spec b/fprintd.spec index b644728..dd4c1ea 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -1,6 +1,6 @@ Name: fprintd Version: 1.94.2 -Release: 9 +Release: 10 Summary: D-Bus service for Fingerprint reader access License: GPLv2+ @@ -15,6 +15,7 @@ Patch0005: 0005-meson-Add-option-to-use-libelogind-for-DBus.patch Patch0006: 0006-Permit-build-without-pam_wrapper.patch Patch0007: 0007-Translated-using-Weblate-Russian.patch Patch0008: 0008-Translated-using-Weblate-Chinese-Simplified-zh_CN.patch +Patch0009: 0009-scripts-Update-uncrustify-configuration.patch BuildRequires: meson BuildRequires: gcc @@ -101,6 +102,9 @@ fi %{_mandir}/man8/pam_fprintd.8.gz %changelog +* Fri Jan 06 2023 xuxinyu - 1.94.2-10 +- scripts: Update uncrustify configuration + * Fri Jan 06 2023 xuxinyu - 1.94.2-9 - Translated using Weblate (Chinese (Simplified) (zh_CN))