zerochaos 15/02/21 04:18:42 Added: gnuradio-3.7.6.1-qwt-with-qt5-support.patch Log: proper full fix for bug #540658, backporting patch accepted by upstream (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path 1.1 net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch?rev=1.1&content-type=text/plain Index: gnuradio-3.7.6.1-qwt-with-qt5-support.patch =================================================================== >From b3bdd301debb2eb859473a25b23d068fa66f6cb1 Mon Sep 17 00:00:00 2001 From: Zero_Chaos <[email protected]> Date: Fri, 20 Feb 2015 15:54:00 -0500 Subject: [PATCH] Update FindQwt.cmake to support qwt6-qt4 allow finding qwt6-qt4 library. Some distros have added support for both qt4 and qt5 in qwt6, the common name the library uses appears to be qwt6-qt4. The pre-existance of the qwt-qt4 entry suggests this naming convention is reasonably standard (or at least this isn't a unique hack) --- cmake/Modules/FindQwt.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 68f55bf..3ce49aa 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -22,7 +22,7 @@ find_path(QWT_INCLUDE_DIRS ) find_library (QWT_LIBRARIES - NAMES qwt6 qwt qwt-qt4 + NAMES qwt6 qwt6-qt4 qwt qwt-qt4 HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64
