gnuradio-qtgui: catch up w/ gnuradio-core

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 13:26:07 2020 +0200
Changeset:	c6d30544579216937682cfe692e601c526e4b0d0

Modified Files:
	gnuradio-qtgui/Makefile
	gnuradio-qtgui/PLIST

Log Message:
gnuradio-qtgui: catch up w/ gnuradio-core

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c6d30544579216937682cfe692e601c526e4b0d0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnuradio-qtgui/Makefile | 13 +++----
 gnuradio-qtgui/PLIST    | 96 +++++++++++++------------------------------------
 2 files changed, 31 insertions(+), 78 deletions(-)

diffs:
diff --git a/gnuradio-qtgui/Makefile b/gnuradio-qtgui/Makefile
index 12f06f7ae3..d149703958 100644
--- a/gnuradio-qtgui/Makefile
+++ b/gnuradio-qtgui/Makefile
@@ -1,19 +1,20 @@
 # $NetBSD: Makefile,v 1.23 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-qtgui-${VERSION}
-PKGREVISION=	2
 COMMENT=	Qt GUI module of GNU Radio
 
-.include	"../../ham/gnuradio-core/Makefile.common"
-.include	"../../ham/gnuradio-core/Nocore.mk"
+.include	"../../wip/gnuradio-core/Makefile.common"
+.include	"../../wip/gnuradio-core/Nocore.mk"
 
 #ONF_FILES+=	${EGDIR}/gr-qtgui.conf	${PKG_SYSCONFDIR}/gr-qtgui.conf
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_QTGUI=ON
+CMAKE_ARGS+=	-DENABLE_GRC=True
 
-.include	"../../x11/qt4-libs/buildlink3.mk"
-.include	"../../x11/qwt-qt4/buildlink3.mk"
-.include	"../../x11/py-qt4/buildlink3.mk"
+PLIST_MINUS+=	companion
+
+.include	"../../x11/py-qt5/buildlink3.mk"
+.include	"../../x11/qwt6-qt5/buildlink3.mk"
 
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-qtgui/PLIST b/gnuradio-qtgui/PLIST
index e26a3a22d0..74ea8aada1 100644
--- a/gnuradio-qtgui/PLIST
+++ b/gnuradio-qtgui/PLIST
@@ -1,23 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/03/15 14:07:12 mef Exp $
-bin/gr_constellation_plot
-bin/gr_psd_plot_b
-bin/gr_psd_plot_c
-bin/gr_psd_plot_f
-bin/gr_psd_plot_i
-bin/gr_psd_plot_s
-bin/gr_spectrogram_plot
-bin/gr_spectrogram_plot_b
-bin/gr_spectrogram_plot_c
-bin/gr_spectrogram_plot_f
-bin/gr_spectrogram_plot_i
-bin/gr_spectrogram_plot_s
-bin/gr_time_plot_b
-bin/gr_time_plot_c
-bin/gr_time_plot_f
-bin/gr_time_plot_i
-bin/gr_time_plot_s
-bin/gr_time_raster_b
-bin/gr_time_raster_f
+@comment $NetBSD$
 include/gnuradio/qtgui/CMakeLists.txt
 include/gnuradio/qtgui/ConstellationDisplayPlot.h
 include/gnuradio/qtgui/DisplayPlot.h
@@ -66,46 +47,17 @@ include/gnuradio/qtgui/waterfall_sink_f.h
 include/gnuradio/qtgui/waterfalldisplayform.h
 include/gnuradio/swig/qtgui_swig.i
 include/gnuradio/swig/qtgui_swig_doc.i
+lib/cmake/gnuradio/gnuradio-qtguiConfig.cmake
+lib/cmake/gnuradio/gnuradio-qtguiTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-qtguiTargets.cmake
 lib/libgnuradio-qtgui.so
+lib/libgnuradio-qtgui.so.3.8.1
 lib/libgnuradio-qtgui.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-qtgui.pc
 ${PYSITELIB}/gnuradio/qtgui/__init__.py
 ${PYSITELIB}/gnuradio/qtgui/__init__.pyc
 ${PYSITELIB}/gnuradio/qtgui/__init__.pyo
 ${PYSITELIB}/gnuradio/qtgui/_qtgui_swig.so
-${PYSITELIB}/gnuradio/qtgui/plot_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_constellation_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_constellation_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_constellation_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_psd_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_psd_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_psd_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_psd_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_psd_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_psd_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_form.pyo
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.py
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.pyc
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.pyo
@@ -134,25 +86,25 @@ share/gnuradio/examples/qt-gui/qtgui_message_inputs.grc
 share/gnuradio/examples/qt-gui/qtgui_tags_viewing.grc
 share/gnuradio/examples/qt-gui/qtgui_vector_sink_example.grc
 share/gnuradio/examples/qt-gui/test_qtgui_msg.grc
-share/gnuradio/grc/blocks/qtgui_ber_sink_b.xml
-share/gnuradio/grc/blocks/qtgui_block_tree.xml
-share/gnuradio/grc/blocks/qtgui_check_box.xml
-share/gnuradio/grc/blocks/qtgui_chooser.xml
-share/gnuradio/grc/blocks/qtgui_const_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_edit_box_msg.xml
-share/gnuradio/grc/blocks/qtgui_entry.xml
-share/gnuradio/grc/blocks/qtgui_freq_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_histogram_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_label.xml
-share/gnuradio/grc/blocks/qtgui_number_sink.xml
-share/gnuradio/grc/blocks/qtgui_push_button.xml
-share/gnuradio/grc/blocks/qtgui_range.xml
-share/gnuradio/grc/blocks/qtgui_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_tab_widget.xml
-share/gnuradio/grc/blocks/qtgui_time_raster_x.xml
-share/gnuradio/grc/blocks/qtgui_time_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_vector_sink_f.xml
-share/gnuradio/grc/blocks/qtgui_waterfall_sink_x.xml
+share/gnuradio/grc/blocks/qtgui.tree.yml
+share/gnuradio/grc/blocks/qtgui_ber_sink_b.block.yml
+share/gnuradio/grc/blocks/qtgui_check_box.block.yml
+share/gnuradio/grc/blocks/qtgui_chooser.block.yml
+share/gnuradio/grc/blocks/qtgui_const_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_edit_box_msg.block.yml
+share/gnuradio/grc/blocks/qtgui_entry.block.yml
+share/gnuradio/grc/blocks/qtgui_freq_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_histogram_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_label.block.yml
+share/gnuradio/grc/blocks/qtgui_number_sink.block.yml
+share/gnuradio/grc/blocks/qtgui_push_button.block.yml
+share/gnuradio/grc/blocks/qtgui_range.block.yml
+share/gnuradio/grc/blocks/qtgui_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_tab_widget.block.yml
+share/gnuradio/grc/blocks/qtgui_time_raster_x.block.yml
+share/gnuradio/grc/blocks/qtgui_time_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_vector_sink_f.block.yml
+share/gnuradio/grc/blocks/qtgui_waterfall_sink_x.block.yml
 share/gnuradio/themes/alt.qss
 share/gnuradio/themes/dark.qss
 share/gnuradio/themes/plain.qss