1 |
commit: c5a6e610e460d214909f72203e40f412855f973b |
2 |
Author: Karl Linden <karl.j.linden <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jul 2 06:45:36 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 2 10:05:31 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a6e610 |
7 |
|
8 |
media-sound/qmidiroute: Patch away unnecessary check for QtOpenGL. |
9 |
|
10 |
Gentoo-Bug: 623414 |
11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
12 |
|
13 |
.../files/qmidiroute-0.4.0-drop-qtopengl.patch | 21 +++++++++++++++++++++ |
14 |
media-sound/qmidiroute/qmidiroute-0.4.0.ebuild | 7 ++++++- |
15 |
2 files changed, 27 insertions(+), 1 deletion(-) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..3dcd67b461a |
20 |
--- /dev/null |
21 |
+++ b/media-sound/qmidiroute/files/qmidiroute-0.4.0-drop-qtopengl.patch |
22 |
@@ -0,0 +1,21 @@ |
23 |
+# Drop unused and silent dependency on QtOpenGL. Fixes #623414. |
24 |
+--- qmidiroute-0.4.0.orig/configure.ac |
25 |
++++ qmidiroute-0.4.0/configure.ac |
26 |
+@@ -29,7 +29,7 @@ |
27 |
+ dnl Check needed because in some cases the QtGui includedir |
28 |
+ dnl doesn't contain the subsystem dir. |
29 |
+ QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui` |
30 |
+- QT_CXXFLAGS=`$PKG_CONFIG --cflags QtCore QtGui QtOpenGL` |
31 |
++ QT_CXXFLAGS=`$PKG_CONFIG --cflags QtCore QtGui` |
32 |
+ EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt" |
33 |
+ AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget], |
34 |
+ AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]), |
35 |
+@@ -58,7 +58,7 @@ |
36 |
+ dnl Check needed because in some cases the QtGui includedir |
37 |
+ dnl doesn't contain the subsystem dir. |
38 |
+ QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt5Gui` |
39 |
+- QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets` |
40 |
++ QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5Widgets` |
41 |
+ QT_CXXFLAGS="$QT_CXXFLAGS -fPIC" |
42 |
+ EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt" |
43 |
+ AC_CHECK_FILE([$QT_INCLUDE_DIR/QtWidgets/QWidget], |
44 |
|
45 |
diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild |
46 |
index 17a0a497f31..0cc6b834d2d 100644 |
47 |
--- a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild |
48 |
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild |
49 |
@@ -2,7 +2,7 @@ |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
EAPI=2 |
53 |
-inherit flag-o-matic multilib qmake-utils |
54 |
+inherit autotools flag-o-matic multilib qmake-utils |
55 |
|
56 |
DESCRIPTION="QMidiRoute is a filter/router for MIDI events" |
57 |
HOMEPAGE="http://alsamodular.sourceforge.net" |
58 |
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND} |
59 |
dev-qt/linguist-tools:5 |
60 |
virtual/pkgconfig" |
61 |
|
62 |
+src_prepare() { |
63 |
+ epatch "${FILESDIR}"/${P}-drop-qtopengl.patch |
64 |
+ eautoreconf |
65 |
+} |
66 |
+ |
67 |
src_configure() { |
68 |
append-cxxflags '-std=c++11' |
69 |
export PATH="$(qt5_get_bindir):${PATH}" |