diff --git a/gnuradio-3.10.10.0.tar.gz b/gnuradio-3.10.10.0.tar.gz deleted file mode 100644 index 7efa1fe..0000000 --- a/gnuradio-3.10.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4202a486bee49ae97672acae559c133b1337e0e89f2d192332e4381d7c6682da -size 4648970 diff --git a/gnuradio-3.10.11.0.tar.gz b/gnuradio-3.10.11.0.tar.gz new file mode 100644 index 0000000..bb2e7c4 --- /dev/null +++ b/gnuradio-3.10.11.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29 +size 4659646 diff --git a/gnuradio-fix-error-message-for-Qwt-version.patch b/gnuradio-fix-error-message-for-Qwt-version.patch deleted file mode 100644 index 1fbdf26..0000000 --- a/gnuradio-fix-error-message-for-Qwt-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 8aca855..0000000 --- a/gnuradio-remove-maximum-version-for-Qwt.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 a93ed38..483f38c 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Thu Jul 25 12:22:27 UTC 2024 - Wojciech Kazubski + +- Update to version 3.10.11.0 +- Changed + * Project + + Const (keyword) cleanup in a large number of files. QtGUI + code uses const in many more places. + * Runtime + + Add persistent() function to gr paths module. This function + returns either the value of the XDG_CACHE_HOME environment + variable, or appdata()/.local/state. + * GRC + + Work continues on the Qt version of GRC (gnuradio-companion --qt). + While the Gtk version is still the default, we're getting + close to the point where the Qt version can be the default. + + Generated Python code now includes a startup event + (flowgraph_started) to the top level class. This was added + specifically to avoid a race in the Variable Function Probe + block, and may be useful elsewhere. + + Struct variables have not been usable since around v3.8. Fixed! + + Paths are now based on gr paths, where they were previous + hardcoded to the user's home directory. + + C++ hier block code paths fixed (so hier blocks work again). + + Block connection line shape and width are now preferences. + * gr-blocks + + New Burst To Stream block transforms a bursty tagged stream + into a continuous stream by inserting zeros in the output + between input packets whenever no packets are available at + the input. + * gr-digital + + FLL Band Edge power calculations fixed, along with thread + safety issues. + * gr-fec + + Unused RS code removed - unlikely anyone will notice. + * gr-filter + + Numpy float_ changed to float64 for Numpy 2.0 compatibility. + * gr-fft + + Vector version of FFT fft_v library function (calls fftw) + thread safety improved. + * gr-uhd + + Do not require PyQt5 for non-graphical configurations. + * modtool + + Many bug fixes and cleanups, resulting in more reliable + operation. That sounds really good, right? + + Remove dependency on the "click plugins" package. + + Appending new blocks to CMake files respects closing parens. + * Build system and packaging + + CMake minimum versions were out of sync in different places, + fixed. + + Incorrect Qwt maximum version removed. +- Last two patches gnuradio-fix-error-message-for-Qwt-version.patch + and gnuradio-remove-maximum-version-for-Qwt.patch removed as + appliedn upstream. +- Containd fix for latest spdlog (Tumbleweed). + ------------------------------------------------------------------- Sat May 11 21:54:03 UTC 2024 - Wojciech Kazubski diff --git a/gnuradio.spec b/gnuradio.spec index d2226e4..7c47e64 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,10 +16,10 @@ # -%define sover 3_10_10 +%define sover 3_10_11 %bcond_without docs Name: gnuradio -Version: 3.10.10.0 +Version: 3.10.11.0 Release: 0 Summary: GNU software radio License: GPL-3.0-or-later @@ -31,8 +31,6 @@ 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 @@ -182,8 +180,6 @@ 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' \;