diff options
author | mef <mef> | 2015-09-01 04:13:43 +0000 |
---|---|---|
committer | mef <mef> | 2015-09-01 04:13:43 +0000 |
commit | 5f6a0330a705dd90b6eb62b8d5f3491f5fa1c546 (patch) | |
tree | 72efa7a8192a36b6c6f1c411c21609f82b031845 | |
parent | f1790ee99cd292b489a975fa952e98018435e6d9 (diff) | |
download | pkgsrc-5f6a0330a705dd90b6eb62b8d5f3491f5fa1c546.tar.gz |
(pkgsrc)
- (File/REPLACE_PYTHON) delete non existent files
- (Makefile)
* CONF_FILES setup deleted (etc files no longer installed,
but found at examples directory now)
* MASTER_SITES updated
* ${DESTDIR} is removed from one of CMAKE_ARGS
-DGR_LIBRARY_DIR=${DESTDIR}${PREFIX}/lib
(upstream)
- Update gnuradio-core from 3.7.6 to 3.7.8
---------------------
ChangLog 3.7.7 to 3.7.8 is not known
Release Note for 3.7.7 is at
http://gnuradio.org/redmine/projects/gnuradio/wiki/ChangeLogV3_7_7
-rw-r--r-- | ham/gnuradio-core/Makefile | 19 | ||||
-rw-r--r-- | ham/gnuradio-core/Makefile.common | 5 | ||||
-rw-r--r-- | ham/gnuradio-core/Makefile.version | 4 | ||||
-rw-r--r-- | ham/gnuradio-core/Nocore.mk | 6 | ||||
-rw-r--r-- | ham/gnuradio-core/PLIST | 30 | ||||
-rw-r--r-- | ham/gnuradio-core/PLIST.oss | 3 | ||||
-rw-r--r-- | ham/gnuradio-core/distinfo | 10 | ||||
-rw-r--r-- | ham/gnuradio-core/files/REPLACE_PYTHON | 22 | ||||
-rw-r--r-- | ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion | 19 |
9 files changed, 53 insertions, 65 deletions
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile index acfcae6e529..153bf874378 100644 --- a/ham/gnuradio-core/Makefile +++ b/ham/gnuradio-core/Makefile @@ -1,20 +1,19 @@ -# $NetBSD: Makefile,v 1.49 2015/06/12 10:50:14 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2015/09/01 04:13:43 mef Exp $ PKGNAME= gnuradio-core-${VERSION} -PKGREVISION= 2 COMMENT= Core part of GNU Radio, all others need this PLIST_MINUS= # empty .include "Makefile.common" -CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf -CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf -CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf -CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf +#CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf +#CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf +#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf +#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf .include "../../mk/oss.buildlink3.mk" .if ${OSS_TYPE} != "none" -CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf +#CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss .endif @@ -22,8 +21,8 @@ PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss CMAKE_ARGS+= -DENABLE_DEFAULT=False # Take care CONF_FILES stuff (The same code in Nocore.mk) -post-install: - ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \ - ${DESTDIR}${PREFIX}/${EGDIR}/ +#post-install: +# ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \ +# ${DESTDIR}${PREFIX}/${EGDIR}/ .include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common index d4598db2cb4..597b27dba44 100644 --- a/ham/gnuradio-core/Makefile.common +++ b/ham/gnuradio-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2015/03/07 05:10:45 mef Exp $ +# $NetBSD: Makefile.common,v 1.8 2015/09/01 04:13:43 mef Exp $ # This Makefile fragment is included in the package Makefiles for # GNU Radio distributed packages (they all share common configure and build # settings). @@ -34,6 +34,7 @@ DISTNAME?= gnuradio-${VERSION} CATEGORIES+= ham MASTER_SITES= http://s3-dist.gnuradio.org/ +MASTER_SITES= http://gnuradio.org/releases/gnuradio/ MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.gnu.org/software/gnuradio/ @@ -91,7 +92,7 @@ CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2 CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE CMAKE_ARGS+= -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0 -CMAKE_ARGS+= -DGR_LIBRARY_DIR=${DESTDIR}${PREFIX}/lib +CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib CMAKE_ARGS+= -DGR_PREFSDIR=${DESTDIR}${PREFIX}/share/ CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include diff --git a/ham/gnuradio-core/Makefile.version b/ham/gnuradio-core/Makefile.version index 7f4947b2571..d84d804083c 100644 --- a/ham/gnuradio-core/Makefile.version +++ b/ham/gnuradio-core/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.5 2015/03/07 05:10:45 mef Exp $ +# $NetBSD: Makefile.version,v 1.6 2015/09/01 04:13:43 mef Exp $ -VERSION= 3.7.6 +VERSION= 3.7.8 diff --git a/ham/gnuradio-core/Nocore.mk b/ham/gnuradio-core/Nocore.mk index 9f6e32946d8..f9954394d58 100644 --- a/ham/gnuradio-core/Nocore.mk +++ b/ham/gnuradio-core/Nocore.mk @@ -1,4 +1,4 @@ -# $NetBSD: Nocore.mk,v 1.6 2015/01/30 15:02:23 mef Exp $ +# $NetBSD: Nocore.mk,v 1.7 2015/09/01 04:13:43 mef Exp $ DEPENDS+= gnuradio-core-[0-9]*:../../ham/gnuradio-core @@ -11,8 +11,8 @@ PLIST_MINUS= core #.if empty(PKGBASE:Mgnuradio-core) && !empty(PLIST_MINUS) post-install: # Take care CONF_FILES stuff - ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \ - ${DESTDIR}${PREFIX}/${EGDIR}/ +# ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \ +# ${DESTDIR}${PREFIX}/${EGDIR}/ for i in ${PLIST_MINUS} ; do \ for p in PLIST PLIST.oss PLIST.${OPSYS} ; do \ f="${PKGDIR}/../../ham/gnuradio-$${i}/$${p}"; \ diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST index 2cae50bbebc..0919b5c165a 100644 --- a/ham/gnuradio-core/PLIST +++ b/ham/gnuradio-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2015/03/07 05:10:45 mef Exp $ +@comment $NetBSD: PLIST,v 1.20 2015/09/01 04:13:43 mef Exp $ bin/gnuradio-config-info bin/gr_filter_design bin/volk-config-info @@ -45,6 +45,7 @@ include/gnuradio/analog/sig_source_i.h include/gnuradio/analog/sig_source_s.h include/gnuradio/analog/sig_source_waveform.h include/gnuradio/analog/simple_squelch_cc.h +include/gnuradio/analog/squelch_base_cc.h include/gnuradio/analog/squelch_base_ff.h include/gnuradio/api.h include/gnuradio/attributes.h @@ -238,6 +239,7 @@ include/gnuradio/blocks/sub_ss.h include/gnuradio/blocks/tag_debug.h include/gnuradio/blocks/tag_gate.h include/gnuradio/blocks/tagged_file_sink.h +include/gnuradio/blocks/tagged_stream_align.h include/gnuradio/blocks/tagged_stream_multiply_length.h include/gnuradio/blocks/tagged_stream_mux.h include/gnuradio/blocks/tagged_stream_to_pdu.h @@ -507,6 +509,7 @@ include/volk/volk_32f_expfast_32f.h include/volk/volk_32f_index_max_16u.h include/volk/volk_32f_invsqrt_32f.h include/volk/volk_32f_log2_32f.h +include/volk/volk_32f_null_32f.h include/volk/volk_32f_s32f_32f_fm_detect_32f.h include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h include/volk/volk_32f_s32f_convert_16i.h @@ -525,6 +528,7 @@ include/volk/volk_32f_x2_add_32f.h include/volk/volk_32f_x2_divide_32f.h include/volk/volk_32f_x2_dot_prod_16i.h include/volk/volk_32f_x2_dot_prod_32f.h +include/volk/volk_32f_x2_fm_detectpuppet_32f.h include/volk/volk_32f_x2_interleave_32fc.h include/volk/volk_32f_x2_max_32f.h include/volk/volk_32f_x2_min_32f.h @@ -603,7 +607,9 @@ lib/cmake/gnuradio/FindLog4cpp.cmake lib/cmake/gnuradio/FindOSS.cmake lib/cmake/gnuradio/FindPortaudio.cmake lib/cmake/gnuradio/FindQwt.cmake +lib/cmake/gnuradio/FindSWIG.cmake lib/cmake/gnuradio/FindSphinx.cmake +lib/cmake/gnuradio/FindThrift.cmake lib/cmake/gnuradio/FindUHD.cmake lib/cmake/gnuradio/FindUSB.cmake lib/cmake/gnuradio/FindZeroMQ.cmake @@ -623,6 +629,7 @@ lib/cmake/gnuradio/GrVersion.cmake lib/cmake/gnuradio/LibFindMacros.cmake lib/cmake/gnuradio/UseSWIG.cmake lib/cmake/volk/VolkConfig.cmake +lib/cmake/volk/VolkConfigVersion.cmake lib/libgnuradio-analog.so lib/libgnuradio-analog.so.${PKGVERSION} lib/libgnuradio-audio.so @@ -638,7 +645,7 @@ lib/libgnuradio-pmt.so.${PKGVERSION} lib/libgnuradio-runtime.so lib/libgnuradio-runtime.so.${PKGVERSION} lib/libvolk.so -lib/libvolk.so.0.0.0 +lib/libvolk.so.1.0.2 lib/pkgconfig/gnuradio-analog.pc lib/pkgconfig/gnuradio-audio.pc lib/pkgconfig/gnuradio-blocks.pc @@ -729,6 +736,9 @@ ${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyo ${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.py ${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyc ${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyo +${PYSITELIB}/gnuradio/eng_arg.py +${PYSITELIB}/gnuradio/eng_arg.pyc +${PYSITELIB}/gnuradio/eng_arg.pyo ${PYSITELIB}/gnuradio/eng_notation.py ${PYSITELIB}/gnuradio/eng_notation.pyc ${PYSITELIB}/gnuradio/eng_notation.pyo @@ -893,11 +903,8 @@ share/doc/gnuradio-${PKGVERSION}/README.blocks share/doc/gnuradio-${PKGVERSION}/README.fft share/doc/gnuradio-${PKGVERSION}/README.filter share/doc/gnuradio-${PKGVERSION}/README.hacking -share/examples/gnuradio/conf.d/gnuradio-runtime.conf -share/examples/gnuradio/conf.d/gr-audio-jack.conf -share/examples/gnuradio/conf.d/gr-audio-portaudio.conf -share/examples/gnuradio/conf.d/gr-audio.conf share/gnuradio/examples/analog/fmtest.py +share/gnuradio/examples/analog/noise_power.grc share/gnuradio/examples/audio/audio_copy.py share/gnuradio/examples/audio/audio_fft.py share/gnuradio/examples/audio/audio_play.py @@ -914,11 +921,13 @@ share/gnuradio/examples/audio/noise.py share/gnuradio/examples/audio/spectrum_inversion.py share/gnuradio/examples/audio/test_resampler.py share/gnuradio/examples/blocks/matrix_multiplexer.grc +share/gnuradio/examples/blocks/peak_detector2.grc share/gnuradio/examples/blocks/vector_source_with_tags.grc share/gnuradio/examples/filter/channelize.py share/gnuradio/examples/filter/chirp_channelize.py share/gnuradio/examples/filter/decimate.py share/gnuradio/examples/filter/fft_filter_ccc.py +share/gnuradio/examples/filter/filter_taps.grc share/gnuradio/examples/filter/fir_filter_ccc.py share/gnuradio/examples/filter/fir_filter_fff.py share/gnuradio/examples/filter/gr_filtdes_api.py @@ -1008,9 +1017,11 @@ share/gnuradio/grc/blocks/blocks_complex_to_mag_squared.xml share/gnuradio/grc/blocks/blocks_complex_to_real.xml share/gnuradio/grc/blocks/blocks_conjugate_cc.xml share/gnuradio/grc/blocks/blocks_copy.xml +share/gnuradio/grc/blocks/blocks_ctrlport_performance.xml share/gnuradio/grc/blocks/blocks_ctrlport_probe2_c.xml share/gnuradio/grc/blocks/blocks_ctrlport_probe2_x.xml share/gnuradio/grc/blocks/blocks_ctrlport_probe_c.xml +share/gnuradio/grc/blocks/blocks_ctrlport_viewer.xml share/gnuradio/grc/blocks/blocks_deinterleave.xml share/gnuradio/grc/blocks/blocks_delay.xml share/gnuradio/grc/blocks/blocks_divide_XX.xml @@ -1089,7 +1100,9 @@ share/gnuradio/grc/blocks/blocks_stretch_ff.xml share/gnuradio/grc/blocks/blocks_sub_xx.xml share/gnuradio/grc/blocks/blocks_tag_debug.xml share/gnuradio/grc/blocks/blocks_tag_gate.xml +share/gnuradio/grc/blocks/blocks_tag_object.xml share/gnuradio/grc/blocks/blocks_tagged_file_sink.xml +share/gnuradio/grc/blocks/blocks_tagged_stream_align.xml share/gnuradio/grc/blocks/blocks_tagged_stream_multiply_length.xml share/gnuradio/grc/blocks/blocks_tagged_stream_mux.xml share/gnuradio/grc/blocks/blocks_tagged_stream_to_pdu.xml @@ -1145,3 +1158,8 @@ share/gnuradio/grc/blocks/filter_rational_resampler_base_xxx.xml share/gnuradio/grc/blocks/filter_rational_resampler_xxx.xml share/gnuradio/grc/blocks/filter_root_raised_cosine_filter.xml share/gnuradio/grc/blocks/filter_single_pole_iir_filter_xx.xml +share/gnuradio/grc/blocks/variable_band_pass_filter_taps.xml +share/gnuradio/grc/blocks/variable_band_reject_filter_taps.xml +share/gnuradio/grc/blocks/variable_high_pass_filter_taps.xml +share/gnuradio/grc/blocks/variable_low_pass_filter_taps.xml +share/gnuradio/grc/blocks/variable_rrc_filter_taps.xml diff --git a/ham/gnuradio-core/PLIST.oss b/ham/gnuradio-core/PLIST.oss index 884faab7afa..88045097900 100644 --- a/ham/gnuradio-core/PLIST.oss +++ b/ham/gnuradio-core/PLIST.oss @@ -1,2 +1 @@ -@comment $NetBSD: PLIST.oss,v 1.1 2015/01/27 06:01:44 dbj Exp $ -share/examples/gnuradio/conf.d/gr-audio-oss.conf +@comment $NetBSD: PLIST.oss,v 1.2 2015/09/01 04:13:43 mef Exp $ diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo index 641a7798627..18b8eba9dc3 100644 --- a/ham/gnuradio-core/distinfo +++ b/ham/gnuradio-core/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.20 2015/03/07 05:10:45 mef Exp $ +$NetBSD: distinfo,v 1.21 2015/09/01 04:13:43 mef Exp $ -SHA1 (gnuradio-3.7.6.tar.gz) = aaec56a3b9bfcf6bba1e4f7a9336579171811554 -RMD160 (gnuradio-3.7.6.tar.gz) = c0726c1c709c5414d4efa698f5396e6173862727 -Size (gnuradio-3.7.6.tar.gz) = 3579734 bytes +SHA1 (gnuradio-3.7.8.tar.gz) = ef767d5f5e05e4f9883b3077cebd9ca915237c77 +RMD160 (gnuradio-3.7.8.tar.gz) = 890cd2c55ecb919a46cce0ac15118c3963a1156b +Size (gnuradio-3.7.8.tar.gz) = 3990172 bytes SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5 SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = c05628aa88ac968928f9eabd8c56d4527e258767 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 00ff8c14658acd2d1dc8be18ea6a19ace8d12968 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49 -SHA1 (patch-grc_script_gnuradio-companion) = 5fd6ed47941c29054f78d968abd98a4197a69100 +SHA1 (patch-grc_script_gnuradio-companion) = 15dde8f3a9e057061e56157533f8af1919240b93 diff --git a/ham/gnuradio-core/files/REPLACE_PYTHON b/ham/gnuradio-core/files/REPLACE_PYTHON index 967d29c15f6..70d7b32838c 100644 --- a/ham/gnuradio-core/files/REPLACE_PYTHON +++ b/ham/gnuradio-core/files/REPLACE_PYTHON @@ -15,7 +15,6 @@ REPLACE_PYTHON = \ grc/python/Constants.py \ grc/python/expr_utils.py \ grc/python/flow_graph.tmpl \ - grc/python/convert_hier.py \ grc/python/Param.py \ grc/python/Connection.py \ grc/python/FlowGraph.py \ @@ -366,7 +365,6 @@ REPLACE_PYTHON = \ gnuradio-runtime/python/gnuradio/gr/gr_threading.py \ gnuradio-runtime/python/gnuradio/gr/tag_utils.py \ gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py \ - gnuradio-runtime/python/gnuradio/gr/qa_hier_block2_message_connections.py \ gnuradio-runtime/python/gnuradio/gr/top_block.py \ gnuradio-runtime/python/gnuradio/gr/gateway.py \ gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py \ @@ -379,7 +377,6 @@ REPLACE_PYTHON = \ gnuradio-runtime/python/gnuradio/eng_notation.py \ gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py \ gnuradio-runtime/python/gnuradio/ctrlport/monitor.py \ - gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py \ gnuradio-runtime/python/gnuradio/ctrlport/__init__.py \ gnuradio-runtime/python/gnuradio/eng_option.py \ gnuradio-runtime/python/gnuradio/__init__.py \ @@ -480,23 +477,7 @@ REPLACE_PYTHON = \ gr-trellis/doc/test_viterbi_equalization1.py \ gr-trellis/python/trellis/qa_trellis.py \ gr-trellis/python/trellis/__init__.py \ - gr-trellis/examples/python/test_tcm_combined.py \ - gr-trellis/examples/python/test_turbo_equalization1.py \ - gr-trellis/examples/python/test_turbo_equalization.py \ gr-trellis/examples/python/test_cpm.py \ - gr-trellis/examples/python/test_sccc_turbo.py \ - gr-trellis/examples/python/test_tcm_bit.py \ - gr-trellis/examples/python/test_sccc_soft.py \ - gr-trellis/examples/python/test_pccc_turbo1.py \ - gr-trellis/examples/python/test_sccc_turbo1.py \ - gr-trellis/examples/python/test_sccc_hard.py \ - gr-trellis/examples/python/test_tcm.py \ - gr-trellis/examples/python/test_turbo_equalization2.py \ - gr-trellis/examples/python/test_viterbi_equalization.py \ - gr-trellis/examples/python/test_sccc_turbo2.py \ - gr-trellis/examples/python/test_viterbi_equalization1.py \ - gr-trellis/examples/python/test_tcm_parallel.py \ - gr-trellis/examples/python/fsm_utils.py \ gr-video-sdl/python/video_sdl/qa_video_sdl.py \ gr-video-sdl/python/video_sdl/__init__.py \ gr-uhd/grc/gen_uhd_usrp_blocks.py \ @@ -617,8 +598,5 @@ REPLACE_PYTHON = \ gr-atsc/python/atsc/__init__.py \ gr-atsc/python/atsc/qa_atsc.py \ gr-atsc/lib/gen_encoder.py \ - gr-filter/freq_xlating_fft_filter.py \ - gnuradio-runtime/python/digital/packet_utils.py \ - gnuradio-runtime/python/gnuradio/gr/packet_utils.py \ gr-digital/python/digital/packet_utils.py \ gr-filter/python/filter/freq_xlating_fft_filter.py \ diff --git a/ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion b/ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion index d39a30e97a8..076183b795a 100644 --- a/ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion +++ b/ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion @@ -1,22 +1,15 @@ -$NetBSD: patch-grc_script_gnuradio-companion,v 1.2 2014/10/17 09:51:56 mef Exp $ +$NetBSD: patch-grc_script_gnuradio-companion,v 1.3 2015/09/01 04:13:43 mef Exp $ Add message for NetBSD when failed to import gnuradio. Or missing gnuradio-core package. ---- grc/scripts/gnuradio-companion.orig 2014-07-31 05:39:51.000000000 +0900 -+++ grc/scripts/gnuradio-companion 2014-09-21 21:32:33.000000000 +0900 -@@ -26,12 +26,14 @@ - except ImportError, e: - d = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_CLOSE, message_format=""" +--- grc/scripts/gnuradio-companion.orig 2015-08-23 21:36:38.000000000 +0900 ++++ grc/scripts/gnuradio-companion 2015-08-23 21:38:19.000000000 +0900 +@@ -35,6 +35,7 @@ warnings.filterwarnings("always") + + GR_IMPORT_ERROR_MESSAGE = """\ Cannot import gnuradio. +You may be missing gnuradio-core package or Is the python path environment variable set correctly? All OS: PYTHONPATH - - Is the library path environment variable set correctly? - Linux: LD_LIBRARY_PATH -+ NetBSD: LD_LIBRARY_PATH - Windows: PATH - MacOSX: DYLD_LIBRARY_PATH - """) |