gentoo resync : 28.04.2021

3 files changed, 32 insertions, 3 deletions

diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest
index 560c5dc1ea92..17fbde6ff0bc 100644
--- a/sci-electronics/pulseview/Manifest
+++ b/sci-electronics/pulseview/Manifest
@@ -1,5 +1,6 @@
+AUX pulseview-0.4.2-glib-2.68.patch 579 BLAKE2B 1feab8b80bbfd158bc445fe32e72327451791e461a4f85129f125cb3fb3d247f581a54c517f9b26c6493d4536e412c245805583a998fb44d3ee6f43904c34888 SHA512 a8fccfe78c6ba09687db9b26bdb7c28ba8912098d7b4b41c62afdcc312462159bfe6f5f6055171f0e38fb96c64ad09dce66ed509286bc268bd785f8025ff7403
 AUX pulseview-0.4.2-qt-5.15.patch 5193 BLAKE2B ea81ba54ca1a8b9d76d2e7751940d7b4e509adb75f903e5e85be49976106eefe1745908fe55d2aa206402494cd636879c71fe811e7dde874ebc40174ea8727cd SHA512 66c1e00f9470d4384bfa5dda2db7ada9d1e86cee2b2cd2a8517b44c1d6ee310d2f9a930033a7c93a30e006675c738b7cf75d6ee22ee09c7b8b52e831ca6571d0
 DIST pulseview-0.4.2.tar.gz 1399718 BLAKE2B ebbefefa55bb7ce9d1bbdfa8ea44d9536fa4f9ca9f6f13175a5bb6122dcb431ddad7c668e631128ca57fd2231021f8ce1c686fac9fa746ace24cf69ef3d71e71 SHA512 79f653c9faad021c03b59b4a519b594190d5558dfb9be60cabcc2a35e991e66b733b337fec58a9248699e7aef0df3be1472c81f93274b25cec1fc6b73f8f033b
-EBUILD pulseview-0.4.2.ebuild 1436 BLAKE2B 97966193ed92e5c68e10db72bba47a42dfa35ca6935cf02523f6be8ff07fa4bf2f67de0b75bc0ed36d6bd6eb8d071812f19ccebd3dd6ec29e26e00d1a4c09dff SHA512 1a780358d4e8c2e54a07b064ce30794db8f0cc503a5f76b80e565db3d75a7791190b4f75ab20235cc4f8a748cde6d9a80ce265de61356aa8783f18c6793080cb
+EBUILD pulseview-0.4.2.ebuild 1480 BLAKE2B ce2c73658a9772747c25a520f40951ec5405ae8e2b1b8efab67926bb17db5e8d6cd4852bd86edcea9dc6dc00dd960b2d9a691ceefabaf5822c74ac052fbe40f9 SHA512 e9f5fb99535b6609bfcfbefb2f765204cf7ac742cff191304eadf075b140ea4a78ff00816211df438e90a50d03eb3571ee323245a67fef75281d1efad7bfaffc
 EBUILD pulseview-9999.ebuild 1390 BLAKE2B 3e1fa66fef132374204fe13d384ff6eeae42ca432a5de102728ae3abb0d01b1e80bfc2771223bc8577a541369f12712cba5cae238671ad588fe6d463e61bc14b SHA512 0ecf135b896b6a9bca05253b473bf1f93fe7a362b8734ae9ac76b33c2fd77be7c566e820d37c38e8247dd7ee4de9e381a0c1bcc5db80cccd8f1ce3001f9875ca
 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 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