[neon/neon-packaging/dbc-parser-cpp/Neon/unstable] debian/patches: add patches needed by labplot

Carlos De Maine null at kde.org
Sat Apr 1 03:12:42 BST 2023


Git commit cd18e0eb77481ace827dcfad19f449601eca59a3 by Carlos De Maine.
Committed on 01/04/2023 at 02:12.
Pushed by carlosdem into branch 'Neon/unstable'.

add patches needed by labplot

A  +49   -0    debian/patches/0001_labplot_patches
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/neon-packaging/dbc-parser-cpp/commit/cd18e0eb77481ace827dcfad19f449601eca59a3

diff --git a/debian/patches/0001_labplot_patches b/debian/patches/0001_labplot_patches
new file mode 100644
index 0000000..c7a8a75
--- /dev/null
+++ b/debian/patches/0001_labplot_patches
@@ -0,0 +1,49 @@
+From 120ba2b46149ea6f8ea3b9f87adbd65d84e65de3 Mon Sep 17 00:00:00 2001
+From: Martin Marmsoler <martin.marmsoler at gmail.com>
+Date: Fri, 6 Jan 2023 09:50:48 +0100
+Subject: [PATCH 1/2] value can be negative example:  SG_ Signal : 16|11 at 1+
+ (0.1,-102) [-102|102] "%"  DEVICE
+
+---
+ src/dbc.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dbc.cpp b/src/dbc.cpp
+index c92cc3e..c1ea0f4 100644
+--- a/src/dbc.cpp
++++ b/src/dbc.cpp
+@@ -11,7 +11,7 @@ namespace libdbc {
+ 				name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)"),
+ 				message_re("^(BO_)\\s(\\d+)\\s(\\w+)\\:\\s(\\d+)\\s(\\w+|Vector__XXX)"),
+ 				// NOTE: No multiplex support yet
+-				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((\\d+\\.?(\\d+)?)\\,(\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
++				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
+ 
+ 	}
+ 
+
+From 076057bffe6e5da4748467d97fc7e353f93376c2 Mon Sep 17 00:00:00 2001
+From: Martin Marmsoler <martin.marmsoler at gmail.com>
+Date: Fri, 6 Jan 2023 10:01:10 +0100
+Subject: [PATCH 2/2] - signals can also contain special characters: SG_ Speed
+ : 0|8 at 1+ (1,0) [0|204] "Km/h"  DEVICE1,DEVICE2,DEVICE3 - multiple whitespaces
+ at the end:  SG_ TEMPERATURE : 48|16 at 1+ (0.01,-40) [-40|125] "C" 
+ DEVICE1,DEVICE2,DEVICE3
+
+---
+ src/dbc.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dbc.cpp b/src/dbc.cpp
+index c1ea0f4..24bfad7 100644
+--- a/src/dbc.cpp
++++ b/src/dbc.cpp
+@@ -11,7 +11,7 @@ namespace libdbc {
+ 				name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)"),
+ 				message_re("^(BO_)\\s(\\d+)\\s(\\w+)\\:\\s(\\d+)\\s(\\w+|Vector__XXX)"),
+ 				// NOTE: No multiplex support yet
+-				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
++				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(.*)\"\\s+([\\w\\,]+|Vector__XXX)*") {
+ 
+ 	}
+ 
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2771d7c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_labplot_patches


More information about the Neon-commits mailing list