diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-13 23:50:15 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-14 00:27:27 +0000 |
| commit | 03469ef10c4f447414991a38786f0a537bd2188d (patch) | |
| tree | 5d32d496b43ac16ea3ee3b0786059f9c30a090e9 /sci-electronics/pulseview | |
| parent | net-analyzer/nagtrap: fix installation of config, ${D} usage (diff) | |
| download | gentoo-03469ef10c4f447414991a38786f0a537bd2188d.tar.gz gentoo-03469ef10c4f447414991a38786f0a537bd2188d.tar.bz2 gentoo-03469ef10c4f447414991a38786f0a537bd2188d.zip | |
sci-electronics/pulseview: fix build with glib 2.68
Closes: https://bugs.gentoo.org/777660
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-electronics/pulseview')
| -rw-r--r-- | sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch | 25 | ||||
| -rw-r--r-- | sci-electronics/pulseview/pulseview-0.4.2.ebuild | 7 |
2 files changed, 30 insertions, 2 deletions
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 000000000000..1353f637928b --- /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 <http://www.gnu.org/licenses/>. + */ + +-extern "C" { + #include <libsigrokdecode/libsigrokdecode.h> +-} + + #include <cassert> + #include <vector> +--- 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> diff --git a/sci-electronics/pulseview/pulseview-0.4.2.ebuild b/sci-electronics/pulseview/pulseview-0.4.2.ebuild index 859c5e0e1746..e96be770c575 100644 --- a/sci-electronics/pulseview/pulseview-0.4.2.ebuild +++ b/sci-electronics/pulseview/pulseview-0.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,7 +45,10 @@ DEPEND="${RDEPEND}" DOCS=( HACKING NEWS README ) -PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) +PATCHES=( + "${FILESDIR}/${P}-qt-5.15.patch" + "${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch +) pkg_setup() { use decode && python_setup |