From d8b47281bd91f12eed7cb0e8f3c16cb9ff835bec Mon Sep 17 00:00:00 2001 From: layman Date: Tue, 25 May 2021 23:07:01 +0200 Subject: [PATCH] Pulseview bugfix --- sci-electronics/pulseview/Manifest | 3 + .../files/pulseview-0.4.2-glib-2.68.patch | 25 ++++++ sci-electronics/pulseview/metadata.xml | 11 +++ .../pulseview/pulseview-9999.ebuild | 78 +++++++++++++++++++ 4 files changed, 117 insertions(+) create mode 100644 sci-electronics/pulseview/Manifest create mode 100644 sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch create mode 100644 sci-electronics/pulseview/metadata.xml create mode 100644 sci-electronics/pulseview/pulseview-9999.ebuild diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest new file mode 100644 index 0000000..326e228 --- /dev/null +++ b/sci-electronics/pulseview/Manifest @@ -0,0 +1,3 @@ +AUX pulseview-0.4.2-glib-2.68.patch 579 BLAKE2B 1feab8b80bbfd158bc445fe32e72327451791e461a4f85129f125cb3fb3d247f581a54c517f9b26c6493d4536e412c245805583a998fb44d3ee6f43904c34888 SHA512 a8fccfe78c6ba09687db9b26bdb7c28ba8912098d7b4b41c62afdcc312462159bfe6f5f6055171f0e38fb96c64ad09dce66ed509286bc268bd785f8025ff7403 +EBUILD pulseview-9999.ebuild 1453 BLAKE2B abe7dba6590636908bd8296bb5a9b30680cc7b96abec908fd7733b3991a4f4e998ae89338915051db07c747b1a6420ce1836608f2e0cf97a54eaa6729dfe3cd6 SHA512 73e16a7e85bdbfeae2f4cac156898d7beac0b303f124affe6f0662c6862162cd939623aedb316412e91f0085edc566fe9e66fa495e1fbb7b34abe8f823c2e417 +MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd diff --git a/sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch b/sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch new file mode 100644 index 0000000..1353f63 --- /dev/null +++ b/sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/777660 +--- 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 +--- 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 diff --git a/sci-electronics/pulseview/metadata.xml b/sci-electronics/pulseview/metadata.xml new file mode 100644 index 0000000..ab921d7 --- /dev/null +++ b/sci-electronics/pulseview/metadata.xml @@ -0,0 +1,11 @@ + + + + + embedded@gentoo.org + Embedded Gentoo + + + Enable decoding of protocols while capturing + + diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild new file mode 100644 index 0000000..20ea92e --- /dev/null +++ b/sci-electronics/pulseview/pulseview-9999.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit cmake python-single-r1 xdg-utils + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://sigrok.org/${PN}" + inherit git-r3 +else + SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Qt based logic analyzer GUI for sigrok" +HOMEPAGE="https://sigrok.org/wiki/PulseView" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+decode static" +REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + >=dev-cpp/glibmm-2.28.0:2 + >=dev-libs/boost-1.55:= + >=dev-libs/glib-2.28.0:2 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + >=sci-libs/libsigrok-0.6.0:=[cxx] + decode? ( + ${PYTHON_DEPS} + >=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}] + ) +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING NEWS README ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch +) + +pkg_setup() { + use decode && python_setup +} + +src_prepare() { + cmake_src_prepare + cmake_comment_add_subdirectory manual +} + +src_configure() { + local mycmakeargs=( + -DDISABLE_WERROR=TRUE + -DENABLE_DECODE=$(usex decode) + -DSTATIC_PKGDEPS_LIBS=$(usex static) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +}