Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnuradio for openSUSE:Factory
checked in at 2024-05-15 21:26:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuradio (Old)
and /work/SRC/openSUSE:Factory/.gnuradio.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuradio"
Wed May 15 21:26:24 2024 rev:71 rq:1173967 version:3.10.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuradio/gnuradio.changes 2024-05-06
17:53:28.627575253 +0200
+++ /work/SRC/openSUSE:Factory/.gnuradio.new.1880/gnuradio.changes
2024-05-15 21:26:57.542378896 +0200
@@ -1,0 +2,7 @@
+Sat May 11 21:54:03 UTC 2024 - Wojciech Kazubski <w...@ire.pw.edu.pl>
+
+- 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
+
+-------------------------------------------------------------------
New:
----
gnuradio-fix-error-message-for-Qwt-version.patch
gnuradio-remove-maximum-version-for-Qwt.patch
BETA DEBUG BEGIN:
New:
- Added a patches gnuradio-fix-error-message-for-Qwt-version.patch
and gnuradio-remove-maximum-version-for-Qwt.patch (taken from
New:- 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
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuradio.spec ++++++
--- /var/tmp/diff_new_pack.FBPv3n/_old 2024-05-15 21:26:58.114399600 +0200
+++ /var/tmp/diff_new_pack.FBPv3n/_new 2024-05-15 21:26:58.114399600 +0200
@@ -31,6 +31,8 @@
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 @@
%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' \;
++++++ gnuradio-fix-error-message-for-Qwt-version.patch ++++++
>From 9d6c8f166a4834bab33ea8619c71895e66fc757d Mon Sep 17 00:00:00 2001
From: Jeff Long <willco...@gmail.com>
Date: Fri, 10 May 2024 17:21:24 -0400
Subject: [PATCH] cmake: fix error message for Qwt version
Signed-off-by: Jeff Long <willco...@gmail.com>
---
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)
++++++ gnuradio-remove-maximum-version-for-Qwt.patch ++++++
>From ca344658756dab10a762571c51acf92c00c066c1 Mon Sep 17 00:00:00 2001
From: Jeff Long <willco...@gmail.com>
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 <willco...@gmail.com>
---
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)
