diff --git a/gnuradio-fix-error-message-for-Qwt-version.patch b/gnuradio-fix-error-message-for-Qwt-version.patch new file mode 100644 index 0000000..1fbdf26 --- /dev/null +++ b/gnuradio-fix-error-message-for-Qwt-version.patch @@ -0,0 +1,23 @@ +From 9d6c8f166a4834bab33ea8619c71895e66fc757d Mon Sep 17 00:00:00 2001 +From: Jeff Long +Date: Fri, 10 May 2024 17:21:24 -0400 +Subject: [PATCH] cmake: fix error message for Qwt version + +Signed-off-by: Jeff Long +--- + 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 e87c6a20a9..241b255e58 100644 +--- a/cmake/Modules/FindQwt.cmake ++++ b/cmake/Modules/FindQwt.cmake +@@ -37,7 +37,7 @@ if(QWT_INCLUDE_DIRS) + if(NOT QWT_WRONG_VERSION) + set(QWT_FOUND TRUE) + else(NOT QWT_WRONG_VERSION) +- message(STATUS "QWT Version must be >= 6.1 and < 6.3, Found ${QWT_VERSION}") ++ message(STATUS "QWT Version must be >= 6.1, Found ${QWT_VERSION}") + endif(NOT QWT_WRONG_VERSION) + + endif(QWT_INCLUDE_DIRS) diff --git a/gnuradio-remove-maximum-version-for-Qwt.patch b/gnuradio-remove-maximum-version-for-Qwt.patch new file mode 100644 index 0000000..8aca855 --- /dev/null +++ b/gnuradio-remove-maximum-version-for-Qwt.patch @@ -0,0 +1,24 @@ +From ca344658756dab10a762571c51acf92c00c066c1 Mon Sep 17 00:00:00 2001 +From: Jeff Long +Date: Fri, 10 May 2024 06:21:08 -0400 +Subject: [PATCH] cmake: remove maximum version for Qwt (was < 6.3) + +Signed-off-by: Jeff Long +--- + cmake/Modules/FindQwt.cmake | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake +index 8718a6f73cc..e87c6a20a91 100644 +--- a/cmake/Modules/FindQwt.cmake ++++ b/cmake/Modules/FindQwt.cmake +@@ -32,9 +32,6 @@ if(QWT_INCLUDE_DIRS) + if(QWT_VERSION VERSION_LESS "6.1") + set(QWT_WRONG_VERSION True) + endif() +- if(NOT QWT_VERSION VERSION_LESS "6.3") +- set(QWT_WRONG_VERSION True) +- endif() + + message(STATUS "QWT Version: ${QWT_VERSION}") + if(NOT QWT_WRONG_VERSION) diff --git a/gnuradio.changes b/gnuradio.changes index 7d4b084..a93ed38 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat May 11 21:54:03 UTC 2024 - Wojciech Kazubski + +- Added a patches gnuradio-fix-error-message-for-Qwt-version.patch + and gnuradio-remove-maximum-version-for-Qwt.patch (taken from + upstream), fixing build with Qwt-6.3.0 + ------------------------------------------------------------------- Tue Apr 30 22:25:18 UTC 2024 - Mikhail Paulyshka diff --git a/gnuradio.spec b/gnuradio.spec index ccf01ec..d2226e4 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -31,6 +31,8 @@ Source4: grc_to_37.sh Source99: %{name}-rpmlintrc Patch0: missing_library.patch Patch1: gnuradio-not-install-freedesktop-files.patch +Patch2: gnuradio-fix-error-message-for-Qwt-version.patch +Patch3: gnuradio-remove-maximum-version-for-Qwt.patch BuildRequires: alsa-devel BuildRequires: cmake >= 3.16.3 BuildRequires: codec2-devel @@ -180,6 +182,8 @@ This package contains some examples of using GNU Radio. %setup -q %patch -P 0 -p1 %patch -P 1 -p1 -R +%patch -P 2 -p1 +%patch -P 3 -p1 # protect the template files from %%cmake macro magic / mangling find gr-utils/modtool/templates/gr-newmod -name CMakeLists.txt -ls -exec mv '{}' '{}.tmpl' \;