summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-12-23 11:41:39 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-12-23 11:41:39 +0900
commit69a1eb8293621d13651d3de57e00be4574e326f8 (patch)
tree2a4135b7586f59014bac934882036ac2cd3a5b55
parent008bc84f7535dd48412dfc660281677c5ac392d2 (diff)
downloadextra-dependencies-69a1eb82.tar.gz
extra-dependencies-69a1eb82.zip
DEB uncrustify-trinity: backported commit 64d93e3fb from upstream git
repository. This fixes a problem with the max level of braces that can be handled. Upstream commit message: ----------------------------------------------------------- Author: Guy Maurel <guy.j@maurel.de> Date: Thu Nov 12 18:27:38 2020 +0100 look for a debug loop M src/align_func_proto.cpp M src/logger.cpp ----------------------------------------------------------- Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff25
-rw-r--r--debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series1
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff
new file mode 100644
index 00000000..ca26d397
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff
@@ -0,0 +1,25 @@
+Backported commit 64d93e3fb from upstream git repository.
+--- a/src/align_func_proto.cpp
++++ b/src/align_func_proto.cpp
+@@ -47,8 +47,8 @@
+ log_rule_B("align_var_def_amp_style");
+ size_t myamp_style = options::align_var_def_amp_style();
+
+- const size_t max_level_count = 8;
+- const size_t max_brace_level = 8;
++ const size_t max_level_count = 16;
++ const size_t max_brace_level = 16;
+
+ AlignStack many_as[max_level_count + 1][max_brace_level + 1];
+
+--- a/src/logger.cpp
++++ b/src/logger.cpp
+@@ -194,7 +194,7 @@
+ return;
+ }
+ // the value of buffer_length is experimental
+- const int buffer_length = 4100;
++ const int buffer_length = 40000;
+ char buf[buffer_length];
+
+ // it MUST be a 'unsigned int' variable to be runable under windows
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series
index de7beae0..1cf3e23a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series
@@ -3,3 +3,4 @@
003_allow_older_distributions.diff
004_fixed_usage.diff
005_upstream_45681e88.diff
+006_upstream_64d93e3fb.diff