Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pulseview for openSUSE:Factory checked in at 2021-04-29 01:37:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pulseview (Old) and /work/SRC/openSUSE:Factory/.pulseview.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseview" Thu Apr 29 01:37:45 2021 rev:12 rq:888984 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pulseview/pulseview.changes 2020-06-23 21:06:21.182183112 +0200 +++ /work/SRC/openSUSE:Factory/.pulseview.new.12324/pulseview.changes 2021-04-29 01:38:40.238601421 +0200 @@ -1,0 +2,6 @@ +Wed Apr 28 00:17:52 UTC 2021 - Stefan Br??ns <[email protected]> + +- Fix build with GLib 2.68, add + 0001-Fix-broken-build-due-to-C-template-behind-C-linkage.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-broken-build-due-to-C-template-behind-C-linkage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseview.spec ++++++ --- /var/tmp/diff_new_pack.00TTGM/_old 2021-04-29 01:38:40.650602005 +0200 +++ /var/tmp/diff_new_pack.00TTGM/_new 2021-04-29 01:38:40.650602005 +0200 @@ -1,7 +1,7 @@ # # spec file for package pulseview # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ Source0: https://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE Patch0: 0001-Fix-building-with-Qt-5.15.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-broken-build-due-to-C-template-behind-C-linkage.patch BuildRequires: cmake BuildRequires: glib2-devel BuildRequires: libboost_filesystem-devel @@ -49,8 +51,7 @@ PulseView is a Qt-based GUI for sigrok. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build export CXXFLAGS="%{optflags} -fpermissive" ++++++ 0001-Fix-broken-build-due-to-C-template-behind-C-linkage.patch ++++++ >From fb89dd11f2a4a08b73c498869789e38677181a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> 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> -- 2.31.1
