Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/files/
Date: Thu, 01 Mar 2018 09:12:30
Message-Id: 1519895080.c180f5fff5e6a2ea5b8f1a536e9fd251e337516e.amynka@gentoo
1 commit: c180f5fff5e6a2ea5b8f1a536e9fd251e337516e
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 27 18:56:44 2018 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 1 09:04:40 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c180f5ff
7
8 net-wireless/gnuradio: remove unused patch
9
10 Closes:#7302
11
12 .../gnuradio-3.7.6.1-qwt-with-qt5-support.patch | 23 ----------------------
13 1 file changed, 23 deletions(-)
14
15 diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
16 deleted file mode 100644
17 index f155ed51db7..00000000000
18 --- a/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
19 +++ /dev/null
20 @@ -1,23 +0,0 @@
21 -From b3bdd301debb2eb859473a25b23d068fa66f6cb1 Mon Sep 17 00:00:00 2001
22 -From: Zero_Chaos <sidhayn@×××××.com>
23 -Date: Fri, 20 Feb 2015 15:54:00 -0500
24 -Subject: [PATCH] Update FindQwt.cmake to support qwt6-qt4
25 -
26 -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)
27 ----
28 - cmake/Modules/FindQwt.cmake | 2 +-
29 - 1 file changed, 1 insertion(+), 1 deletion(-)
30 -
31 -diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
32 -index 68f55bf..3ce49aa 100644
33 ---- a/cmake/Modules/FindQwt.cmake
34 -+++ b/cmake/Modules/FindQwt.cmake
35 -@@ -22,7 +22,7 @@ find_path(QWT_INCLUDE_DIRS
36 - )
37 -
38 - find_library (QWT_LIBRARIES
39 -- NAMES qwt6 qwt qwt-qt4
40 -+ NAMES qwt6 qwt6-qt4 qwt qwt-qt4
41 - HINTS
42 - ${CMAKE_INSTALL_PREFIX}/lib
43 - ${CMAKE_INSTALL_PREFIX}/lib64