From 300ad0f1c73938409bd65877515259de2a05aec50a6f03e91b86c01ce0af9a85 Mon Sep 17 00:00:00 2001 From: Wojciech Kazubski Date: Fri, 20 Sep 2019 11:58:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=51 --- ...nd-the-Qt5-version-of-QWT-instead-of.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch diff --git a/qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch b/qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch new file mode 100644 index 0000000..7ed6e95 --- /dev/null +++ b/qt5-maint-0002-CMake-FindQwt-Find-the-Qt5-version-of-QWT-instead-of.patch @@ -0,0 +1,40 @@ +From 25dedc0a2a7f0790f280770a7d22e9650ae2adbf Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Tue, 29 Sep 2015 13:30:59 +0200 +Subject: [PATCH 02/22] CMake: FindQwt: Find the Qt5 version of QWT instead of + the Qt4 version + +Signed-off-by: Paul Cercueil +--- + cmake/Modules/FindQwt.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake +index da8bbe9049..2cffbe66f4 100644 +--- a/cmake/Modules/FindQwt.cmake ++++ b/cmake/Modules/FindQwt.cmake +@@ -11,10 +11,10 @@ find_path(QWT_INCLUDE_DIRS + ${CMAKE_INSTALL_PREFIX}/include/qwt + ${CMAKE_PREFIX_PATH}/include/qwt + PATHS +- /usr/local/include/qwt-qt4 ++ /usr/local/include/qwt-qt5 + /usr/local/include/qwt + /usr/include/qwt6 +- /usr/include/qwt-qt4 ++ /usr/include/qwt-qt5 + /usr/include/qwt + /usr/include/qwt5 + /opt/local/include/qwt +@@ -23,7 +23,7 @@ find_path(QWT_INCLUDE_DIRS + ) + + find_library (QWT_LIBRARIES +- NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5 ++ NAMES qwt6 qwt6-qt5 qwt qwt-qt5 + HINTS + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 +-- +2.11.0 +