diff options
author | David Seifert <soap@gentoo.org> | 2016-12-22 22:58:56 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2016-12-23 00:32:51 +0200 |
commit | 1842a17a0dacbcf414630b07b2e9a79bca455ddb (patch) | |
tree | 53903e638daccb9ac06ddb7f63a566357add138f /sci-mathematics/octave/files | |
parent | dev-java/jsr173: EAPI 6 bump and ebuild clean up. (diff) | |
download | gentoo-1842a17a0dacbcf414630b07b2e9a79bca455ddb.tar.gz gentoo-1842a17a0dacbcf414630b07b2e9a79bca455ddb.tar.bz2 gentoo-1842a17a0dacbcf414630b07b2e9a79bca455ddb.zip |
sci-mathematics/octave: Fix QScintilla detection for Qt5
Gentoo-bug: 600482
* Also bring back USE=gui flag
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-mathematics/octave/files')
-rw-r--r-- | sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch new file mode 100644 index 000000000000..9d18b6a6d7ce --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch @@ -0,0 +1,14 @@ +In Gentoo, QScintilla for Qt5 has the same library name +as its Qt4 variant. + +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -1327,7 +1327,7 @@ + ;; + 5) + QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" +- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" ++ octave_qscintilla_libnames=qscintilla2 + ;; + *) + AC_MSG_ERROR([Unrecognized Qt version $qt_version]) |