Taken from upstream:
https://github.com/sigrokproject/pulseview/pull/39/commits/fb89dd11f2a4a08b73c498869789e38677181a8d.

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

glib/gatomic.h since 2.68 includes type_traits, which causes a compilation
error:
In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
                 from /usr/include/glib-2.0/glib/gthread.h:32,
                 from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
                 from /usr/include/glib-2.0/glib.h:32,
                 from /usr/include/libsigrokdecode/libsigrokdecode.h:25,
                 from /home/abuild/rpmbuild/BUILD/pulseview-0.4.2/pv/data/decode/annotation.cpp:21:
/usr/include/c++/10/type_traits:2308:3: error: template with C linkage
2308 |   template<typename _CTp, typename _Rp>

As libsigrokdecode.h declares extern C linkage itself where necessary,
remove it from pulseviews include statements from the last two occasions.
---
 pv/data/decode/annotation.cpp  | 2 --
 pv/views/trace/decodetrace.cpp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 7f233478..f8a5c47b 100644
--- a/pv/data/decode/annotation.cpp
+++ b/pv/data/decode/annotation.cpp
@@ -17,9 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
-}
 
 #include <cassert>
 #include <vector>
diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 409f1d28..888064d0 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -17,9 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
-}
 
 #include <limits>
 #include <mutex>
='path'>path: <a href='/guix/log/?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>root</a>/<a href='/guix/log/gnu?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>gnu</a>/<a href='/guix/log/gnu/packages?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>packages</a>/<a href='/guix/log/gnu/packages/upnp.scm?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>upnp.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/upnp.scm?id=4f013b8c8201452aac69221e2bc2f981c9c5026d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-05-13 00:32:22 +0200'>2021-05-13</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=103c38b7987dd65be36393f8bae167d8f524b402'>gnu: libupnp: Update to 1.14.7.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (libupnp): Update to 1.14.7.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-05-02 03:00:03 +0200'>2021-05-02</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=9c44af6bd67579ef0d916ecf23fe832c9d17802f'>gnu: Replace hard-coded "CC=gcc" with CC-FOR-TARGET calls.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/admin.scm (cbatticon)[arguments]&lt;#:make-flags&gt;: Use
CC-FOR-TARGET.
* gnu/packages/assembly.scm (dev86)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/cdrom.scm (cd-discid)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/crypto.scm (signify, keyutils, ssss, libscrypt, enchive)
[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/emacs-xyz.scm (emacs-emacsql, emacs-telega)[arguments]
&lt;#:phases&gt;: Likewise.
* gnu/packages/gnupg.scm (pgpdump)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/image-viewers.scm (feh, imv)[arguments]&lt;#:make-flags&gt;:
Likewise.
* gnu/packages/image.scm (libjxr, giflib, freeimage)[arguments]
&lt;#:make-flags&gt;: Likewise.
* gnu/packages/irc.scm (ii, sic)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/lua.scm (make-lua-expat, make-lua-ossl, make-lua-sec)
(make-lua-cqueues, make-lua-lgi, lua-resty-signal)[arguments]
&lt;#:make-flags&gt;: Likewise.
* gnu/packages/networking.scm (httping, pixiewps, sslh, nethogs, spiped)
(can-utils, hcxtools, batctl)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/pdf.scm (fbida)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/ssh.scm (endlessh)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/toys.scm (nyancat)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/upnp.scm (miniupnpc)[arguments]&lt;#:make-flags&gt;: Likewise.
* gnu/packages/xdisorg.scm (bemenu, xbanish, sxhkd, xcape, xssproxy)
(xrandr-invert-colors, hsetroot, xsettingsd)[arguments]&lt;#:make-flags&gt;:
Likewise.

Signed-off-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2021-04-22 15:02:51 +0200'>2021-04-22</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=78fb1dbca21ecf2ee3084f89d0b7ddb2e615a3a3'>gnu: libupnp: Update to 1.14.6.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (libupnp): Update to 1.14.6.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-04-07 21:38:21 +0200'>2021-04-07</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=2b605ef3b145ec136530f08ee7aa27382aa64b46'>gnu: libupnp: Update to 1.14.5 [fixes CVE-2021-28302].</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (libupnp): Update to 1.14.5.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>