Package: gnuradio
Version: 3.7.4-1
Severity: important
Tags: patch sid jessie
User: freewx-ma...@lists.alioth.debian.org
Usertags: wxpy3.0
Control: block 755757 by -1
Thanks for the recent update to support wxpython3.0 - however, this
was incomplete.
The first issue is that the BDs have "python-wxgtk3.0, python-wxgtk2.8"
so it requires *both* to be installed. If you want to keep 2.8 in
there, it should be as a secondary alternative:
python-wxgtk3.0|python-wxgtk2.8
The second issue is that there's a BD on libwxgtk3.0-dev|libwxgtk2.8-dev
which appears to be entirely unused - there's certainly no resulting
runtime dependency on any of the wxwidgets C++ runtime libraries, and
grep find no uses of wx-config, wx headers or the wxrc tool.
Then there's currently no python-wxgtk3.0 alternative in the runtime
dependencies.
Finally, I've patched the upstream code to eliminate a deprecation
warning with wxPython 3.0, to improve compatibility with future wx
versions, and to improve a documentation string. These changes are all
compatible with 2.8.
I've rebuilt gnuradio with the attached patch - the build looks good,
but I couldn't figure out how to actually run the wx-using GUI.
I'm happy to NMU these changes.
Cheers,
Olly
diff -Nru gnuradio-3.7.4/debian/changelog gnuradio-3.7.4/debian/changelog
--- gnuradio-3.7.4/debian/changelog 2014-08-16 11:34:04.000000000 +1200
+++ gnuradio-3.7.4/debian/changelog 2014-08-22 11:59:39.000000000 +1200
@@ -1,3 +1,12 @@
+gnuradio (3.7.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update dependencies on wxPython to all be python-wxgtk3.0|python-wxgtk2.8.
+ * Drop unused build dependency on libwxgtk3.0-dev|libwxgtk2.8-dev.
+ * New patch wxpy3.0-compat to improve wxPython 3.0 compatibility.
+
+ -- Olly Betts <o...@survex.com> Fri, 22 Aug 2014 11:58:37 +1200
+
gnuradio (3.7.4-1) unstable; urgency=low
* package based upon git maint branch v3.7.4-28-g3897c85
diff -Nru gnuradio-3.7.4/debian/control gnuradio-3.7.4/debian/control
--- gnuradio-3.7.4/debian/control 2014-08-16 11:04:57.000000000 +1200
+++ gnuradio-3.7.4/debian/control 2014-08-21 17:12:43.000000000 +1200
@@ -12,11 +12,11 @@
libxrender-dev, libpulse-dev, swig (>=1.3.31), libcomedi-dev [!hurd-i386],
python-dev, libfftw3-dev, libcppunit-dev (>=1.9.14), liborc-0.4-dev, liboil0.3-dev,
libusb-1.0-0-dev [linux-any], libusb2-dev [kfreebsd-any],
- libsdl1.2-dev, python-wxgtk3.0, python-wxgtk2.8, libqt4-dev, python-numpy, python-opengl,
+ libsdl1.2-dev, python-wxgtk3.0|python-wxgtk2.8, libqt4-dev, python-numpy, python-opengl,
libgsl0-dev (>=1.10), python-cheetah, python-lxml, python-sphinx, doxygen, xmlto,
qt4-dev-tools, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, pyqt4-dev-tools, python-qwt5-qt4,
python-gtk2-dev, pkg-config (>=0.15.0), libsndfile1-dev, libgsm1-dev,
- liblog4cpp5-dev, libwxgtk3.0-dev|libwxgtk2.8-dev,
+ liblog4cpp5-dev,
libboost-dev,
libboost-date-time-dev,
libboost-filesystem-dev,
@@ -39,7 +39,7 @@
Package: gnuradio
Architecture: any
-Depends: ${python:Depends}, python-opengl, python-lxml, python-wxgtk2.8,
+Depends: ${python:Depends}, python-opengl, python-lxml, python-wxgtk3.0|python-wxgtk2.8,
python-cheetah, adduser, ${shlibs:Depends}, ${misc:Depends},
libvolk0.0.0 (=${binary:Version}), libvolk-bin (=${binary:Version})
Recommends: python-qt4, python-qwt5-qt4, python-scipy, python-matplotlib, python-networkx, uhd-host, python-tk, qthid-fcd-controller
diff -Nru gnuradio-3.7.4/debian/patches/series gnuradio-3.7.4/debian/patches/series
--- gnuradio-3.7.4/debian/patches/series 2014-07-10 03:47:37.000000000 +1200
+++ gnuradio-3.7.4/debian/patches/series 2014-08-21 15:50:34.000000000 +1200
@@ -9,3 +9,4 @@
bsd-hurd-no-thread-affinity
gr-fcd-needs-usb
fix-ctrlport-install
+wxpy3.0-compat
diff -Nru gnuradio-3.7.4/debian/patches/wxpy3.0-compat gnuradio-3.7.4/debian/patches/wxpy3.0-compat
--- gnuradio-3.7.4/debian/patches/wxpy3.0-compat 1970-01-01 12:00:00.000000000 +1200
+++ gnuradio-3.7.4/debian/patches/wxpy3.0-compat 2014-08-21 15:58:14.000000000 +1200
@@ -0,0 +1,50 @@
+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 <o...@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
+
+@@ -313,7 +313,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?
+
