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?= 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 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 . */ -extern "C" { #include -} #include #include 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 . */ -extern "C" { #include -} #include #include r>
path: root/gnu/packages/fribidi.scm
AgeCommit message (Expand)Author
2020-03-18Merge branch 'master' into core-updatesMarius Bakke
2020-03-15gnu: Add bidiv....* gnu/packages/fribidi.scm (bidiv): New variable. * gnu/packages/patches/bidiv-update-fribidi.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Efraim Flashner
2020-03-05gnu: fribidi: Update to 1.0.9....* gnu/packages/fribidi.scm (fribidi): Update to 1.0.9. [source](uri): Adjust tarball name. Marius Bakke
2020-01-08gnu: fribidi: Update to 1.0.8....* gnu/packages/patches/fribidi-CVE-2019-18397.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.8. Marius Bakke
2019-12-05gnu: fribidi: Remove defunct replacement....* gnu/packages/fribidi.scm (fribidi)[replacement]: Remove. (fribidi/fixed): Remove variable. Marius Bakke
2019-11-16Merge remote-tracking branch master into core-updatesMathieu Othacehe
2019-11-10gnu: fribidi: Update to 1.0.7....* gnu/packages/fribidi.scm (fribidi): Update to 1.0.7. Efraim Flashner
2019-11-10gnu: fribidi: Ungraft....* gnu/packages/fribidi.scm (fribidi)[replacement]: Remove field. [source]: Add patch. (fribidi/fixed): Remove variable. Efraim Flashner
2019-11-10gnu: fribidi: Fix CVE-2019-18397....* gnu/packages/fribidi.scm (fribidi): Replace with fribidi/fixed. (fribidi/fixed): New variable. * gnu/packages/patches/fribidi-CVE-2019-18397.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Efraim Flashner
2019-11-09gnu: fribidi: Fix CVE-2019-18397....* gnu/packages/fribidi.scm (fribidi): Replace with fribidi/fixed. (fribidi/fixed): New variable. * gnu/packages/patches/fribidi-CVE-2019-18397.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Efraim Flashner