[gentoo-commits] repo/gentoo:master commit in: media-sound/qmidiroute/, media-sound/qmidiroute/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/qmidiroute/, media-sound/qmidiroute/files/

[Alexis Ballier]

commit:     c5a6e610e460d214909f72203e40f412855f973b
Author:     Karl Linden <karl.j.linden <AT> gmail <DOT> com>
AuthorDate: Sun Jul  2 06:45:36 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 10:05:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a6e610

media-sound/qmidiroute: Patch away unnecessary check for QtOpenGL.

Gentoo-Bug: 623414
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/qmidiroute-0.4.0-drop-qtopengl.patch      | 21 +++++++++++++++++++++
 media-sound/qmidiroute/qmidiroute-0.4.0.ebuild      |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/media-sound/qmidiroute/files/qmidiroute-0.4.0-drop-qtopengl.patch b/media-sound/qmidiroute/files/qmidiroute-0.4.0-drop-qtopengl.patch
new file mode 100644
index 00000000000..3dcd67b461a
--- /dev/null
+++ b/media-sound/qmidiroute/files/qmidiroute-0.4.0-drop-qtopengl.patch
@@ -0,0 +1,21 @@
+# Drop unused and silent dependency on QtOpenGL. Fixes #623414.
+--- qmidiroute-0.4.0.orig/configure.ac
++++ qmidiroute-0.4.0/configure.ac
+@@ -29,7 +29,7 @@
+   dnl Check needed because in some cases the QtGui includedir
+   dnl doesn't contain the subsystem dir.
+   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui`
+-  QT_CXXFLAGS=`$PKG_CONFIG --cflags QtCore QtGui QtOpenGL`
++  QT_CXXFLAGS=`$PKG_CONFIG --cflags QtCore QtGui`
+   EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
+   AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
+     AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
+@@ -58,7 +58,7 @@
+   dnl Check needed because in some cases the QtGui includedir
+   dnl doesn't contain the subsystem dir.
+   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt5Gui`
+-  QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets`
++  QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5Widgets`
+   QT_CXXFLAGS="$QT_CXXFLAGS -fPIC"
+   EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
+   AC_CHECK_FILE([$QT_INCLUDE_DIR/QtWidgets/QWidget],

diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
index 17a0a497f31..0cc6b834d2d 100644
--- a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
-inherit flag-o-matic multilib qmake-utils
+inherit autotools flag-o-matic multilib qmake-utils
 
 DESCRIPTION="QMidiRoute is a filter/router for MIDI events"
 HOMEPAGE="http://alsamodular.sourceforge.net"
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-drop-qtopengl.patch
+	eautoreconf
+}
+
 src_configure() {
 	append-cxxflags '-std=c++11'
 	export PATH="$(qt5_get_bindir):${PATH}"