From ae157d368e1c1065622f171dc3272170014e8594 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Fri, 27 Aug 2021 13:39:27 +0000 Subject: [PATCH] uncrustify: update to 0.73.0. By ericonr: fix tests. Closes: #32713 [via git-merge-pr] --- srcpkgs/uncrustify/patches/fix-test.patch | 17 +++++++++++++++++ srcpkgs/uncrustify/template | 8 ++------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/uncrustify/patches/fix-test.patch diff --git a/srcpkgs/uncrustify/patches/fix-test.patch b/srcpkgs/uncrustify/patches/fix-test.patch new file mode 100644 index 00000000000..4e43d6f9d54 --- /dev/null +++ b/srcpkgs/uncrustify/patches/fix-test.patch @@ -0,0 +1,17 @@ +https://github.com/uncrustify/uncrustify/issues/3196 + +diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py +index d835822..ea289ca 100755 +--- a/tests/cli/test_cli_options.py ++++ b/tests/cli/test_cli_options.py +@@ -705,8 +705,8 @@ def main(args): + # + # Test --tracking_space FILE + # +- if parsed_args.config == 'Release': +- eprint("Release") ++ if parsed_args.config == 'Release' or parsed_args.config == 'None': ++ eprint(parsed_args.config) + if not check_uncrustify_output( + uncr_bin, + parsed_args, diff --git a/srcpkgs/uncrustify/template b/srcpkgs/uncrustify/template index 66fa6c67ec9..6fc687b616c 100644 --- a/srcpkgs/uncrustify/template +++ b/srcpkgs/uncrustify/template @@ -1,6 +1,6 @@ # Template file for 'uncrustify' pkgname=uncrustify -version=0.72.0 +version=0.73.0 revision=1 wrksrc="$pkgname-$pkgname-$version" build_style=cmake @@ -10,11 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://uncrustify.sourceforge.net/" distfiles="https://github.com/uncrustify/uncrustify/archive/$pkgname-$version.tar.gz" -checksum=d6fff70bc7823fac4c77013055333b79a4839909094e8eee8a14ee8f1777374e - -do_check() { - make -C build test -} +checksum=2df0326ba8c413d675b796e051d89a318b7c9cccebc993d66466e2e7fd970672 post_install() { for f in etc/*cfg; do