diff options
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch | 18 | ||||
| -rw-r--r-- | net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch | 50 |
2 files changed, 0 insertions, 68 deletions
diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch deleted file mode 100644 index d4925e674eab..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch +++ /dev/null @@ -1,18 +0,0 @@ -Bug: https://bugs.gentoo.org/683380 -Patch adapted from FreeBSD: -https://svnweb.freebsd.org/ports/head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc?view=markup&pathrev=499093 - ---- a/gr-blocks/lib/socket_pdu_impl.cc -+++ b/gr-blocks/lib/socket_pdu_impl.cc -@@ -165,7 +165,11 @@ - void - socket_pdu_impl::start_tcp_accept() - { -+#if (BOOST_VERSION >= 107000) -+ tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay); -+#else - tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay); -+#endif - - d_acceptor_tcp->async_accept(new_connection->socket(), - boost::bind(&socket_pdu_impl::handle_tcp_accept, this, diff --git a/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch b/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch deleted file mode 100644 index 60eb7c7bbbe9..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -Description: Update for wxPython 3.0 - wx.InitAllImageHandlers() issues a deprecation warning with wxPython 3.0 - and is a no-op with wxPython 2.8. - Deprecated constants like wxSAVE are gone from the C++ API, so wx.SAVE, etc - are also likely to go from wxPython soon. - The alias "wx.Color" is gone in wxPython 3.0 - only "wx.Colour" is now - supported, so update docstring to use the correct class name. -Author: Olly Betts <olly@survex.com> -Forwarded: no -Last-Update: 2014-08-21 - ---- a/gr-wxgui/python/wxgui/plot.py -+++ b/gr-wxgui/python/wxgui/plot.py -@@ -522,7 +522,7 @@ - self, - "Choose a file with extension bmp, gif, xbm, xpm, png, or jpg", ".", "", - "BMP files (*.bmp)|*.bmp|XBM files (*.xbm)|*.xbm|XPM file (*.xpm)|*.xpm|PNG files (*.png)|*.png|JPG files (*.jpg)|*.jpg", -- wx.SAVE|wx.OVERWRITE_PROMPT -+ wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT - ) - try: - while 1: -@@ -1820,7 +1820,6 @@ - - class MyApp(wx.App): - def OnInit(self): -- wx.InitAllImageHandlers() - frame = TestFrame(None, -1, "PlotCanvas") - #frame.Show(True) - self.SetTopWindow(frame) ---- a/gr-wxgui/python/wxgui/plotter/gltext.py -+++ b/gr-wxgui/python/wxgui/plotter/gltext.py -@@ -50,7 +50,7 @@ - """ - text (String) - Text - font (wx.Font) - Font to draw with (None = System default) -- foreground (wx.Color) - Color of the text -+ foreground (wx.Colour)- Color of the text - or (wx.Bitmap)- Bitmap to overlay the text with - centered (bool) - Center the text - -@@ -317,7 +317,7 @@ - text (string) - displayed text - font (wx.Font) - if None, system default font will be used with font_size - font_size (int) - font size in points -- foreground (wx.Color) - Color of the text -+ foreground (wx.Colour) - Color of the text - or (wx.Bitmap) - Bitmap to overlay the text with - centered (bool) - should the text drawn centered towards position? - |