diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2022-01-20 14:19:22 +0100 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2022-01-20 14:20:13 +0100 |
commit | 12aeeea4c4d51a9ffe699cc8205d0f4213b484c1 (patch) | |
tree | 6e302b7cbc676dd509ec250d42384530da09b32b /gnu/packages/patches/pulseview-glib-2.68.patch | |
parent | 5e2804b0238cdb9ec98638e00101018c52725e82 (diff) | |
download | guix-patches-12aeeea4c4d51a9ffe699cc8205d0f4213b484c1.tar guix-patches-12aeeea4c4d51a9ffe699cc8205d0f4213b484c1.tar.gz |
gnu: pulseview: Fix build
* gnu/packages/patches/pulseview-glib-2.68.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/electronics.scm (pulseview): Register it. Also disable the
tests which are failing and remove a trailing #t.
Diffstat (limited to 'gnu/packages/patches/pulseview-glib-2.68.patch')
-rw-r--r-- | gnu/packages/patches/pulseview-glib-2.68.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/gnu/packages/patches/pulseview-glib-2.68.patch b/gnu/packages/patches/pulseview-glib-2.68.patch new file mode 100644 index 0000000000..bb49b3656f --- /dev/null +++ b/gnu/packages/patches/pulseview-glib-2.68.patch @@ -0,0 +1,54 @@ +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> |