[arch-commits] Commit in pulseview/repos (3 files)

[Felix Yan]

    Date: Tuesday, June 8, 2021 @ 18:40:41
  Author: felixonmars
Revision: 959852

archrelease: copy trunk to community-staging-x86_64

Added:
  pulseview/repos/community-staging-x86_64/
  pulseview/repos/community-staging-x86_64/PKGBUILD
    (from rev 959851, pulseview/trunk/PKGBUILD)
  pulseview/repos/community-staging-x86_64/glib-2.68.patch
    (from rev 959851, pulseview/trunk/glib-2.68.patch)

-----------------+
 PKGBUILD        |   45 +++++++++++++++++++++++++++++++++++++++++++++
 glib-2.68.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

Copied: pulseview/repos/community-staging-x86_64/PKGBUILD (from rev 959851, pulseview/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2021-06-08 18:40:41 UTC (rev 959852)
@@ -0,0 +1,45 @@
+# Maintainer: Anatol Pomozov
+# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
+# Contributor: Thomas Krug <t.krug at elektronenpumpe.de>
+
+pkgname=pulseview
+pkgver=0.4.2
+pkgrel=5
+pkgdesc='A Qt based logic analyzer GUI for sigrok'
+arch=('x86_64')
+url='https://sigrok.org/wiki/Main_Page'
+license=('GPL3')
+depends=('libsigrok' 'libsigrokdecode' 'qt5-base' 'qt5-svg' 'boost-libs')
+makedepends=('cmake' 'boost' 'qt5-tools')
+source=("https://sigrok.org/download/source/pulseview/pulseview-$pkgver.tar.gz"
+        "qt5.15.patch::https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch"
+        glib-2.68.patch)
+sha512sums=('79f653c9faad021c03b59b4a519b594190d5558dfb9be60cabcc2a35e991e66b733b337fec58a9248699e7aef0df3be1472c81f93274b25cec1fc6b73f8f033b'
+            'e115c29151474d5dc905042ee699542abdcc9db523d45595cf0386f0efb9523b292536972074536cb330ede90b41e1edd591888bceb5155b49657937f87e9087'
+            'b48b0ff4cc962a252cb8e1c21f9b0661d33399d99dae2fd7d0bb87da8c0e16cba66b4a8c1797dbb53dfa83eb7050b0248024aa013edaecf40183bad39d10e243')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -p1 < ../qt5.15.patch
+
+  # https://github.com/sigrokproject/pulseview/pull/39
+  patch -p1 < ../glib-2.68.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  cmake . \
+  	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+  	-DCMAKE_CXX_FLAGS=-fext-numeric-literals \
+  	-DDISABLE_WERROR=ON -DENABLE_TESTS=OFF
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+}

Copied: pulseview/repos/community-staging-x86_64/glib-2.68.patch (from rev 959851, pulseview/trunk/glib-2.68.patch)
===================================================================
--- community-staging-x86_64/glib-2.68.patch	                        (rev 0)
+++ community-staging-x86_64/glib-2.68.patch	2021-06-08 18:40:41 UTC (rev 959852)
@@ -0,0 +1,51 @@
+From fb89dd11f2a4a08b73c498869789e38677181a8d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens at 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>