From 33de7ec4caa282cc4410c91368777ce6ddf3c696 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 7 Sep 2021 19:48:07 -0500 Subject: [PATCH 1/7] Rebuild for codec2 1.0. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 667952f..73f7806 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -194,6 +194,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Sep 08 2021 Richard Shaw - 3.9.2.0-6 +- Rebuild for codec2 1.0. + * Sat Aug 07 2021 Jonathan Wakely - 3.9.2.0-5 - Rebuilt for Boost 1.76 From 5ddc952e632932bdaab36d5f585f40d384e26e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Oct 2021 00:25:04 +0200 Subject: [PATCH 2/7] Fixed gnuradio-companion traceback on gtk init Resolves: rhbz#2014797 --- gnuradio-3.9.2.0-gtk-init.patch | 89 +++++++++++++++++++++++++++++++++ gnuradio.spec | 10 +++- 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 gnuradio-3.9.2.0-gtk-init.patch diff --git a/gnuradio-3.9.2.0-gtk-init.patch b/gnuradio-3.9.2.0-gtk-init.patch new file mode 100644 index 0000000..48866d6 --- /dev/null +++ b/gnuradio-3.9.2.0-gtk-init.patch @@ -0,0 +1,89 @@ +From 10edf66902f2926be1fa627a73b8cd6080973fc9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcus=20M=C3=BCller?= +Date: Tue, 19 Oct 2021 19:37:38 +0200 +Subject: [PATCH 1/2] GRC: don't rely on GUI to inform about failure to + initialize GUI +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Marcus Müller +--- + grc/scripts/gnuradio-companion | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion +index 1d4af86b4c0..dea54a9da29 100755 +--- a/grc/scripts/gnuradio-companion ++++ b/grc/scripts/gnuradio-companion +@@ -37,10 +37,16 @@ def die(error, message): + ) + d.set_title(type(error).__name__) + d.run() +- exit(1) ++ sys.exit(1) + except ImportError: +- exit(type(error).__name__ + '\n\n' + msg) +- ++ sys.exit(type(error).__name__ + '\n\n' + msg) ++ except Exception as _exception: ++ print( ++ "While trying to display an error message, another error occurred", ++ file=sys.stderr) ++ print(_exception, file=sys.stderr) ++ print("The original error message follows.", file=sys.stderr) ++ sys.exit(type(error).__name__ + '\n\n' + msg) + + def check_gtk(): + try: + +From 3094aa222ecb5890a50476edf53b7d191207a508 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcus=20M=C3=BCller?= +Date: Tue, 19 Oct 2021 19:49:14 +0200 +Subject: [PATCH 2/2] GRC: be tolerant against Gtk.init_check failure, which + seems to be flimsy +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Marcus Müller +--- + grc/scripts/gnuradio-companion | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion +index dea54a9da29..c1f523d02e3 100755 +--- a/grc/scripts/gnuradio-companion ++++ b/grc/scripts/gnuradio-companion +@@ -7,7 +7,6 @@ + + import os + import sys +-import warnings + + + GR_IMPORT_ERROR_MESSAGE = """\ +@@ -50,15 +49,20 @@ def die(error, message): + + def check_gtk(): + try: +- warnings.filterwarnings("error") + import gi + gi.require_version('Gtk', '3.0') + gi.require_version('PangoCairo', '1.0') + gi.require_foreign('cairo', 'Context') + + from gi.repository import Gtk +- Gtk.init_check() +- warnings.filterwarnings("always") ++ success = Gtk.init_check()[0] ++ if not success: ++ # Don't display a warning dialogue. This seems to be a Gtk bug. If it ++ # still can display warning dialogues, it does probably work! ++ print( ++ "Gtk init_check failed. GRC might not be able to start a GUI.", ++ file=sys.stderr) ++ + except Exception as err: + die(err, "Failed to initialize GTK. If you are running over ssh, " + "did you enable X forwarding and start ssh with -X?") diff --git a/gnuradio.spec b/gnuradio.spec index 73f7806..7d429bf 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -98,6 +98,8 @@ Requires: python3-six Requires: python3-mako Requires: python3-click-plugins Requires: gtk3 +# https://github.com/gnuradio/gnuradio/pull/5217 +Patch0: gnuradio-3.9.2.0-gtk-init.patch %description GNU Radio is a collection of software that when combined with minimal @@ -136,7 +138,7 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{?alphatag} +%autosetup -p1 -n %{name}-%{version}%{?alphatag} %build # this could be dropped when f32 get retired (not counting EPEL) @@ -194,6 +196,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Oct 19 2021 Jaroslav Škarvada - 3.9.2.0-7 +- Fixed gnuradio-companion traceback on gtk init + Resolves: rhbz#2014797 + * Wed Sep 08 2021 Richard Shaw - 3.9.2.0-6 - Rebuild for codec2 1.0. From 01809d088167c4389ad6b36a26b68476aa320172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Oct 2021 11:57:53 +0200 Subject: [PATCH 3/7] Synced gtk-init patch with the upstream Added requirement for the python3-qt5 Resolves: rhbz#2015642 --- gnuradio-3.9.2.0-gtk-init.patch | 21 +++++++++++++++------ gnuradio.spec | 8 +++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/gnuradio-3.9.2.0-gtk-init.patch b/gnuradio-3.9.2.0-gtk-init.patch index 48866d6..a0673a7 100644 --- a/gnuradio-3.9.2.0-gtk-init.patch +++ b/gnuradio-3.9.2.0-gtk-init.patch @@ -1,4 +1,4 @@ -From 10edf66902f2926be1fa627a73b8cd6080973fc9 Mon Sep 17 00:00:00 2001 +From 4de91e691fecb5abc3a842c9e25112de0db67e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Tue, 19 Oct 2021 19:37:38 +0200 Subject: [PATCH 1/2] GRC: don't rely on GUI to inform about failure to @@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Marcus Müller --- - grc/scripts/gnuradio-companion | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + grc/scripts/gnuradio-companion | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index 1d4af86b4c0..dea54a9da29 100755 +index 1d4af86b4c0..d0757e87eac 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -37,10 +37,16 @@ def die(error, message): @@ -36,8 +36,17 @@ index 1d4af86b4c0..dea54a9da29 100755 def check_gtk(): try: +@@ -82,7 +88,7 @@ def run_main(): + print("Running from source tree") + sys.path.insert(1, script_path[:-len(source_tree_subpath)]) + from grc.main import main +- exit(main()) ++ sys.exit(main()) + + + if __name__ == '__main__': -From 3094aa222ecb5890a50476edf53b7d191207a508 Mon Sep 17 00:00:00 2001 +From 5b43f4645b47f3ff862b1b645cfa6d0fb8f1e8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Tue, 19 Oct 2021 19:49:14 +0200 Subject: [PATCH 2/2] GRC: be tolerant against Gtk.init_check failure, which @@ -52,7 +61,7 @@ Signed-off-by: Marcus Müller 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index dea54a9da29..c1f523d02e3 100755 +index d0757e87eac..2f299744717 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -7,7 +7,6 @@ diff --git a/gnuradio.spec b/gnuradio.spec index 7d429bf..015e13c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Release: 8%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -97,6 +97,7 @@ Requires: python3-gobject Requires: python3-six Requires: python3-mako Requires: python3-click-plugins +Requires: python3-qt5 Requires: gtk3 # https://github.com/gnuradio/gnuradio/pull/5217 Patch0: gnuradio-3.9.2.0-gtk-init.patch @@ -196,6 +197,11 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Oct 20 2021 Jaroslav Škarvada - 3.9.2.0-8 +- Synced gtk-init patch with the upstream +- Added requirement for the python3-qt5 + Resolves: rhbz#2015642 + * Tue Oct 19 2021 Jaroslav Škarvada - 3.9.2.0-7 - Fixed gnuradio-companion traceback on gtk init Resolves: rhbz#2014797 From 16d443c04ee69bc3720cd24563f571b0b3848ce1 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 5 Dec 2021 12:35:12 -0600 Subject: [PATCH 4/7] Rebuild for codec2 1.0.1. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 015e13c..1959524 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 8%{?alphatag:.%{alphatag}}%{?dist} +Release: 9%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -197,6 +197,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sun Dec 05 2021 Richard Shaw - 3.9.2.0-9 +- Rebuild for codec2 1.0.1. + * Wed Oct 20 2021 Jaroslav Škarvada - 3.9.2.0-8 - Synced gtk-init patch with the upstream - Added requirement for the python3-qt5 From 3f05f9f2f315a062f39e448701b40ba633a1efb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 28 Jan 2022 01:24:07 +0100 Subject: [PATCH 5/7] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1959524..10d05cd 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 9%{?alphatag:.%{alphatag}}%{?dist} +Release: 10%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -197,6 +197,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Jan 28 2022 Jaroslav Škarvada - 3.9.2.0-10 +- Rebuilt for new uhd + * Sun Dec 05 2021 Richard Shaw - 3.9.2.0-9 - Rebuild for codec2 1.0.1. From 634fe8e1a43a148ac4af6b1135adb8e988e28187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 9 Mar 2022 10:50:23 +0100 Subject: [PATCH 6/7] New version Resolves: rhbz#2060675 --- gnuradio-3.9.2.0-gtk-init.patch | 98 --------------------------------- gnuradio.spec | 10 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 gnuradio-3.9.2.0-gtk-init.patch diff --git a/gnuradio-3.9.2.0-gtk-init.patch b/gnuradio-3.9.2.0-gtk-init.patch deleted file mode 100644 index a0673a7..0000000 --- a/gnuradio-3.9.2.0-gtk-init.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 4de91e691fecb5abc3a842c9e25112de0db67e26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Tue, 19 Oct 2021 19:37:38 +0200 -Subject: [PATCH 1/2] GRC: don't rely on GUI to inform about failure to - initialize GUI -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Marcus Müller ---- - grc/scripts/gnuradio-companion | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index 1d4af86b4c0..d0757e87eac 100755 ---- a/grc/scripts/gnuradio-companion -+++ b/grc/scripts/gnuradio-companion -@@ -37,10 +37,16 @@ def die(error, message): - ) - d.set_title(type(error).__name__) - d.run() -- exit(1) -+ sys.exit(1) - except ImportError: -- exit(type(error).__name__ + '\n\n' + msg) -- -+ sys.exit(type(error).__name__ + '\n\n' + msg) -+ except Exception as _exception: -+ print( -+ "While trying to display an error message, another error occurred", -+ file=sys.stderr) -+ print(_exception, file=sys.stderr) -+ print("The original error message follows.", file=sys.stderr) -+ sys.exit(type(error).__name__ + '\n\n' + msg) - - def check_gtk(): - try: -@@ -82,7 +88,7 @@ def run_main(): - print("Running from source tree") - sys.path.insert(1, script_path[:-len(source_tree_subpath)]) - from grc.main import main -- exit(main()) -+ sys.exit(main()) - - - if __name__ == '__main__': - -From 5b43f4645b47f3ff862b1b645cfa6d0fb8f1e8e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Tue, 19 Oct 2021 19:49:14 +0200 -Subject: [PATCH 2/2] GRC: be tolerant against Gtk.init_check failure, which - seems to be flimsy -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Marcus Müller ---- - grc/scripts/gnuradio-companion | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index d0757e87eac..2f299744717 100755 ---- a/grc/scripts/gnuradio-companion -+++ b/grc/scripts/gnuradio-companion -@@ -7,7 +7,6 @@ - - import os - import sys --import warnings - - - GR_IMPORT_ERROR_MESSAGE = """\ -@@ -50,15 +49,20 @@ def die(error, message): - - def check_gtk(): - try: -- warnings.filterwarnings("error") - import gi - gi.require_version('Gtk', '3.0') - gi.require_version('PangoCairo', '1.0') - gi.require_foreign('cairo', 'Context') - - from gi.repository import Gtk -- Gtk.init_check() -- warnings.filterwarnings("always") -+ success = Gtk.init_check()[0] -+ if not success: -+ # Don't display a warning dialogue. This seems to be a Gtk bug. If it -+ # still can display warning dialogues, it does probably work! -+ print( -+ "Gtk init_check failed. GRC might not be able to start a GUI.", -+ file=sys.stderr) -+ - except Exception as err: - die(err, "Failed to initialize GTK. If you are running over ssh, " - "did you enable X forwarding and start ssh with -X?") diff --git a/gnuradio.spec b/gnuradio.spec index 10d05cd..443ff22 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.9.2.0 -Release: 10%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.9.5.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -99,8 +99,6 @@ Requires: python3-mako Requires: python3-click-plugins Requires: python3-qt5 Requires: gtk3 -# https://github.com/gnuradio/gnuradio/pull/5217 -Patch0: gnuradio-3.9.2.0-gtk-init.patch %description GNU Radio is a collection of software that when combined with minimal @@ -197,6 +195,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Mar 9 2022 Jaroslav Škarvada - 3.9.5.0-1 +- New version + Resolves: rhbz#2060675 + * Fri Jan 28 2022 Jaroslav Škarvada - 3.9.2.0-10 - Rebuilt for new uhd diff --git a/sources b/sources index d9e4de7..35f1086 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.9.2.0.tar.gz) = 4687911740752bd233dec2cdd45d90297939af1580b186c5fd4c12e92f189e9aa4498cf89756042a65d77bbcdaa2619a207185838a7a54e49032061110af24fb +SHA512 (gnuradio-3.9.5.0.tar.gz) = d9ac76bb7673a809c75007feecd216703b8d7a225c8ad54273f3a5cbd4f77c0a6169d0ca75ead28e4c6ae177a666a8794676db7b94b1cec9e2c80af2d0e22e22 From ceb827ef4ec06a09548266abb6bb43ac464e2540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 9 Mar 2022 11:17:01 +0100 Subject: [PATCH 7/7] Added manual pages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnuradio.spec b/gnuradio.spec index 443ff22..d1b63de 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -171,6 +171,7 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/mime/packages/gnuradio-grc.xml %{_datadir}/icons/hicolor/*/apps/gnuradio-grc.png %{_datadir}/metainfo/org.gnuradio.grc.metainfo.xml +%{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/gnuradio %exclude %{_datadir}/gnuradio/examples %exclude %{_docdir}/%{name}/html