Accepting request 888983 from home:StefanBruens:branches:electronics

rebase patch

OBS-URL: https://build.opensuse.org/request/show/888983
OBS-URL: https://build.opensuse.org/package/show/electronics/pulseview?expand=0&rev=25

0001-Fix-broken-build-due-to-C-template-behind-C-linkage.patch

@@ -1,4 +1,4 @@
-From a0548140aa7a1d48642e638e31d5efa8a6677b84 Mon Sep 17 00:00:00 2001
+From fb89dd11f2a4a08b73c498869789e38677181a8d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
 Date: Wed, 28 Apr 2021 02:14:47 +0200
 Subject: [PATCH] Fix broken build due to C++ template behind C linkage
@@ -22,7 +22,7 @@ remove it from pulseviews include statements from the last two occasions.
  2 files changed, 4 deletions(-)
 
 diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
-index 7c720430..5954a2a5 100644
+index 7f233478..f8a5c47b 100644
 --- a/pv/data/decode/annotation.cpp
 +++ b/pv/data/decode/annotation.cpp
 @@ -17,9 +17,7 @@
@@ -36,7 +36,7 @@ index 7c720430..5954a2a5 100644
  #include <cassert>
  #include <vector>
 diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
-index 509e77f6..5c93d07d 100644
+index 409f1d28..888064d0 100644
 --- a/pv/views/trace/decodetrace.cpp
 +++ b/pv/views/trace/decodetrace.cpp
 @@ -17,9 +17,7 @@
@@ -47,8 +47,8 @@ index 509e77f6..5c93d07d 100644
  #include <libsigrokdecode/libsigrokdecode.h>
 -}
  
+ #include <limits>
  #include <mutex>
- 
 -- 
 2.31.1