pulseview/repos/community-x86_64/glib-2.68.patch

   1 From fb89dd11f2a4a08b73c498869789e38677181a8d Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
   3 Date: Wed, 28 Apr 2021 02:14:47 +0200
   4 Subject: [PATCH] Fix broken build due to C++ template behind C linkage
   5
   6 glib/gatomic.h since 2.68 includes type_traits, which causes a compilation
   7 error:
   8 In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
   9                  from /usr/include/glib-2.0/glib/gthread.h:32,
  10                  from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
  11                  from /usr/include/glib-2.0/glib.h:32,
  12                  from /usr/include/libsigrokdecode/libsigrokdecode.h:25,
  13                  from /home/abuild/rpmbuild/BUILD/pulseview-0.4.2/pv/data/decode/annotation.cpp:21:
  14 /usr/include/c++/10/type_traits:2308:3: error: template with C linkage
  15 2308 |   template<typename _CTp, typename _Rp>
  16
  17 As libsigrokdecode.h declares extern C linkage itself where necessary,
  18 remove it from pulseviews include statements from the last two occasions.
  19 ---
  20  pv/data/decode/annotation.cpp  | 2 --
  21  pv/views/trace/decodetrace.cpp | 2 --
  22  2 files changed, 4 deletions(-)
  23
  24 diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
  25 index 7f233478..f8a5c47b 100644
  26 --- a/pv/data/decode/annotation.cpp
  27 +++ b/pv/data/decode/annotation.cpp
  28 @@ -17,9 +17,7 @@
  29   * along with this program; if not, see <http://www.gnu.org/licenses/>.
  30   */
  31
  32 -extern "C" {
  33  #include <libsigrokdecode/libsigrokdecode.h>
  34 -}
  35
  36  #include <cassert>
  37  #include <vector>
  38 diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
  39 index 409f1d28..888064d0 100644
  40 --- a/pv/views/trace/decodetrace.cpp
  41 +++ b/pv/views/trace/decodetrace.cpp
  42 @@ -17,9 +17,7 @@
  43   * along with this program; if not, see <http://www.gnu.org/licenses/>.
  44   */
  45
  46 -extern "C" {
  47  #include <libsigrokdecode/libsigrokdecode.h>
  48 -}
  49
  50  #include <limits>
  51  #include <mutex>