rpms
/
gnuradio
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synced gtk-init patch with the upstream 

Added requirement for the python3-qt5
  Resolves: rhbz#2015642
This commit is contained in:
Jaroslav Škarvada 2021-10-20 10:24:37 +02:00
parent fe9d16e6e6
commit 9e2bf4d150
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnuradio-3.9.3.0-gtk-init.patch
View File

@ -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?= <mmueller@gnuradio.org>
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 <mmueller@gnuradio.org>
---
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?= <mmueller@gnuradio.org>
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 <mmueller@gnuradio.org>
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 @@

8
gnuradio.spec
View File

@ -22,7 +22,7 @@
Name: gnuradio
Version: 3.9.3.0
Release: 2%{?alphatag:.%{alphatag}}%{?dist}
Release: 3%{?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.3.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 <jskarvad@redhat.com> - 3.9.3.0-3
- Synced gtk-init patch with the upstream
- Added requirement for the python3-qt5
Resolves: rhbz#2015642
* Tue Oct 19 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 3.9.3.0-2
- Fixed gnuradio-companion traceback on gtk init
Resolves: rhbz#2014797