From 3913f798aaa8784fb525d4413fca4c194098d638 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 9 Jan 2019 00:16:20 +0100
Subject: [PATCH] libsigrok: enable C++ bindings.

---
 sci-libs/libsigrok/libsigrok-0.5.1.recipe     |  7 +++-
 .../patches/libsigrok-0.5.1.patchset          | 35 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.recipe b/sci-libs/libsigrok/libsigrok-0.5.1.recipe
index a7fc0a7de..11eb87cbb 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.recipe
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.recipe
@@ -12,7 +12,7 @@ different frontends.
 HOMEPAGE="https://sigrok.org"
 COPYRIGHT="2011-2018 sigrok contributors"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://sigrok.org/download/source/libsigrok/libsigrok-$portVersion.tar.gz"
 CHECKSUM_SHA256="e40fde7af98d29e922e9d3cbe0a6c0569889153fc31e47b8b1afe4d846292b9c"
 PATCHES="libsigrok-$portVersion.patchset"
@@ -44,9 +44,12 @@ BUILD_REQUIRES="
 	devel:libusb_1.0$secondaryArchSuffix
 	devel:libftdi1$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
+	devel:libglibmm$secondaryArchSuffix
 	devel:libzip$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
 	cmd:awk
 	cmd:cmp
 	cmd:doxygen
@@ -59,6 +62,8 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	export CFLAGS=-D_BSD_SOURCE
+	aclocal
+	autoconf
 	runConfigure ./configure
 	make $jobArgs
 }
diff --git a/sci-libs/libsigrok/patches/libsigrok-0.5.1.patchset b/sci-libs/libsigrok/patches/libsigrok-0.5.1.patchset
index 9e45cd649..aaf430d78 100644
--- a/sci-libs/libsigrok/patches/libsigrok-0.5.1.patchset
+++ b/sci-libs/libsigrok/patches/libsigrok-0.5.1.patchset
@@ -1,4 +1,4 @@
-From 926c49b5a4e8828a687b9812e913df789407fbba Mon Sep 17 00:00:00 2001
+From 3acd998db4e62f5cd3b5f64fb0e97876cafd3fb7 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 7 Jan 2019 23:19:59 +0100
 Subject: Build fixes
@@ -23,3 +23,36 @@ index 2150032..184f2e9 100644
 -- 
 2.19.1
 
+
+From 8d266d20038de61e460bde9f88399f830b6a8f61 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Wed, 9 Jan 2019 00:15:24 +0100
+Subject: Fix version of glibmm and remove broken windows specific thing
+
+
+diff --git a/configure.ac b/configure.ac
+index bb55ebc..eb53159 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -324,7 +324,7 @@ AS_IF([test "x$HAVE_CXX11" != x1],
+ 	[SR_APPEND([sr_cxx_missing], [', '], ['C++11'])])
+ 
+ # The C++ bindings need glibmm.
+-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0])
++SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.58 >= 2.57.1])
+ AS_IF([test "x$sr_have_glibmm" != xyes],
+ 	[SR_APPEND([sr_cxx_missing], [', '], [glibmm])])
+ 
+@@ -545,9 +545,6 @@ AC_CHECK_FUNCS([zip_discard])
+ LIBS=$sr_save_libs
+ CFLAGS=$sr_save_cflags
+ 
+-AM_COND_IF([NEED_USB], [AS_CASE([$sr_have_libusb_os_handle:$host_os], [no:mingw*],
+-	[AC_MSG_ERROR([Windows builds require the event-abstraction branch of libusb])])])
+-
+ sr_glib_version=`$PKG_CONFIG --modversion glib-2.0 2>&AS_MESSAGE_LOG_FD`
+ sr_libzip_version=`$PKG_CONFIG --modversion libzip 2>&AS_MESSAGE_LOG_FD`
+ 
+-- 
+2.19.1
+