Bug#759054: python-fs: Improved patch
Scott Talbert pointed out a simpler replacement for wx.PySimpleApp() is
just wx.App(False) - I've attached an updated patch using this instead.
Cheers,
Olly
diff -Nru python-fs-0.4.0/debian/changelog python-fs-0.4.0/debian/changelog
--- python-fs-0.4.0/debian/changelog 2014-02-24 11:00:56.0 -0300
+++ python-fs-0.4.0/debian/changelog 2014-09-07 00:59:41.0 -0300
@@ -1,3 +1,11 @@
+python-fs (0.4.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759054):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Sun, 07 Sep 2014 03:59:39 +
+
python-fs (0.4.0-1) unstable; urgency=low
[ Janos Guljas ]
diff -Nru python-fs-0.4.0/debian/control python-fs-0.4.0/debian/control
--- python-fs-0.4.0/debian/control 2014-02-24 10:59:25.0 -0300
+++ python-fs-0.4.0/debian/control 2014-09-07 00:59:35.0 -0300
@@ -28,7 +28,7 @@
Package: python-fs-browser
Architecture: all
-Depends: python-fs, python-wxgtk2.8, ${misc:Depends}
+Depends: python-fs, python-wxgtk3.0, ${misc:Depends}
Description: Python filesystem abstraction - Gtk browser
Pyfilesystem is a Python module that provides a common interface to many types
of filesystem, and provides some powerful features such as exposing
diff -Nru python-fs-0.4.0/debian/patches/series python-fs-0.4.0/debian/patches/series
--- python-fs-0.4.0/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ python-fs-0.4.0/debian/patches/series 2014-09-07 00:44:34.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru python-fs-0.4.0/debian/patches/wxpython3.0.patch python-fs-0.4.0/debian/patches/wxpython3.0.patch
--- python-fs-0.4.0/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ python-fs-0.4.0/debian/patches/wxpython3.0.patch 2014-09-13 00:14:42.0 -0300
@@ -0,0 +1,17 @@
+Description: Update for wxPython 3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759054
+Forwarded: no
+Last-Update: 2014-09-13
+
+--- python-fs-0.4.0.orig/fs/browsewin.py
python-fs-0.4.0/fs/browsewin.py
+@@ -187,7 +187,7 @@ def browse(fs, hide_dotfiles=False):
+
+
+
+-app = wx.PySimpleApp()
++app = wx.App(False)
+ frame = BrowseFrame(fs, hide_dotfiles=hide_dotfiles)
+ frame.Show()
+ app.MainLoop()
Bug#759069: gastables: Improved patch
I've attached an improved patch which does away with the need to disable
WXDEBUG assertions.
Cheers,
Olly
diff -Nru gastables-0.3/debian/changelog gastables-0.3/debian/changelog
--- gastables-0.3/debian/changelog 2013-05-28 04:21:25.0 -0300
+++ gastables-0.3/debian/changelog 2014-09-10 22:23:11.0 -0300
@@ -1,3 +1,11 @@
+gastables (0.3-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759069):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Thu, 11 Sep 2014 01:22:34 +
+
gastables (0.3-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru gastables-0.3/debian/control gastables-0.3/debian/control
--- gastables-0.3/debian/control 2013-05-28 04:20:11.0 -0300
+++ gastables-0.3/debian/control 2014-09-10 22:13:49.0 -0300
@@ -13,7 +13,7 @@
Package: gastables
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-gastables, python-wxgtk2.8, python-matplotlib
+ python-gastables, python-wxgtk3.0, python-matplotlib
Description: graphical user interface for compressible flow gas table modules
Gas Tables include modules for compressible gas flow
calculations. The main modules currently included are:
diff -Nru gastables-0.3/debian/patches/series gastables-0.3/debian/patches/series
--- gastables-0.3/debian/patches/series 2009-11-26 18:10:04.0 -0300
+++ gastables-0.3/debian/patches/series 2014-09-10 22:21:49.0 -0300
@@ -1 +1,2 @@
exit_menu.diff
+wxpython3.0.patch
diff -Nru gastables-0.3/debian/patches/wxpython3.0.patch gastables-0.3/debian/patches/wxpython3.0.patch
--- gastables-0.3/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ gastables-0.3/debian/patches/wxpython3.0.patch 2014-09-13 00:22:55.0 -0300
@@ -0,0 +1,38 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/759069
+Forwarded: no
+Last-Update: 2014-09-12
+
+Index: gastables-0.3/gui/gastables
+===
+--- gastables-0.3.orig/gui/gastables
gastables-0.3/gui/gastables
+@@ -58,7 +58,7 @@ ID_Isothermal = wx.NewId()
+ ID_PrandtlMeyer = wx.NewId()
+
+ # colours used in status bar
+-RED = wx.Color(200,100,0)
++RED = wx.Colour(200,100,0)
+
+ class GasTables(wx.Frame):
+ def __init__(self, parent, ID, title):
+@@ -162,7 +162,6 @@ class GasTables(wx.Frame):
+
+ def createDialog(self, ModuleName, FIELDS, Function, VALUES=None, SECOND_VALUES=None, N=None, Plot=True):
+ self.ModuleName = ModuleName
+-self.CreateStatusBar()
+ self.SetStatusMessage(self.ModuleName + Running)
+
+ self.sizer.Clear(True)
+@@ -429,8 +428,8 @@ class GasTables(wx.Frame):
+
+ if(self.Plotted):
+ try:
+-self.sizer.Remove(self.canvas)
+-self.sizer.Remove(self.toolbar)
++self.sizer.Detach(self.canvas)
++self.sizer.Detach(self.toolbar)
+ self.Fit()
+ except:
+ pass
Bug#759092: python-pyo: Improved patch
Scott Talbert pointed out a simpler replacement for wx.PySimpleApp() is
just wx.App(False) - I've attached an updated patch using this instead.
Cheers,
Olly
diff -Nru python-pyo-0.7/debian/changelog python-pyo-0.7/debian/changelog
--- python-pyo-0.7/debian/changelog 2014-08-30 21:14:41.0 -0300
+++ python-pyo-0.7/debian/changelog 2014-09-09 17:18:26.0 -0300
@@ -1,3 +1,14 @@
+python-pyo (0.7-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix deprecation warnings with wxPython 3.0.
+ * Fix check for wxPython not to insist that 2.8 is installed before picking
+something that's 2.8 or newer.
+ * Update uses of removed alias wx.Color to wx.Colour.
+ * Update FileDialog flags to use the non-deprecated FD_ prefixed form.
+
+ -- Olly Betts o...@survex.com Tue, 09 Sep 2014 20:16:21 +
+
python-pyo (0.7-2) unstable; urgency=low
* Depends on python-wxgtk3.0 instead of python-wxgtk2.8 to have the
diff -Nru python-pyo-0.7/debian/patches/01-epyo_paths python-pyo-0.7/debian/patches/01-epyo_paths
--- python-pyo-0.7/debian/patches/01-epyo_paths 2014-08-30 18:11:38.0 -0300
+++ python-pyo-0.7/debian/patches/01-epyo_paths 2014-09-09 17:16:16.0 -0300
@@ -1,5 +1,7 @@
a/utils/E-Pyo.py
-+++ b/utils/E-Pyo.py
+Index: python-pyo-0.7/utils/E-Pyo.py
+===
+--- python-pyo-0.7.orig/utils/E-Pyo.py
python-pyo-0.7/utils/E-Pyo.py
@@ -210,7 +210,7 @@
elif WIN_APP_BUNDLED:
EXAMPLE_PATH = os.path.join(os.getcwd(), Resources, examples)
diff -Nru python-pyo-0.7/debian/patches/series python-pyo-0.7/debian/patches/series
--- python-pyo-0.7/debian/patches/series 2014-08-30 18:11:38.0 -0300
+++ python-pyo-0.7/debian/patches/series 2014-09-07 15:17:51.0 -0300
@@ -1 +1,2 @@
01-epyo_paths
+wxpython3.0.patch
diff -Nru python-pyo-0.7/debian/patches/wxpython3.0.patch python-pyo-0.7/debian/patches/wxpython3.0.patch
--- python-pyo-0.7/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ python-pyo-0.7/debian/patches/wxpython3.0.patch 2014-09-13 00:29:42.0 -0300
@@ -0,0 +1,128 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Forwarded: no
+Last-Update: 2014-09-12
+
+Index: python-pyo-0.7/pyolib/_widgets.py
+===
+--- python-pyo-0.7.orig/pyolib/_widgets.py
python-pyo-0.7/pyolib/_widgets.py
+@@ -29,10 +29,11 @@ except:
+ WITH_PIL = False
+
+ try:
+-import wxversion
+-if (wxversion.checkInstalled(2.8)):
++if 'wx' not in sys.modules:
++# Don't try to load if already loaded.
++import wxversion
+ wxversion.ensureMinimal(2.8)
+-import wx
++import wx
+ from _wxwidgets import *
+ PYO_USE_WX = True
+ except:
+Index: python-pyo-0.7/pyolib/_wxwidgets.py
+===
+--- python-pyo-0.7.orig/pyolib/_wxwidgets.py
python-pyo-0.7/pyolib/_wxwidgets.py
+@@ -143,8 +143,8 @@ def powOfTwoToInt(x):
+ return POWOFTWO[x]
+
+ def GetRoundBitmap( w, h, r ):
+-maskColor = wx.Color(0,0,0)
+-shownColor = wx.Color(5,5,5)
++maskColor = wx.Colour(0,0,0)
++shownColor = wx.Colour(5,5,5)
+ b = wx.EmptyBitmap(w,h)
+ dc = wx.MemoryDC(b)
+ dc.SetBrush(wx.Brush(maskColor))
+Index: python-pyo-0.7/utils/E-Pyo.py
+===
+--- python-pyo-0.7.orig/utils/E-Pyo.py
python-pyo-0.7/utils/E-Pyo.py
+@@ -2250,7 +2250,7 @@ class MainFrame(wx.Frame):
+ def saveListPaste(self, evt):
+ if self.pastingList != []:
+ dlg = wx.FileDialog(self, message=Save file as ...,
+-defaultDir=os.path.expanduser('~'), style=wx.SAVE)
++defaultDir=os.path.expanduser('~'), style=wx.FD_SAVE)
+ if dlg.ShowModal() == wx.ID_OK:
+ path = ensureNFD(dlg.GetPath())
+ with open(path, w) as f:
+@@ -2258,7 +2258,7 @@ class MainFrame(wx.Frame):
+
+ def loadListPaste(self, evt):
+ dlg = wx.FileDialog(self, message=Choose a file,
+-defaultDir=os.path.expanduser(~), style=wx.OPEN)
++defaultDir=os.path.expanduser(~), style=wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath()
+ self.pastingList = []
+@@ -2520,7 +2520,7 @@ class MainFrame(wx.Frame):
+ def insertPath(self, evt):
+ dlg = wx.FileDialog(self, message=Choose a file,
+ defaultDir=PREFERENCES.get(insert_path, os.path.expanduser(~)),
+-defaultFile=, style=wx.OPEN | wx.MULTIPLE)
++defaultFile=, style=wx.FD_OPEN | wx.FD_MULTIPLE)
+ if dlg.ShowModal() == wx.ID_OK:
+ paths = dlg.GetPaths()
+ if len(paths) == 1:
+@@ -2710,7 +2710,7 @@ class
Bug#759056: dicompyler: Please update to use wxpython3.0
On Thu, Sep 11, 2014 at 12:14:50PM +0200, Andreas Tille wrote:
12:12:27: XRC error: 90: too many children in grid sizer: 12 3 x 1
(consider omitting the number of rows or columns)
12:12:27: XRC error: 90: unexpected item in sizer
12:12:27: XRC error: 229: invalid column index 5: must be less than 4
12:12:27: XRC error: 229: invalid column index 7: must be less than 4
The first number is the line number in the XRC file (unhelpfully it
doesn't say which, but a quick grep reveals it must be
dicompyler/resources/main.xrc in both cases.
First error is that the sizer is given 3 columns and 1 row and 12 items
to add. I just omitted specifying the number of rows as it suggested,
which seems more robust to further items being added.
The second is that growable columns are set as 1,3,5,7 in a sizer with
4 columns. I've no idea what's intended, or how wx2.8 fixes up the
mismatch, but raised that to 8 columns (so 7 8). If that changes the
layout dropping 5 and 7 from the list would also make the error go away.
Patch for that attached (but untested, as the pubsub stuff means I can't
actually run the application).
$ dicompyler
ERROR: Unhandled exception: Traceback (most recent call last):
File /usr/bin/dicompyler, line 9, in module
load_entry_point('dicompyler==0.4.2', 'console_scripts', 'dicompyler')()
File /usr/share/dicompyler/dicompyler/main.py, line 946, in start
app = dicompyler(0)
File /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py, line 8631,
in __init__
self._BootstrapApp()
File /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py, line 8196,
in _BootstrapApp
return _core_.PyApp__BootstrapApp(*args, **kwargs)
File /usr/share/dicompyler/dicompyler/main.py, line 938, in OnInit
dicompylerFrame = MainFrame(None, -1, dicompyler, self.res)
File /usr/share/dicompyler/dicompyler/main.py, line 235, in __init__
parent = None, appname = 'dicompyler', name = 'Options')
File /usr/share/dicompyler/dicompyler/preferences.py, line 35, in __init__
pub.subscribe(self.SetPreferenceTemplate, 'preferences.updated.template')
TypeError: unbound method subscribe() must be called with Publisher instance
as first argument (got instancemethod instance instead)
Error in sys.excepthook:
Traceback (most recent call last):
File /usr/share/dicompyler/dicompyler/main.py, line 45, in LogExcepthook
pub.sendMessage('logging.exception', text)
TypeError: unbound method sendMessage() must be called with Publisher
instance as first argument (got str instance instead)
It looks like you need to pass a Publisher() object not a string as the
first parameter there. I don't have time to look into that right now
though.
Cheers,
Olly
Description: Fix XRC errors reported by wxPython 3.0
Author: Olly Betts o...@survex.com
Bug-Debian: https://bugs.debian.org/759056
Forwarded: no
Last-Update: 2014-09-11
--- dicompyler-0.4.2.orig/dicompyler/resources/main.xrc
+++ dicompyler-0.4.2/dicompyler/resources/main.xrc
@@ -154,7 +154,6 @@
/object
/object
cols3/cols
- rows1/rows
vgap5/vgap
hgap5/hgap
growablecols1/growablecols
@@ -222,7 +221,7 @@
option1/option
flagwxALL|wxEXPAND|wxALIGN_CENTRE/flag
/object
- cols4/cols
+ cols8/cols
rows2/rows
vgap5/vgap
hgap5/hgap
Bug#761174: plplot: FTBFS on kfreebsd-i386 reproducibly
On Thu, Sep 11, 2014 at 01:54:06PM +0200, Axel Beckert wrote: plplot FTBFS on kfreebsd-i386 (only) due to missing/broken ada compiler: https://buildd.debian.org/status/logs.php?pkg=plplotver=5.10.0-0.1arch=kfreebsd-i386 I was able to reproduce the issue in the sid chroot on fischer.debian.org. I noticed the following in the build log: -- WARNING: no working Ada compiler so disabling Ada bindings and examples. I notice popcon shows no installs at all of any sort for the plplot ada-related binary packages, so disabling them for all architectures (at least for jessie) may be a reasonable solution if this isn't easy to fix: https://qa.debian.org/popcon.php?package=plplot Not all users run popcon, but this does strongly suggest they aren't widely used currently. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759056: dicompyler: Please update to use wxpython3.0
Looking at the bitpim pubsub changes (patch attached), I think you
want to update from:
from wx.lib.pubsub import Publisher as pub
to this instead:
import wx.lib.pubsub.setuparg1
import wx.lib.pubsub.core
pub = wx.lib.pubsub.core.Publisher()
I'm not sure if it should be the same pub instance in all the modules or
not though.
Updated version of wxpy30-more.patch attached too - with this the package
builds and starts up OK (it failed to start up for me before them).
Not sure how easy this is to automate in the script - I'd think there's
probably a fair bit of variation in the import.
Cheers,
Olly
diff -ruN bitpim-old/src/pubsub.py bitpim-new/src/pubsub.py
--- bitpim-old/src/pubsub.py 2009-11-05 23:17:29.0 -0300
+++ bitpim-new/src/pubsub.py 2014-09-11 21:00:32.0 -0300
@@ -21,7 +21,8 @@
deleted.
-from wx.lib.pubsub import Publisher
+import wx.lib.pubsub.setuparg1
+from wx.lib.pubsub.core import Publisher
###
@@ -69,11 +70,13 @@
media_old_name='old_name'
media_new_name='new_name'
+my_publisher = Publisher()
+
def subscribe(listener, topic):
-Publisher.subscribe(listener, topic)
+my_publisher.subscribe(listener, topic)
def unsubscribe(listener):
-Publisher.unsubscribe(listener)
+my_publisher.unsubscribe(listener)
def publish(topic, data=None):
-Publisher.sendMessage(topic, data)
+my_publisher.sendMessage(topic, data)
Author: Andreas Tille ti...@debian.org
Last-Update: Sat, 06 Sep 2014 15:57:29 +0200
Bug-Debian: http://bugs.debian.org/759056
Description: Further patches not applied by wx-migration-tool from
http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git
--- a/dicompyler/baseplugins/anonymize.py
+++ b/dicompyler/baseplugins/anonymize.py
@@ -10,7 +10,9 @@
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
import os, threading
from dicompyler import guiutil, util
--- a/dicompyler/baseplugins/treeview.py
+++ b/dicompyler/baseplugins/treeview.py
@@ -13,7 +13,9 @@ logger = logging.getLogger('dicompyler.t
import threading, Queue
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
from wx.gizmos import TreeListCtrl as tlc
from dicompyler import guiutil, util
import dicom
--- a/dicompyler/plugin.py
+++ b/dicompyler/plugin.py
@@ -12,7 +12,9 @@ logger = logging.getLogger('dicompyler.p
import imp, os
import wx
from wx.xrc import *
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
from dicompyler import guiutil, util
def import_plugins(userpath=None):
--- a/dicompyler/baseplugins/quickopen.py
+++ b/dicompyler/baseplugins/quickopen.py
@@ -11,7 +11,9 @@
import logging
logger = logging.getLogger('dicompyler.quickimport')
import wx
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
from dicompyler import dicomparser, util
import dicom
--- a/dicompyler/baseplugins/2dview.py
+++ b/dicompyler/baseplugins/2dview.py
@@ -10,7 +10,9 @@
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
from matplotlib import _cntr as cntr
from matplotlib import __version__ as mplversion
import numpy as np
--- a/dicompyler/baseplugins/dvh.py
+++ b/dicompyler/baseplugins/dvh.py
@@ -12,7 +12,9 @@
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
from dicompyler import guiutil, util
from dicompyler import dvhdata, guidvh
from dicompyler import wxmpl
--- a/dicompyler/dicomgui.py
+++ b/dicompyler/dicomgui.py
@@ -15,7 +15,9 @@ logger = logging.getLogger('dicompyler.d
import hashlib, os, threading
import wx
from wx.xrc import *
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
import numpy as np
from dicompyler import dicomparser, dvhdoses, guiutil, util
--- a/dicompyler/guiutil.py
+++ b/dicompyler/guiutil.py
@@ -10,7 +10,9 @@
import util
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
+import wx.lib.pubsub.setuparg1
+import wx.lib.pubsub.core
+pub = wx.lib.pubsub.core.Publisher()
def IsMSWindows():
Are we running on Windows?
--- a/dicompyler/main.py
+++ b/dicompyler/main.py
@@ -20,7 +20,9 @@ from wx.xrc import *
import wx.lib.dialogs, webbrowser
# Uncomment line to setup pubsub for frozen targets on wxPython
Bug#718154: unreproducible (re: psychopy: FTBFS: Tests failed)
Control: tags -1 -unreproducible On Thu, Oct 10, 2013 at 10:11:04PM +0900, Hideki Yamane wrote: I can't reproduce this bug under cowbuilder amd64 (both baremetal and KVM). see attached build log. It's completely reproducible if you use sbuild (it happens when rebuilding on my machine). The important difference is that sbuild sets HOME=/sbuild-nonexistent - see the User Environment: http://aws-logs.debian.net/ftbfs-logs/2013/07/26/psychopy_1.77.02.dfsg-1_unstable.log I'm not very familiar with cowbuilder, but if there's a way to set environment variables for the build with it, try setting HOME to a non-existent directory. Or add this near the start of debian/rules: export HOME=/sbuild-nonexistent A simple fix is probably to create a temporary directory and point HOME to it while running tests. That should fix the build with sbuild and is much better for reproducible tests than using someone's actual home directory. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759090: psychopy: Patch for wxPython 3.0
Control: tags 759090 + patch Attached is a patch for wxPython 3.0. I successfully built the package with DEB_BUILD_OPTIONS=nocheck (build time tests fail with sbuild due to #718154), and it seems to run OK, though I'm not familiar with it and it seems quite complex so testing by a habitual user would be better. Let me know if you'd like me to NMU this patch, along with a fix for #718154 if I can manage one. Cheers, Olly diff -Nru psychopy-1.79.00+git16-g30c9343.dfsg/debian/changelog psychopy-1.79.00+git16-g30c9343.dfsg/debian/changelog --- psychopy-1.79.00+git16-g30c9343.dfsg/debian/changelog 2013-12-21 14:39:17.0 -0300 +++ psychopy-1.79.00+git16-g30c9343.dfsg/debian/changelog 2014-09-11 21:40:50.0 -0300 @@ -1,3 +1,11 @@ +psychopy (1.79.00+git16-g30c9343.dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Update for wxPython 3.0 (Closes: #759090): +- New patch: wxpython3.0.patch + + -- Olly Betts o...@survex.com Fri, 12 Sep 2014 00:40:28 + + psychopy (1.79.00+git16-g30c9343.dfsg-1) unstable; urgency=low * New release (+ post-release fixes) diff -Nru psychopy-1.79.00+git16-g30c9343.dfsg/debian/control psychopy-1.79.00+git16-g30c9343.dfsg/debian/control --- psychopy-1.79.00+git16-g30c9343.dfsg/debian/control 2013-12-21 14:39:17.0 -0300 +++ psychopy-1.79.00+git16-g30c9343.dfsg/debian/control 2014-09-11 21:32:56.0 -0300 @@ -10,7 +10,7 @@ xvfb, xauth, libgl1-mesa-dri, python-pyglet, python-pygame, python-opengl, python-scipy, python-matplotlib, python-lxml, - python-configobj, python-imaging, python-openpyxl, python-mock, python-wxgtk2.8, libavbin0, python-pyo, + python-configobj, python-imaging, python-openpyxl, python-mock, python-wxgtk3.0, libavbin0, python-pyo, python-pytest, Vcs-Git: git://git.debian.org/git/pkg-exppsy/psychopy.git Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/psychopy.git @@ -25,7 +25,7 @@ python-numpy, python-scipy, python-matplotlib, python-lxml, python-configobj -Recommends: python-wxgtk2.8, +Recommends: python-wxgtk3.0, python-pyglet, python-pygame, python-openpyxl, python-imaging, diff -Nru psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/series psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/series --- psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/series 2013-12-21 14:39:17.0 -0300 +++ psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/series 2014-09-11 21:38:51.0 -0300 @@ -1,3 +1,4 @@ deb_do_not_regenerate_init deb_use_system_serial update_matplotlib_test +wxpython3.0.patch diff -Nru psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/wxpython3.0.patch psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/wxpython3.0.patch --- psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300 +++ psychopy-1.79.00+git16-g30c9343.dfsg/debian/patches/wxpython3.0.patch 2014-09-11 22:07:20.0 -0300 @@ -0,0 +1,430 @@ +Description: Update for wxPython 3.0 + These changes should remain compatible with wxPython 2.8. +Bug-Debian: https://bugs.debian.org/759090 +Forwarded: no +Last-Update: 2014-09-11 + +Index: psychopy-1.79.00+git16-g30c9343.dfsg/psychopy/app/builder/builder.py +=== +--- psychopy-1.79.00+git16-g30c9343.dfsg.orig/psychopy/app/builder/builder.py psychopy-1.79.00+git16-g30c9343.dfsg/psychopy/app/builder/builder.py +@@ -23,17 +23,17 @@ from psychopy.app.builder import validat + from psychopy.constants import * + + canvasColor=[200,200,200]#in prefs? ;-) +-routineTimeColor=wx.Color(50,100,200, 200) +-staticTimeColor=wx.Color(200,50,50, 100) +-nonSlipFill=wx.Color(150,200,150, 255) +-nonSlipEdge=wx.Color(0,100,0, 255) +-relTimeFill=wx.Color(200,150,150, 255) +-relTimeEdge=wx.Color(200,50,50, 255) +-routineFlowColor=wx.Color(200,150,150, 255) +-darkgrey=wx.Color(65,65,65, 255) +-white=wx.Color(255,255,255, 255) +-darkblue=wx.Color(30,30,150, 255) +-codeSyntaxOkay=wx.Color(220,250,220, 255) # light green ++routineTimeColor=wx.Colour(50,100,200, 200) ++staticTimeColor=wx.Colour(200,50,50, 100) ++nonSlipFill=wx.Colour(150,200,150, 255) ++nonSlipEdge=wx.Colour(0,100,0, 255) ++relTimeFill=wx.Colour(200,150,150, 255) ++relTimeEdge=wx.Colour(200,50,50, 255) ++routineFlowColor=wx.Colour(200,150,150, 255) ++darkgrey=wx.Colour(65,65,65, 255) ++white=wx.Colour(255,255,255, 255) ++darkblue=wx.Colour(30,30,150, 255) ++codeSyntaxOkay=wx.Colour(220,250,220, 255) # light green + + # regular expression to check for unescaped '$' to indicate code: + _unescapedDollarSign_re = re.compile(r^\$|[^\\]\$) +@@ -282,9 +282,9 @@ class FlowPanel(wx.ScrolledWindow): + self.btnInsertRoutine = platebtn.PlateButton(self,-1,'Insert Routine ', pos=(10,10)) + self.btnInsertLoop = platebtn.PlateButton(self,-1,'Insert
Bug#759074: pyserial: Patch for wxPython 3.0
Control: tags 759074 + patch
I've rebuilt pyserial with the attached patch, and tested both:
python /usr/share/doc/python-serial/examples/wxSerialConfigDialog.py
python /usr/share/doc/python-serial/examples/wxTerminal.py
I don't have anything on a serial port to connect a terminal to, so I couldn't
actually open a terminal, but the UIs seem to work aside from that.
Cheers,
Olly
diff -u pyserial-2.6/debian/control pyserial-2.6/debian/control
--- pyserial-2.6/debian/control
+++ pyserial-2.6/debian/control
@@ -11,7 +11,7 @@
Package: python-serial
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
-Suggests: python-wxgtk2.8 | python-wxgtk
+Suggests: python-wxgtk3.0 | python-wxgtk
XB-Python-Version: ${python:Versions}
Description: pyserial - module encapsulating access for the serial port
This module encapsulates the access for the serial port. It provides
@@ -22,7 +22,7 @@
Package: python3-serial
Architecture: all
Depends: ${python3:Depends}, ${misc:Depends}
-Suggests: python3-wxgtk2.8 | python3-wxgtk
+Suggests: python3-wxgtk3.0 | python3-wxgtk
XB-Python-Version: ${python3:Versions}
Description: pyserial - module encapsulating access for the serial port
This module encapsulates the access for the serial port. It provides
diff -u pyserial-2.6/debian/changelog pyserial-2.6/debian/changelog
--- pyserial-2.6/debian/changelog
+++ pyserial-2.6/debian/changelog
@@ -1,3 +1,14 @@
+pyserial (2.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0, Closes: #759074:
+- debian/control: Update dependencies.
+- examples/wxSerialConfigDialog.py,examples/wxTerminal.py: Drop calls to
+ wx.InitAllImageHandlers() which is a no-op for 2.8 and gives a
+ deprecation warning with 3.0. Update deprecated wx.SAVE to wx.FD_SAVE.
+
+ -- Olly Betts o...@survex.com Fri, 12 Sep 2014 02:10:04 +
+
pyserial (2.6-1) unstable; urgency=low
* New upstream version. Closes: #664788.
only in patch2:
unchanged:
--- pyserial-2.6.orig/examples/wxSerialConfigDialog.py
+++ pyserial-2.6/examples/wxSerialConfigDialog.py
@@ -229,8 +229,6 @@
class MyApp(wx.App):
Test code
def OnInit(self):
-wx.InitAllImageHandlers()
-
ser = serial.Serial()
print ser
#loop until cancel is pressed, old values are used as start for the next run
only in patch2:
unchanged:
--- pyserial-2.6.orig/examples/wxTerminal.py
+++ pyserial-2.6/examples/wxTerminal.py
@@ -202,7 +202,7 @@
def OnSaveAs(self, event):
Save contents of output window.
filename = None
-dlg = wx.FileDialog(None, Save Text As..., ., , Text File|*.txt|All Files|*, wx.SAVE)
+dlg = wx.FileDialog(None, Save Text As..., ., , Text File|*.txt|All Files|*, wx.FD_SAVE)
if dlg.ShowModal() == wx.ID_OK:
filename = dlg.GetPath()
dlg.Destroy()
@@ -320,7 +320,6 @@
class MyApp(wx.App):
def OnInit(self):
-wx.InitAllImageHandlers()
frame_terminal = TerminalFrame(None, -1, )
self.SetTopWindow(frame_terminal)
frame_terminal.Show(1)
Bug#759067: rurple-ng: Patch for wxWidgets3.0
Control: tags 759067 + patch
I've rebuilt rurple-ng with the attached patch and it seems to work.
The only issue I saw was that Help-About does nothing in the GUI,
but if run from a terminal you get this:
Traceback (most recent call last):
File /usr/share/rurple-ng/rurple/ui.py, line 460, in OnAbout
with open(share.path(COPYING.txt)) as f:
IOError: [Errno 2] No such file or directory:
u'/usr/share/rurple-ng/share/COPYING.txt'
However the same is true of the package in unstable currently, so
this seems to be orthogonal to the wxPython transition.
Happy to NMU this change - just say if you'd like me to.
Cheers,
Olly
diff -Nru rurple-ng-0.5+16/debian/changelog rurple-ng-0.5+16/debian/changelog
--- rurple-ng-0.5+16/debian/changelog 2013-10-09 13:18:00.0 -0300
+++ rurple-ng-0.5+16/debian/changelog 2014-09-10 21:10:44.0 -0300
@@ -1,3 +1,11 @@
+rurple-ng (0.5+16-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759067):
++ New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Thu, 11 Sep 2014 00:10:22 +
+
rurple-ng (0.5+16-1) unstable; urgency=low
* Initial release. (Closes: #693069)
diff -Nru rurple-ng-0.5+16/debian/control rurple-ng-0.5+16/debian/control
--- rurple-ng-0.5+16/debian/control 2013-10-09 15:00:07.0 -0300
+++ rurple-ng-0.5+16/debian/control 2014-09-10 21:08:27.0 -0300
@@ -8,7 +8,7 @@
Package: rurple-ng
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.8
+Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk3.0
Description: learn programming in Python with a robot
Rurple-ng is a rewrite of RUR-PLE[1], a programming learning environment. The
student learns programming concepts by controling a robot. The original
diff -Nru rurple-ng-0.5+16/debian/patches/series rurple-ng-0.5+16/debian/patches/series
--- rurple-ng-0.5+16/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ rurple-ng-0.5+16/debian/patches/series 2014-09-10 21:09:31.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru rurple-ng-0.5+16/debian/patches/wxpython3.0.patch rurple-ng-0.5+16/debian/patches/wxpython3.0.patch
--- rurple-ng-0.5+16/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ rurple-ng-0.5+16/debian/patches/wxpython3.0.patch 2014-09-10 21:10:16.0 -0300
@@ -0,0 +1,35 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/759067
+Forwarded: no
+Last-Update: 2014-09-10
+
+--- rurple-ng-0.5+16.orig/rurple/ui.py
rurple-ng-0.5+16/rurple/ui.py
+@@ -137,7 +137,7 @@ class Openable(object):
+ dlg = wx.FileDialog(self._ui,
+ message=Open %s... % self._type,
+ wildcard=self._wildcard,
+-style = wx.OPEN | wx.CHANGE_DIR)
++style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() != wx.ID_OK:
+ return
+ path = self._suffixPath(dlg.GetPath())
+@@ -157,7 +157,7 @@ class Openable(object):
+ dlg = wx.FileDialog(self._ui,
+ message=Open sample %s... % self._type,
+ wildcard=self._wildcard,
+-defaultDir = share.path(self._type + s), style = wx.OPEN)
++defaultDir = share.path(self._type + s), style = wx.FD_OPEN)
+ if dlg.ShowModal() != wx.ID_OK:
+ return
+ path = self._suffixPath(dlg.GetPath())
+@@ -183,7 +183,7 @@ class Openable(object):
+ dlg = wx.FileDialog(self._ui,
+ message=Save %s as... % self._type,
+ wildcard=self._wildcard,
+-style = wx.SAVE | wx.CHANGE_DIR)
++style = wx.FD_SAVE | wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() != wx.ID_OK:
+ return False
+ path = self._suffixPath(dlg.GetPath())
Bug#761140: pytimechart fails to start
Package: pytimechart Version: 1.0.0~rc1-3 Severity: grave Justification: renders package unusable I installed pytimechart, and tried to run it but it fails with this error: $ pytimechart Traceback (most recent call last): File /usr/bin/pytimechart, line 5, in module from pkg_resources import load_entry_point File /usr/lib/python2.7/dist-packages/pkg_resources.py, line 2876, in module working_set = WorkingSet._build_master() File /usr/lib/python2.7/dist-packages/pkg_resources.py, line 449, in _build_master ws.require(__requires__) File /usr/lib/python2.7/dist-packages/pkg_resources.py, line 745, in require needed = self.resolve(parse_requirements(requirements)) File /usr/lib/python2.7/dist-packages/pkg_resources.py, line 639, in resolve raise DistributionNotFound(req) pkg_resources.DistributionNotFound: PIL The python-pil package *is* installed: $ dpkg -l python-pil Desired=Unknown/Install/Remove/Purge/Hold | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) ||/ Name Version Architecture Description +++-==---= ii python-pil:amd 2.5.3-1 amd64Python Imaging Library (Pillow fo Cheers, Olly -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.14-2-amd64 (SMP w/8 CPU cores) Locale: LANG=en_NZ.UTF-8, LC_CTYPE=en_NZ.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages pytimechart depends on: ii python2.7.8-1 ii python-chaco 4.4.1-1.1 ii python-enthoughtbase 3.1.0-2 ii python-gtk2 2.24.0-4 ii python-wxgtk2.8 2.8.12.1+dfsg2-2 pytimechart recommends no packages. pytimechart suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759068: pytimechart: Patch for wxPython 3.0
Control: tags 759068 + patch
Dear maintainer,
Here's a patch to update pytimechart for wxPython 3.0.
I'm unable to test these changes, as pytimechart fails with an error
when run (even in the existing package in unstable - I've filed that
as #761140).
Cheers,
Olly
diff -Nru pytimechart-1.0.0~rc1/debian/changelog pytimechart-1.0.0~rc1/debian/changelog
--- pytimechart-1.0.0~rc1/debian/changelog 2012-08-16 20:15:27.0 -0300
+++ pytimechart-1.0.0~rc1/debian/changelog 2014-09-10 21:52:26.0 -0300
@@ -1,3 +1,11 @@
+pytimechart (1.0.0~rc1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759068):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Thu, 11 Sep 2014 00:52:01 +
+
pytimechart (1.0.0~rc1-3) unstable; urgency=high
[ Andrew Starr-Bochicchio ]
diff -Nru pytimechart-1.0.0~rc1/debian/control pytimechart-1.0.0~rc1/debian/control
--- pytimechart-1.0.0~rc1/debian/control 2012-08-16 20:08:48.0 -0300
+++ pytimechart-1.0.0~rc1/debian/control 2014-09-10 21:50:41.0 -0300
@@ -13,7 +13,7 @@
Package: pytimechart
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-enthoughtbase, python-chaco, python-wxgtk2.8, python-gtk2
+ python-enthoughtbase, python-chaco, python-wxgtk3.0, python-gtk2
XB-Python-Version: ${python:Versions}
Description: GUI Viewer for Linux kernel traces
PyTimechart provides explorability and overall visualization of Linux
diff -Nru pytimechart-1.0.0~rc1/debian/patches/series pytimechart-1.0.0~rc1/debian/patches/series
--- pytimechart-1.0.0~rc1/debian/patches/series 2011-11-14 00:30:07.0 -0300
+++ pytimechart-1.0.0~rc1/debian/patches/series 2014-09-10 21:51:16.0 -0300
@@ -1 +1,2 @@
ETS4_api.diff
+wxpython3.0.patch
diff -Nru pytimechart-1.0.0~rc1/debian/patches/wxpython3.0.patch pytimechart-1.0.0~rc1/debian/patches/wxpython3.0.patch
--- pytimechart-1.0.0~rc1/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ pytimechart-1.0.0~rc1/debian/patches/wxpython3.0.patch 2014-09-10 21:51:55.0 -0300
@@ -0,0 +1,26 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/759068
+Forwarded: no
+Last-Update: 2014-09-10
+
+--- pytimechart-1.0.0~rc1.orig/timechart/window.py
pytimechart-1.0.0~rc1/timechart/window.py
+@@ -103,7 +103,7 @@ prof = 0
+
+ import wx
+ def open_dialog():
+-dlg = wx.FileDialog(None, Choose a file, , , *.txt;*.gz;*.lzma;*.dat, wx.OPEN)
++dlg = wx.FileDialog(None, Choose a file, , , *.txt;*.gz;*.lzma;*.dat, wx.FD_OPEN)
+ rv = None
+ if dlg.ShowModal() == wx.ID_OK:
+ filename=dlg.GetFilename()
+@@ -114,7 +114,7 @@ def open_dialog():
+ return rv
+
+ def save_dialog():
+-dlg = wx.FileDialog(None, Save file..., , , *.txt, wx.SAVE)
++dlg = wx.FileDialog(None, Save file..., , , *.txt, wx.FD_SAVE)
+ rv = None
+ if dlg.ShowModal() == wx.ID_OK:
+ filename=dlg.GetFilename()
Bug#759069: gastables: Patch for wxPython 3.0
Control: tags 759069 + patch
I've rebuilt gastables with the attached patch and done some simple
testing.
I'm not familiar with the calculations it is doing, but the UI seems
to operate correctly.
If you prefer, I'm happy to NMU these changes.
Cheers,
Olly
diff -Nru gastables-0.3/debian/changelog gastables-0.3/debian/changelog
--- gastables-0.3/debian/changelog 2013-05-28 04:21:25.0 -0300
+++ gastables-0.3/debian/changelog 2014-09-10 22:23:11.0 -0300
@@ -1,3 +1,11 @@
+gastables (0.3-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759069):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Thu, 11 Sep 2014 01:22:34 +
+
gastables (0.3-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru gastables-0.3/debian/control gastables-0.3/debian/control
--- gastables-0.3/debian/control 2013-05-28 04:20:11.0 -0300
+++ gastables-0.3/debian/control 2014-09-10 22:13:49.0 -0300
@@ -13,7 +13,7 @@
Package: gastables
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-gastables, python-wxgtk2.8, python-matplotlib
+ python-gastables, python-wxgtk3.0, python-matplotlib
Description: graphical user interface for compressible flow gas table modules
Gas Tables include modules for compressible gas flow
calculations. The main modules currently included are:
diff -Nru gastables-0.3/debian/patches/series gastables-0.3/debian/patches/series
--- gastables-0.3/debian/patches/series 2009-11-26 18:10:04.0 -0300
+++ gastables-0.3/debian/patches/series 2014-09-10 22:21:49.0 -0300
@@ -1 +1,2 @@
exit_menu.diff
+wxpython3.0.patch
diff -Nru gastables-0.3/debian/patches/wxpython3.0.patch gastables-0.3/debian/patches/wxpython3.0.patch
--- gastables-0.3/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ gastables-0.3/debian/patches/wxpython3.0.patch 2014-09-10 22:28:06.0 -0300
@@ -0,0 +1,28 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/759069
+Forwarded: no
+Last-Update: 2014-09-10
+
+Index: gastables-0.3/gui/gastables
+===
+--- gastables-0.3.orig/gui/gastables
gastables-0.3/gui/gastables
+@@ -58,7 +58,7 @@ ID_Isothermal = wx.NewId()
+ ID_PrandtlMeyer = wx.NewId()
+
+ # colours used in status bar
+-RED = wx.Color(200,100,0)
++RED = wx.Colour(200,100,0)
+
+ class GasTables(wx.Frame):
+ def __init__(self, parent, ID, title):
+@@ -466,6 +466,8 @@ class GasTables(wx.Frame):
+
+ class GasTablesGUI(wx.App):
+ def OnInit(self):
++# Suppress WXDEBUG assertions, as happens by default with wx2.8.
++self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
+ frame = GasTables(None, -1, TITLE)
+ frame.Show(True)
+ self.SetTopWindow(frame)
Bug#707268: Bug#740085: Bug#725957: [NMU] Bug#740085: package plplot 5.10.0
[I've dropped rafael@d.o from CC as that just bounced for me last time] On Mon, Sep 08, 2014 at 11:20:45AM +0200, Thibaut Paumard wrote: I have had to withdraw due to unexpected events. The package in mentors does not build anymore (I should check about the package in unstable, no time right now), due to the hdf5 transition. I've told Andrew last week about this. According to #736392, plplot FTBFS in unstable for other reasons. This can be fixed by removing the bits that check for hdf5.h in cmake/modules/octave.cmake (see attached patch) and adding the right flags to CPPFLAGS in debian/rules: CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) \ $(shell mkoctfile -p INCFLAGS) Of course, there must be a less brutal solution. Looks like you failed to attach that patch (something I know from experience is all too easy to do). I'm also considering uploading myself, but unless Andrew fixes this FTBFS, this will have to be half sponsoring, half NMUing. It'd be really great to get an upload soon, so there's time before the freeze to shake out any new issues - if Andrew's actively on the case, that's great, but if he's currently too busy, an NMU is clearly justified by the 5 RC bugs (+1 if the hdf5 FTBFS were filed) it would fix. Any comments from Andrew on the hdf5 fix would certainly be appreciated though. I'm happy to sponsor or NMU if nobody more connected to the package is able to. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#749659: audacity + wxWidgets 3.0 — Proposing patch
Control: severity -1 serious On Mon, Sep 08, 2014 at 10:12:37PM -0400, Reinhard Tartler wrote: I wonder what's the status of this bug. The most recent email did not help to clarify, so I test-compiled wx3.0.patch as proposed in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749659#35, and can confirm that the package builds fine. However, I noticed this in configure.log: checking for wx-config... /usr/bin/wx-config configure: Checking that the chosen version of wxWidgets is 2.8.x or 3.0.x Great, you're using wxWidgets 2.8.12! I guess that is because the build dependencies needs updating. So I guess given that the proposed patch to the package is incomplete at best, I've removed the patch tag, as clearly more clarification is needed. Olly, I noticed that you raised the severity of this bug to Serious without further explanation. Can you please elaborate here? Justification was in the mail which updated the severity: # blocks the on-going wxwidgets3.0 transition severity 749659 serious thanks You can see that from the BTS if you click on the Full text link: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=30;bug=749659 https://wiki.debian.org/Teams/ReleaseTeam/Transitions says to use severity serious once the transition starts, which it officially did on 2014-05-27: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=24;bug=748169 This situation claims that audacity should be removed from testing because of this issue. Is this really your intention? Very much so - the wxwidgets3.0 transition is close to complete and audacity is one of the stragglers: https://release.debian.org/transitions/html/wxwidgets3.0.html In fact, it's the only one still in testing, which is only because it is on the list which autorm won't touch due to popcon score. Of those, grass has an somewhat bogus build dependency (it really wants to check the wxPython version, so should do that directly) and 5 more the maintainer has said to remove. Of the remaining 8, most have a fix in progress. The wxwidgets transition tracking bug seems to be https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748169. Given that the transition did not start before the September 5, I think it is fair to assume that this transition is not going to happen for Debian/jessie, and that it is also appropriate to downgrade the severity of this bug. I don't see where you get September from - the last update to that bug was in August... As above, it officially started back in May, though I've been working on it since October last year. Please correct me and clarify if I got something wrong, but AFAIUI, there are no reason for pressing on this bug because jessie will ship with wxWidgets 2.8. Martin, may I recommend you getting in touch with upstream about this patch? I suppose the release team have the final say, but my intention is that jessie will not ship with wxwidgets2.8. It is a large and complex library, and now unmaintained upstream. Even before 3.0 was released, 2.8 was neglected - the last release was 2011-03-28. So by the time jessie releases, wx2.8 will be close to 4 years old. By the EOL of jessie (assuming no LTS), it'll be close to 6 years old. And given (thanks to Martin's superlative efforts) we have a patch for audacity, why are we even having this discussion? Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#749659: audacity + wxWidgets 3.0 — Proposing patch
On Tue, Sep 09, 2014 at 12:43:26PM +0200, Martin Steghöfer wrote: So we're basically waiting for a maintainer to incorporate the patches (including the modification) in the package, update the build dependencies and upload the whole thing. Olly proposed to NMU the package, but there was no reaction from any of the maintainers so far. If it helps, I can post a new version of the patch including Olly's proposed change. Would that help? That would be very useful - then it will be clearer exactly what the currently proposed changes are. The maintainers should also decide if they want to accept the configure script patch or if they want to modify the package so autoconf automatically recreates them. Bottom-line: The main work is done, but in order to move forward we need some attention from the maintainers. If the maintainers aren't actively working on this, we should NMU. Getting the updated package uploaded soon means there's time for shaking out any resulting issues before the freeze. After the release freeze, any fixes will have to get an explicit OK from the release team. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#745887: libwxgtk3.0-0: Please enable support for libnotify
On Tue, Sep 09, 2014 at 07:17:53PM +0200, Christian Beier wrote: I've built two versions of the library, one with libnotify support and one without. Turns out that --with-libnotify is enabled by default and only libnotify-dev needs to be added to the build-deps to get libnotify notifications. The abi-compliance-checker tool (http://ispras.linuxbase.org/index.php/ABI_compliance_checker) reported no problems between the two versions, fine so far. Can you show the report from checking with the inputs switched? I.e. the result of upgrading from using libnotify to not. That should show us all the symbols which get added by turning on libnotify, which would be useful to know. Other way round it doesn't work: the dialogs binary built against libnotify-wx does not run with generic-notification-wx, I get a ./dialogs: relocation error: ./dialogs: symbol _ZTV21wxNotificationMessage, version WXU_3.0 not defined in file libwx_gtk2u_adv-3.0.so.0 with link time reference which is acceptable since we're moving the other direction... That does sound promising. We just need to make sure packages compiled against the newer library will get a suitable = dependency, which I think we can with a suitable shlibs file, though I've never tried to do so before. Thanks for looking into this - if it's actually possible to do, I'll try to ensure it gets in before the freeze. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#745887: libwxgtk3.0-0: Please enable support for libnotify
On Tue, Sep 09, 2014 at 07:17:53PM +0200, Christian Beier wrote: Results: Binary compiled against generic-notification-wx also runs fine on libnotify-wx, though it shows the generic notifications still. A recompile yielded libnotify notifications. This means we should try to recompile the rdeps which use this feature (though not vital if we can set the shlibs up correctly). Judging from codesearch.debian.net results, it seems that's only wxpython3.0, libwx-perl, and (not sure if this really does) libwx-scintilla-perl. And the only package actually using them (via wxpython3.0) seems to be pyhoca-gui, but from the code, it looks like it probably uses pynotify on Linux instead. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#744115: codeblocks is marked for autoremoval from testing
On Tue, Aug 26, 2014 at 03:55:19PM +1200, Olly Betts wrote: On Tue, Jul 01, 2014 at 02:33:51PM -0700, Vincent Cheng wrote: according to the forwarded bug report, it sounds like upstream is going to take a look at this. There's been no update on the upstream ticket for ages, so I've pinged it to see if they have made a decision on whether to make a new major release with wx3 compatibility. It's been 2 weeks and no response from upstream. This is now one of 7 packages remaining in the wxwidgets3.0 transition, and most of those have a fix in progress. We really need to move things forwards if codeblocks is to make it into jessie. Maintainers - I think it's time to just make a call on this from the Debian side, unless you have connections with upstream which can get you an answer where I can't seem to. Would you rather package a snapshot from the upstream VCS, or try to patch the currently packaged release for wx3? We have a patch for the latter, but Vincent reported some issues with it (which I've not tried to reproduce myself, but I could take a look if you want to go that route). Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759092: python-pyo: Supplementary patch for wxPython 3.0
Control: notfixed -1 0.7.2
Control: found -1 0.7.2
Control: tag -1 + patch
Dear maintainer,
While working on a patch for soundgrain (which I'll send in shortly), I noticed
that python-pyo needs some further updates for wxPython 3.0. I've attached a
debdiff.
The FD_ prefixing isn't vital for 3.0, but it works with 2.8 and 3.0, and the
old names are deprecated (and removed from the C++ API), so it's a sensible
update to make for future compatibility.
If you'd like me to NMU these changes, just let me know.
Cheers,
Olly
diff -Nru python-pyo-0.7/debian/changelog python-pyo-0.7/debian/changelog
--- python-pyo-0.7/debian/changelog 2014-08-30 21:14:41.0 -0300
+++ python-pyo-0.7/debian/changelog 2014-09-09 17:18:26.0 -0300
@@ -1,3 +1,14 @@
+python-pyo (0.7-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix deprecation warnings with wxPython 3.0.
+ * Fix check for wxPython not to insist that 2.8 is installed before picking
+something that's 2.8 or newer.
+ * Update uses of removed alias wx.Color to wx.Colour.
+ * Update FileDialog flags to use the non-deprecated FD_ prefixed form.
+
+ -- Olly Betts o...@survex.com Tue, 09 Sep 2014 20:16:21 +
+
python-pyo (0.7-2) unstable; urgency=low
* Depends on python-wxgtk3.0 instead of python-wxgtk2.8 to have the
diff -Nru python-pyo-0.7/debian/patches/01-epyo_paths python-pyo-0.7/debian/patches/01-epyo_paths
--- python-pyo-0.7/debian/patches/01-epyo_paths 2014-08-30 18:11:38.0 -0300
+++ python-pyo-0.7/debian/patches/01-epyo_paths 2014-09-09 17:16:16.0 -0300
@@ -1,5 +1,7 @@
a/utils/E-Pyo.py
-+++ b/utils/E-Pyo.py
+Index: python-pyo-0.7/utils/E-Pyo.py
+===
+--- python-pyo-0.7.orig/utils/E-Pyo.py
python-pyo-0.7/utils/E-Pyo.py
@@ -210,7 +210,7 @@
elif WIN_APP_BUNDLED:
EXAMPLE_PATH = os.path.join(os.getcwd(), Resources, examples)
diff -Nru python-pyo-0.7/debian/patches/series python-pyo-0.7/debian/patches/series
--- python-pyo-0.7/debian/patches/series 2014-08-30 18:11:38.0 -0300
+++ python-pyo-0.7/debian/patches/series 2014-09-07 15:17:51.0 -0300
@@ -1 +1,2 @@
01-epyo_paths
+wxpython3.0.patch
diff -Nru python-pyo-0.7/debian/patches/wxpython3.0.patch python-pyo-0.7/debian/patches/wxpython3.0.patch
--- python-pyo-0.7/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ python-pyo-0.7/debian/patches/wxpython3.0.patch 2014-09-07 15:48:16.0 -0300
@@ -0,0 +1,131 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Forwarded: no
+Last-Update: 2014-09-07
+
+Index: python-pyo-0.7/pyolib/_widgets.py
+===
+--- python-pyo-0.7.orig/pyolib/_widgets.py
python-pyo-0.7/pyolib/_widgets.py
+@@ -29,10 +29,11 @@ except:
+ WITH_PIL = False
+
+ try:
+-import wxversion
+-if (wxversion.checkInstalled(2.8)):
++if 'wx' not in sys.modules:
++# Don't try to load if already loaded.
++import wxversion
+ wxversion.ensureMinimal(2.8)
+-import wx
++import wx
+ from _wxwidgets import *
+ PYO_USE_WX = True
+ except:
+Index: python-pyo-0.7/pyolib/_wxwidgets.py
+===
+--- python-pyo-0.7.orig/pyolib/_wxwidgets.py
python-pyo-0.7/pyolib/_wxwidgets.py
+@@ -143,8 +143,8 @@ def powOfTwoToInt(x):
+ return POWOFTWO[x]
+
+ def GetRoundBitmap( w, h, r ):
+-maskColor = wx.Color(0,0,0)
+-shownColor = wx.Color(5,5,5)
++maskColor = wx.Colour(0,0,0)
++shownColor = wx.Colour(5,5,5)
+ b = wx.EmptyBitmap(w,h)
+ dc = wx.MemoryDC(b)
+ dc.SetBrush(wx.Brush(maskColor))
+Index: python-pyo-0.7/utils/E-Pyo.py
+===
+--- python-pyo-0.7.orig/utils/E-Pyo.py
python-pyo-0.7/utils/E-Pyo.py
+@@ -2250,7 +2250,7 @@ class MainFrame(wx.Frame):
+ def saveListPaste(self, evt):
+ if self.pastingList != []:
+ dlg = wx.FileDialog(self, message=Save file as ...,
+-defaultDir=os.path.expanduser('~'), style=wx.SAVE)
++defaultDir=os.path.expanduser('~'), style=wx.FD_SAVE)
+ if dlg.ShowModal() == wx.ID_OK:
+ path = ensureNFD(dlg.GetPath())
+ with open(path, w) as f:
+@@ -2258,7 +2258,7 @@ class MainFrame(wx.Frame):
+
+ def loadListPaste(self, evt):
+ dlg = wx.FileDialog(self, message=Choose a file,
+-defaultDir=os.path.expanduser(~), style=wx.OPEN)
++defaultDir=os.path.expanduser(~), style=wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath()
+ self.pastingList = []
+@@ -2520,7 +2520,7 @@ class MainFrame(wx.Frame):
+ def insertPath(self, evt):
+ dlg = wx.FileDialog(self, message=Choose a file
Bug#759055: openstv: Patch for wxPython 3.0
Control: tags 759055 + patch
Dear maintainer,
With the attached patch, openstv builds and seems to work correctly.
I'm happy to NMU this change, just let me know if you'd like me to.
Cheers,
Olly
diff -Nru openstv-1.6.1/debian/changelog openstv-1.6.1/debian/changelog
--- openstv-1.6.1/debian/changelog 2010-06-21 13:44:30.0 -0300
+++ openstv-1.6.1/debian/changelog 2014-09-07 07:25:31.0 -0300
@@ -1,3 +1,10 @@
+openstv (1.6.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0. (Closes: #759055)
+
+ -- Olly Betts o...@survex.com Sun, 07 Sep 2014 10:25:31 +
+
openstv (1.6.1-1) unstable; urgency=low
* New upstream release.
diff -Nru openstv-1.6.1/debian/control openstv-1.6.1/debian/control
--- openstv-1.6.1/debian/control 2010-05-17 16:10:39.0 -0300
+++ openstv-1.6.1/debian/control 2014-09-07 07:25:21.0 -0300
@@ -12,7 +12,7 @@
Package: openstv
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0
Suggests: python-profiler
Description: single transferable vote and instant runoff voting software
OpenSTV is an open-source software for implementing the single transferable
diff -Nru openstv-1.6.1/debian/patches/series openstv-1.6.1/debian/patches/series
--- openstv-1.6.1/debian/patches/series 2010-06-21 13:44:30.0 -0300
+++ openstv-1.6.1/debian/patches/series 2014-09-07 07:26:06.0 -0300
@@ -1 +1,2 @@
setup-package-data.patch
+wxpython3.0.patch
diff -Nru openstv-1.6.1/debian/patches/wxpython3.0.patch openstv-1.6.1/debian/patches/wxpython3.0.patch
--- openstv-1.6.1/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ openstv-1.6.1/debian/patches/wxpython3.0.patch 2014-09-07 07:59:57.0 -0300
@@ -0,0 +1,122 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+ .
+ SetMaxLength() is not valid on multi-line text controls under wxGTK, but
+ the default should be to not limit the length anyway (aside from any limits
+ the underlying platform imposes, which you can't get around anyway).
+Bug-Debian: https://bugs.debian.org/759055
+Forwarded: no
+Last-Update: 2014-09-07
+
+Index: openstv-1.6.1/openstv/BFE.py
+===
+--- openstv-1.6.1.orig/openstv/BFE.py
openstv-1.6.1/openstv/BFE.py
+@@ -58,7 +58,7 @@ class BFEFrame(wx.Frame):
+ # Edit an existing ballot file
+ elif mode == old:
+ dlg = wx.FileDialog(self, Edit Ballot File,
+- style=wx.OPEN|wx.CHANGE_DIR)
++ style=wx.FD_OPEN|wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() != wx.ID_OK:
+ dlg.Destroy()
+ self.Destroy()
+@@ -96,7 +96,6 @@ class BFEFrame(wx.Frame):
+ self.log = wx.TextCtrl(nb, -1,
+style=wx.TE_MULTILINE|wx.TE_READONLY|\
+wx.TE_WORDWRAP|wx.FIXED)
+-self.log.SetMaxLength(0)
+ nb.AddPage(self.log, Log)
+
+ # Initialize
+@@ -158,7 +157,7 @@ class BFEFrame(wx.Frame):
+
+ # Get the filename of the ballots to be appended
+ dlg = wx.FileDialog(self, Select Ballot File,
+-style=wx.OPEN|wx.CHANGE_DIR)
++style=wx.FD_OPEN|wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() != wx.ID_OK:
+ dlg.Destroy()
+ return
+@@ -197,7 +196,7 @@ class BFEFrame(wx.Frame):
+
+ # Ask the user to choose the filename.
+ dlg = wx.FileDialog(self, Save Ballot File,
+-style=wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
++style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT|wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() != wx.ID_OK:
+ dlg.Destroy()
+ return
+@@ -233,7 +232,7 @@ class BFEFrame(wx.Frame):
+
+ def OnSaveLogAs(self, event):
+ dlg = wx.FileDialog(self, Save Log to a File,
+-style=wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
++style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT|wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() != wx.ID_OK:
+ dlg.Destroy()
+ return
+Index: openstv-1.6.1/openstv/OpenSTV.py
+===
+--- openstv-1.6.1.orig/openstv/OpenSTV.py
openstv-1.6.1/openstv/OpenSTV.py
+@@ -181,7 +181,6 @@ class Frame(wx.Frame):
+ self.console = wx.TextCtrl(self.notebook, -1,
+style=wx.TE_MULTILINE|wx.TE_READONLY|\
+wx.TE_WORDWRAP|wx.FIXED|wx.TE_RICH2)
+-self.console.SetMaxLength(0)
+ ps = self.console.GetFont().GetPointSize()
+ font = wx.Font(ps, wx.MODERN, wx.NORMAL, wx.NORMAL)
+ self.console.SetFont(font)
+@@ -383,7 +382,6 @@ to www.OpenSTV.org, or send an email to
+ # create a new notebook page
+ tc = wx.TextCtrl(self.notebook, -1,
+ style=wx.TE_MULTILINE|wx.TE_READONLY
Bug#759058: soundgrain: patch for wxPython 3.0
Control: tags 759058 + patch
Dear maintainer,
The attached patch contains fixes for soundgrain for wxPython 3.0.
I've done some simple testing with one of the sample files from the
package, and everything seems to work well. Without the patch it
crashes on startup with a segmentation fault.
Happy to NMU if you prefer - just let me know.
Cheers,
Olly
diff -Nru soundgrain-4.1.1/debian/changelog soundgrain-4.1.1/debian/changelog
--- soundgrain-4.1.1/debian/changelog 2012-08-15 09:45:58.0 -0300
+++ soundgrain-4.1.1/debian/changelog 2014-09-09 18:09:52.0 -0300
@@ -1,3 +1,11 @@
+soundgrain (4.1.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759058):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Tue, 09 Sep 2014 21:09:48 +
+
soundgrain (4.1.1-2) unstable; urgency=low
* Changes arch to all and build-depends on python-all (= 2.6.6-3~);
diff -Nru soundgrain-4.1.1/debian/control soundgrain-4.1.1/debian/control
--- soundgrain-4.1.1/debian/control 2012-08-15 09:45:58.0 -0300
+++ soundgrain-4.1.1/debian/control 2014-09-07 13:03:06.0 -0300
@@ -13,7 +13,7 @@
Package: soundgrain
Architecture: all
-Depends: python (= 2.6), python-wxgtk2.8, python-pyo, ${misc:Depends}
+Depends: python (= 2.6), python-wxgtk3.0, python-pyo, ${misc:Depends}
Description: Graphical interface to control granular sound synthesis modules
Soundgrain is a graphical interface where users can draw and edit trajectories
to control granular sound synthesis. It is written in Python and WxPython and
diff -Nru soundgrain-4.1.1/debian/patches/series soundgrain-4.1.1/debian/patches/series
--- soundgrain-4.1.1/debian/patches/series 2012-08-15 09:45:58.0 -0300
+++ soundgrain-4.1.1/debian/patches/series 2014-09-07 13:04:47.0 -0300
@@ -1 +1,2 @@
use-distutils.patch
+wxpython3.0.patch
diff -Nru soundgrain-4.1.1/debian/patches/wxpython3.0.patch soundgrain-4.1.1/debian/patches/wxpython3.0.patch
--- soundgrain-4.1.1/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ soundgrain-4.1.1/debian/patches/wxpython3.0.patch 2014-09-09 18:09:44.0 -0300
@@ -0,0 +1,154 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/759058
+Forwarded: no
+Last-Update: 2014-09-07
+
+Index: soundgrain-4.1.1/Resources/FxBall.py
+===
+--- soundgrain-4.1.1.orig/Resources/FxBall.py
soundgrain-4.1.1/Resources/FxBall.py
+@@ -152,8 +152,8 @@ def getColors(col, gradient):
+ return firstColor, secondColor
+
+ def GetRoundMaskBitmap(w, h, radius):
+-maskColor = wx.Color(30,30,30)
+-shownColor = wx.Color(29,29,29)
++maskColor = wx.Colour(30,30,30)
++shownColor = wx.Colour(29,29,29)
+ b = wx.EmptyBitmap(w,h)
+ dc = wx.MemoryDC(b)
+ dc.SetPen(wx.Pen(maskColor, 1))
+@@ -168,7 +168,7 @@ def GetRoundMaskBitmap(w, h, radius):
+
+ def GetRoundBitmap(w, h, mask, col, gradient):
+ firstColor, secondColor = getColors(col, gradient)
+-maskColor = wx.Color(30,30,30)
++maskColor = wx.Colour(30,30,30)
+ b = wx.EmptyBitmap(w,h)
+ dc = wx.MemoryDC(b)
+ dc.SetPen(wx.Pen(maskColor, 1))
+Index: soundgrain-4.1.1/Resources/splash.py
+===
+--- soundgrain-4.1.1.orig/Resources/splash.py
soundgrain-4.1.1/Resources/splash.py
+@@ -63,12 +63,7 @@ class SoundGrainSplashScreen(wx.Frame):
+ dc.DrawRectangle(0,0,w,h)
+ dc.DrawBitmap(self.bmp, 0,0,True)
+ dc.SetTextForeground(#FF)
+-font = dc.GetFont()
+-if PLATFORM == win32:
+-pass
+-else:
+-font.SetFaceName(Monaco)
+-font.SetPixelSize((15,15))
++font = wx.FFontFromPixelSize(pixelSize=(15,15), family=wx.FONTFAMILY_DEFAULT, face=Monaco)
+ dc.SetFont(font)
+ dc.DrawLabel(uOlivier Bélanger, wx.Rect(0, 320, 400, 15), wx.ALIGN_CENTER)
+ dc.DrawLabel(iACT, %s % SG_YEAR, wx.Rect(0, 335, 400, 15), wx.ALIGN_CENTER)
+@@ -80,6 +75,11 @@ class SoundGrainSplashScreen(wx.Frame):
+ self.Destroy()
+
+ if __name__ == '__main__':
+-app = wx.PySimpleApp()
++class MySimpleApp(wx.App):
++def OnInit(self):
++# Suppress WXDEBUG assertions, as happens by default with wx2.8.
++#self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
++return True
++app = MySimpleApp()
+ frame = SoundGrainSplashScreen(None, img=SoundGrainSplash.png)
+ app.MainLoop()
+Index: soundgrain-4.1.1/SoundGrain.py
+===
+--- soundgrain-4.1.1.orig/SoundGrain.py
soundgrain-4.1.1/SoundGrain.py
+@@ -286,12 +286,12 @@ class DrawingSurface(wx.Panel):
+ return self.oscilScaling
+
+ def SetColors(self, outline, bg, fill, rect
Bug#759059: salutatoi: Patch for wxPython 3.0
Control: tags 759059 + patch
The attached patch updates the dependencies for wxPython 3.0.
The issue of the missing icon icons/crystal/32/tray_icon.xpm really
ought to be resolved more satisfactorily though - here's the explanation
from do-not-set-bad-icon.patch:
The code tries to load an icon from 'icons/crystal/32/tray_icon.xpm'
(relative to self.media_dir) - I can find no trace of such a file in
the source tree!
.
It then tries to set this invalid icon. With wxPython 2.8 these
issues get quietly ignored, but wxPython 3.0 reports them. As a
simple workaround I've just added a check that the icon is valid
before setting it, so now you get a messagebox about the icon file
not being found and then the app starts.
.
Obviously it would be better to track down the expected icon and
add it to the package, or find a suitable substitute.
Cheers,
Olly
diff -Nru salutatoi-0.4.1/debian/changelog salutatoi-0.4.1/debian/changelog
--- salutatoi-0.4.1/debian/changelog 2014-03-12 15:13:04.0 -0300
+++ salutatoi-0.4.1/debian/changelog 2014-09-09 19:00:58.0 -0300
@@ -1,3 +1,11 @@
+salutatoi (0.4.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759059):
++ New patch do-not-set-bad-icon.patch to allow wix to start up.
+
+ -- Olly Betts o...@survex.com Tue, 09 Sep 2014 22:00:34 +
+
salutatoi (0.4.1-2) unstable; urgency=medium
* Update Jp's manual page (jp.1).
diff -Nru salutatoi-0.4.1/debian/control salutatoi-0.4.1/debian/control
--- salutatoi-0.4.1/debian/control 2014-03-12 15:13:04.0 -0300
+++ salutatoi-0.4.1/debian/control 2014-09-09 18:16:31.0 -0300
@@ -39,7 +39,7 @@
Package: sat-xmpp-wix
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
- sat-xmpp-core (= ${source:Version}), python-wxgtk2.8
+ sat-xmpp-core (= ${source:Version}), python-wxgtk3.0
Description: Salut à Toi XMPP-based communication and sharing tool (desktop interface)
Salut à Toi (French for hello you) is a multi-frontends, multi-purposes
communication tool, based on the XMPP standard. It features:
diff -Nru salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch
--- salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch 1969-12-31 21:00:00.0 -0300
+++ salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch 2014-09-09 19:00:27.0 -0300
@@ -0,0 +1,30 @@
+Description: Avoid setting a bad icon
+ The code tries to load an icon from 'icons/crystal/32/tray_icon.xpm'
+ (relative to self.media_dir) - I can find no trace of such a file in
+ the source tree!
+ .
+ It then tries to set this invalid icon. With wxPython 2.8 these
+ issues get quietly ignored, but wxPython 3.0 reports them. As a
+ simple workaround I've just added a check that the icon is valid
+ before setting it, so now you get a messagebox about the icon file
+ not being found and then the app starts.
+ .
+ Obviously it would be better to track down the expected icon and
+ add it to the package, or find a suitable substitute.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759059
+Forwarded: no
+Last-Update: 2014-09-09
+
+--- salutatoi-0.4.1.orig/frontends/src/wix/main_window.py
salutatoi-0.4.1/frontends/src/wix/main_window.py
+@@ -84,7 +84,8 @@ class MainWindow(wx.Frame, QuickApp):
+ #tray icon
+ ticon = wx.Icon(os.path.join(self.media_dir, 'icons/crystal/32/tray_icon.xpm'), wx.BITMAP_TYPE_XPM)
+ self.tray_icon = wx.TaskBarIcon()
+-self.tray_icon.SetIcon(ticon, _(Wix jabber client))
++if ticon.IsOk():
++self.tray_icon.SetIcon(ticon, _(Wix jabber client))
+ wx.EVT_TASKBAR_LEFT_UP(self.tray_icon, self.onTrayClick)
+
+
diff -Nru salutatoi-0.4.1/debian/patches/series salutatoi-0.4.1/debian/patches/series
--- salutatoi-0.4.1/debian/patches/series 2014-03-12 15:13:04.0 -0300
+++ salutatoi-0.4.1/debian/patches/series 2014-09-09 18:53:24.0 -0300
@@ -1,3 +1,4 @@
0001-Search-.mo-files-in-default-system-locale-dir.patch
0002-Set-PYTHONPATH-in-sat.sh.patch
0003-jp-updated-main-loop-to-gobject-3.patch
+do-not-set-bad-icon.patch
Bug#759060: invesalius: Partial patch for wxPython 3.0
I've had a look at updating invesalius for wxpython3.0, and made some
progress.
However, the startup still isn't clean - the splash screen throws up
several errors - see invesalius.wxpy3.0.log - and once the app fires up,
there are clearly issues with the sizing of widgets, to the extent that
it isn't usable. I'm not sure if these are as a result of the splash
screen errors or not.
The logic in the splashscreen code seems hard to follow, relying on
several different delayed callbacks. I wonder if it's just inherently
racy, and a timing difference causes the failures with wxpython 3.0.
Anyway, I'm giving up on this one for the moment, but thought I should
at least send the patch I have so far to avoid duplicated effort if you
were also looking at it.
Cheers,
Olly
diff -Nru invesalius-3.0~b5/debian/changelog invesalius-3.0~b5/debian/changelog
--- invesalius-3.0~b5/debian/changelog 2014-06-16 09:01:59.0 -0300
+++ invesalius-3.0~b5/debian/changelog 2014-09-09 21:00:48.0 -0300
@@ -1,3 +1,11 @@
+invesalius (3.0~b5-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759060):
++ New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Wed, 10 Sep 2014 00:00:33 +
+
invesalius (3.0~b5-3) unstable; urgency=low
[ Thiago Franco de Moraes ]
diff -Nru invesalius-3.0~b5/debian/control invesalius-3.0~b5/debian/control
--- invesalius-3.0~b5/debian/control 2014-06-16 09:00:44.0 -0300
+++ invesalius-3.0~b5/debian/control 2014-09-09 20:03:09.0 -0300
@@ -22,7 +22,7 @@
${misc:Depends},
python-numpy,
python-scipy,
- python-wxgtk2.8 (= 2.8.12),
+ python-wxgtk3.0,
python-imaging,
python-vtk,
python-gdcm,
diff -Nru invesalius-3.0~b5/debian/patches/series invesalius-3.0~b5/debian/patches/series
--- invesalius-3.0~b5/debian/patches/series 2014-04-28 13:21:20.0 -0300
+++ invesalius-3.0~b5/debian/patches/series 2014-09-09 20:03:43.0 -0300
@@ -1,2 +1,3 @@
10_sample_path.patch
10_import_mips.patch
+wxpython3.0.patch
diff -Nru invesalius-3.0~b5/debian/patches/wxpython3.0.patch invesalius-3.0~b5/debian/patches/wxpython3.0.patch
--- invesalius-3.0~b5/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ invesalius-3.0~b5/debian/patches/wxpython3.0.patch 2014-09-09 21:00:03.0 -0300
@@ -0,0 +1,114 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8, aside from the
+ wxversion change in the last hunk.
+ .
+ We can't simply drop the wxversion.select() call and use
+ .
+ wxversion.ensureMinimal('2.8-unicode', optionsRequired=True)
+ .
+ because 3.0 is always Unicode, and the -unicode option has been dropped,
+ but wxversion isn't smart enough to know to allow for this when matching
+ options.
+Bug-Debian: https://bugs.debian.org/759060
+Forwarded: no
+Last-Update: 2014-09-09
+
+--- invesalius-3.0~b5.orig/invesalius/gui/dialogs.py
invesalius-3.0~b5/invesalius/gui/dialogs.py
+@@ -214,7 +214,7 @@ def ShowOpenProjectDialog():
+ dlg = wx.FileDialog(None, message=_(Open InVesalius 3 project...),
+ defaultDir=,
+ defaultFile=, wildcard=WILDCARD_OPEN,
+-style=wx.OPEN|wx.CHANGE_DIR)
++style=wx.FD_OPEN|wx.FD_CHANGE_DIR)
+
+ # inv3 filter is default
+ dlg.SetFilterIndex(0)
+@@ -242,7 +242,7 @@ def ShowOpenAnalyzeDialog():
+ dlg = wx.FileDialog(None, message=_(Open Analyze file),
+ defaultDir=,
+ defaultFile=, wildcard=WILDCARD_ANALYZE,
+-style=wx.OPEN|wx.CHANGE_DIR)
++style=wx.FD_OPEN|wx.FD_CHANGE_DIR)
+
+ # inv3 filter is default
+ dlg.SetFilterIndex(0)
+@@ -312,7 +312,7 @@ def ShowSaveAsProjectDialog(default_file
+ , # last used directory
+ default_filename,
+ _(InVesalius project (*.inv3)|*.inv3),
+-wx.SAVE|wx.OVERWRITE_PROMPT)
++wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ #dlg.SetFilterIndex(0) # default is VTI
+
+ filename = None
+@@ -972,7 +972,7 @@ def ExportPicture(type_=):
+ , # last used directory
+ project_name, # filename
+ WILDCARD_SAVE_PICTURE,
+-wx.SAVE|wx.OVERWRITE_PROMPT)
++wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ dlg.SetFilterIndex(1) # default is VTI
+
+ if dlg.ShowModal() == wx.ID_OK:
+--- invesalius-3.0~b5.orig/invesalius/gui/task_exporter.py
invesalius-3.0~b5/invesalius/gui/task_exporter.py
+@@ -276,7 +276,7 @@ class InnerTaskPanel(wx.Panel):
+ , # last used directory
+ project_name, # filename
Bug#758957: pype: Patch for wxPython 3.0 support
Control: tags 758957 + patch
Dear maintainer,
Here's a patch for wxPython 3.0 support for pype - it's an improved
version of the patch I attached to the upstream ticket (I'll update
the patch there shortly).
With this patch, pype seems to work in a simple test, though I'm
not familiar with it so a more thorough test from a habitual pype
user would be good.
There is a suspicious looking warning on startup, but I get the
same message with the package currently in unstable when using
wxpython 2.8, so this appears to be orthogonal to the switch
to wxpython 3.0:
[ Tue Sep 9 21:58:00 2014 ] /usr/share/pype/plugins/spellcheck.py:35:
UnicodeWarning: Unicode equal comparison failed to convert both arguments to
Unicode - interpreting them as being unequal
non_word.update(dict([(unichr(i), ' ') for i in xrange(256) if chr(i) not in
goodch]))
Let me know if you'd like me to NMU these changes.
Cheers,
Olly
diff -Nru pype-2.9.4/debian/changelog pype-2.9.4/debian/changelog
--- pype-2.9.4/debian/changelog 2013-05-04 15:30:28.0 -0300
+++ pype-2.9.4/debian/changelog 2014-09-09 21:50:08.0 -0300
@@ -1,3 +1,11 @@
+pype (2.9.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #758957):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Wed, 10 Sep 2014 00:49:52 +
+
pype (2.9.4-1) unstable; urgency=low
* New upstream release
diff -Nru pype-2.9.4/debian/control pype-2.9.4/debian/control
--- pype-2.9.4/debian/control 2013-05-01 11:01:45.0 -0300
+++ pype-2.9.4/debian/control 2014-09-05 20:11:54.0 -0300
@@ -11,7 +11,7 @@
Package: pype
Architecture: all
-Depends: python-wxgtk2.8, python-wxversion, ${misc:Depends}, ${python:Depends}
+Depends: python-wxgtk3.0, python-wxversion, ${misc:Depends}, ${python:Depends}
Description: Python programmers editor
PyPE (Python Programmers Editor) is a lightweight but powerful
editor. Tools for the new and seasoned user alike are included
diff -Nru pype-2.9.4/debian/patches/series pype-2.9.4/debian/patches/series
--- pype-2.9.4/debian/patches/series 2012-08-26 15:45:02.0 -0300
+++ pype-2.9.4/debian/patches/series 2014-09-09 21:49:48.0 -0300
@@ -1,3 +1,4 @@
#command-shell.patch
#interpreter.py_warning.patch
move_help_file.patch
+wxpython3.0.patch
diff -Nru pype-2.9.4/debian/patches/wxpython3.0.patch pype-2.9.4/debian/patches/wxpython3.0.patch
--- pype-2.9.4/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ pype-2.9.4/debian/patches/wxpython3.0.patch 2014-09-09 21:50:14.0 -0300
@@ -0,0 +1,129 @@
+Description: Updates for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/758957
+Forwarded: no
+Last-Update: 2014-09-05
+
+Index: pype-2.9.4/plugins/interpreter.py
+===
+--- pype-2.9.4.orig/plugins/interpreter.py
pype-2.9.4/plugins/interpreter.py
+@@ -966,7 +966,6 @@ class MyShellFrame(wx.Frame):
+
+ def main():
+ app = wx.App(0)
+-wx.InitAllImageHandlers()
+ frame = MyShellFrame()
+ frame.Show()
+ app.SetTopWindow(frame)
+Index: pype-2.9.4/pype.py
+===
+--- pype-2.9.4.orig/pype.py
pype-2.9.4/pype.py
+@@ -1420,7 +1420,8 @@ class MainWindow(wx.Frame):
+ self.menubar.Check(DOCUMENT_LIST_OPTION_TO_ID2[document_options2], 1)
+ self.menubar.Check(SHOW_RECENT, show_recent)
+ self.menubar.Check(SHOW_SEARCH, show_search)
+-self.menubar.Check(MIDDLE_CL, MIDDLE_PASTE)
++if sys.platform.startswith('win32'):
++self.menubar.Check(MIDDLE_CL, MIDDLE_PASTE)
+
+ for i in TOOLS_ENABLE_L:
+ if i[4] in window_management.enabled:
+@@ -2226,7 +2227,7 @@ class MainWindow(wx.Frame):
+ def OnSaveAs(self,e,upd=1):
+ wnum, win = self.getNumWin(e)
+
+-dlg = wx.FileDialog(self, Save file as..., current_path, , All files (*.*)|*.*, wx.SAVE|wx.OVERWRITE_PROMPT)
++dlg = wx.FileDialog(self, Save file as..., current_path, , All files (*.*)|*.*, wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ rslt = dlg.ShowModal()
+ if rslt == wx.ID_OK:
+ fn=dlg.GetFilename()
+@@ -2296,7 +2297,7 @@ class MainWindow(wx.Frame):
+
+ def OnOpen(self,e):
+ wd = self.config.get('lastpath', current_path)
+-dlg = wx.FileDialog(self, Choose a/some file(s)..., wd, , wildcard, wx.OPEN|wx.MULTIPLE)
++dlg = wx.FileDialog(self, Choose a/some file(s)..., wd, , wildcard, wx.FD_OPEN|wx.FD_MULTIPLE)
+ if dlg.ShowModal() == wx.ID_OK:
+ self.OnDrop(dlg.GetPaths())
+ self.config['lp'] = dlg.GetDirectory()
+@@ -2345,7 +2346,7 @@ class MainWindow(wx.Frame):
+ if lastopen in self.config:
+ self.OnDrop(self.config
Bug#759061: tpclient-pywx: Please update to use wxpython3.0
I've just been having a look at getting tpclient-pywx working with wxPython 3.0, and it looks non-trivial. The first major issue I hit is that the start-up all happens in the wrong order (probably also wrong with 2.8, but 3.0 actually checks and complains). However, looking at the PTS, I thought I should check if you think it is worth trying to keep this package in the archive: * Popcon shows *0* active users (out of 18 installs, 2 of which are new - one of those probably me!) * last maintainer upload was approaching 5 years ago * last upstream release date I couldn't easily discover, but it was prior to the Debian package first being upload on 2009-03-09 Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#749834: freespace2-launcher-wxlauncher: patch for wx3.0 compatibility
On Wed, Sep 10, 2014 at 11:51:40AM +1000, Dmitry Smirnov wrote: On Sat, 30 Aug 2014 20:33:18 Olly Betts wrote: With the attached patch, the package builds. I don't have the games it can launch, so I can't test thoroughly, but the parts of the UI I can exercise appear to work fine. Thank you for this patch. I tested it and found a small run-time error. Before patching wxlauncher shows the following in the status line: I: Detected OpenAL version: 1.1 ALSOFT 1.15.1 With WX-3.0 status line shows the following error: !: OpenAL:463: Unknown error number 0xa004 If you mean the status line of the window after start-up, I just seem to have: green tick: Ready. I can't get further as I don't have a suitable game to test with. I hope you may have some ideas regarding what is causing this -- I couldn't spot anything related to OpenAL in the patch but it is certainly responsible somehow. Hmm, well the 463 there means line 463 of code/apis/OpenALManager.cpp it appears, so that seems to mean calling CloseDevice failed. Have you tried the before test with a rebuilt version of the current version of the package against current unstable? It would be good to rule out this being just due to rebuilding against a newer version of openal or similar issues. Also, does this affect sound in the games, or is it just a cosmetic issue with a worrying looking error being shown? Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#535073: ITP: dolphin-emu -- Dolphin Gamecube / Wii Emulator
On Sun, Sep 07, 2014 at 11:14:53AM +0100, James Cowgill wrote: W: dolphin-emu source: space-in-std-shortname-in-dep5-copyright gpl-2 and bsd-3-clause (paragraph at line 130) Ignore that one - it is lintian that's buggy: https://bugs.debian.org/760642 Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758955: cycle: Please update to use wxpython3.0
Control: tags -1 +patch
On Sun, Sep 07, 2014 at 10:53:10AM +0200, Ana Guerrero Lopez wrote:
After this, cycle segfaults with wxpython3.0 :/
I had a poke - the problem seems to with be the calendar date attribute
objects - I'm not quite clear what's going on, but creating a new one
and setting it after we've finished changing it works. And fixing that,
the set colours aren't use with the GTK calendar control, so we have to
force the generic version (which I think 2.8 probably always uses for
GTK).
The key constant names were wrong (missing wx. prefix - that must be
wrong for 2.8 too).
And there's no need to explicitly set image handlers now - they're all
initialised implicitly at start up in both 2.8 and 3.0 - and doing so
now gives a warning because the handler's already set.
These changes should be fine with 2.8 too, but I suspect not with
earlier versions - you generally have to start conditionalising code
to support more than two wx release series at once, though simpler
programs can sometimes work more broadly. But 2.6 has been dead a
long time now anyway.
With the patch, cycle seems to work well with wxPython 3.0, but I'm not
a user of the program, so a more thorough test would be good.
I won't be able to dedicate time to this in the next 4-5 weeks. When
are you aiming to remove wxpython2.8 from Debian?
I'm very keen not to have it in jessie - there's only me currently
very active in wx maintenance, and 2.8 hasn't really been supported
upstream for a long time.
Cheers,
Olly
Description: Update for wxPython 3.0
These changes should remain compatible with wxPython 2.8.
Bug-Debian: https://bugs.debian.org/758955
Forwarded: no
Last-Update: 2014-09-07
Index: cycle-0.3.1/cal_year.py
===
--- cycle-0.3.1.orig/cal_year.py
+++ cycle-0.3.1/cal_year.py
@@ -28,11 +28,11 @@ MARK_T22_28 = 110 #tablets 22-28 or pa
MARK_NEXT_TABLET = 111
# class Month_Cal ---
-class Month_Cal(wx.calendar.CalendarCtrl):
+class Month_Cal(wx.calendar.GenericCalendarCtrl):
def __init__(self, parent, id, dt, pos=wx.DefaultPosition,
size=wx.DefaultSize, style=0 ):
- style = wx.calendar.CAL_NO_YEAR_CHANGE | wx.calendar.CAL_NO_MONTH_CHANGE | wx.NO_BORDER
+ style = wx.calendar.CAL_NO_MONTH_CHANGE | wx.NO_BORDER
if cycle.first_week_day==0:
style = style | wx.calendar.CAL_MONDAY_FIRST
else:
@@ -42,7 +42,7 @@ class Month_Cal(wx.calendar.CalendarCtrl
except NameError:
pass
- wx.calendar.CalendarCtrl.__init__(self, parent, id, dt, pos, size, style)
+ wx.calendar.GenericCalendarCtrl.__init__(self, parent, id, dt, pos, size, style)
self.SetBackgroundColour(wx.WHITE)
self.SetHeaderColours(wx.BLACK,wx.WHITE)
if '__WXMSW__' in wx.PlatformInfo:
@@ -139,8 +139,8 @@ class Month_Cal(wx.calendar.CalendarCtrl
def OnKey(self, event):
k=event.GetKeyCode()
- if k==WXK_LEFT or k==WXK_RIGHT or \
- k==WXK_UP or k==WXK_DOWN:
+ if k==wx.WXK_LEFT or k==wx.WXK_RIGHT or \
+ k==wx.WXK_UP or k==wx.WXK_DOWN:
pass
else:
event.Skip()
@@ -208,10 +208,8 @@ class Cal_Year(wx.ScrolledWindow):
Val.frame.SetTitle(cycle.name+ - +str(self.year))
for m in range(12):
t=wx.DateTimeFromDMY(1, m, self.year)
- self.month[m].EnableYearChange(True)
self.month[m].EnableMonthChange(True)
self.month[m].SetDate(t)
- self.month[m].EnableYearChange(False)
self.month[m].EnableMonthChange(False)
self.month[m].Refresh()
@@ -234,15 +232,8 @@ class Cal_Year(wx.ScrolledWindow):
for d in range(1,wx.DateTime_GetNumberOfDaysInMonth(m, self.year)+1):
can_hide=True
lab=cycle.mark.get(k,0)
- at=self.month[m].GetAttr(d)
- if at is None :
- at=wx.calendar.CalendarDateAttr(wx.BLACK)
- self.month[m].SetAttr(d,at)
-
- # reset attributes
- at.SetBorder(wx.calendar.CAL_BORDER_NONE)
+ at=wx.calendar.CalendarDateAttr(wx.BLACK)
at.SetBackgroundColour(wx.WHITE)
- at.SetTextColour(wx.BLACK)
at.SetFont(f_norm)
dt=wx.DateTimeFromDMY(d, m, self.year)
@@ -297,6 +288,8 @@ class Cal_Year(wx.ScrolledWindow):
self.month[m].SetHighlightColours(at.GetTextColour(),
at.GetBackgroundColour())
+ self.month[m].SetAttr(d,at)
+
k+=1
# so visual refresh is more fast
Index: cycle-0.3.1/cycle.py
===
--- cycle-0.3.1.orig/cycle.py
+++ cycle-0.3.1/cycle.py
@@ -10,7 +10,7 @@ import os, sys, gettext
import locale
import wxversion
-wxversion.ensureMinimal('2.5.3')
+wxversion.ensureMinimal('2.8')
import wx
import wx.html
import wx.lib.colourdb
@@ -69,7 +69,6 @@ class MyFrame(wx.Frame):
wx.Frame.__init__(self, parent, ID, title,
wx.DefaultPosition, wx.Size(800, 600))
- wx.Image_AddHandler(wx.PNGHandler())
# self.printer = wx.HtmlEasyPrinting()
icon = wx.Icon(os.path.join(icons_dir,'mini/cycle.xpm'), wx.BITMAP_TYPE_XPM)
self.SetIcon(icon)
@@ -142,7 +141,7
Bug#758955: cycle: Please update to use wxpython3.0
Hi Ana, On Sat, Sep 06, 2014 at 03:13:14PM +0200, Ana Guerrero Lopez wrote: cycle is using awxCalendarCtrl::EnableYearChange that has deprecreated according to wxwidgets3.0-3.0.1/docs/changes.txt: - wxCalendarCtrl::EnableYearChange() and wxCAL_NO_YEAR_CHANGE are deprecated. There is no replacement for this functionality, it is being dropped as it is not available in native wxCalendarCtrl implementations. Any hints about this? The docs say that disabling the month change implicitly disables the year change. Looking at the cycle code, it always disables/enables the month and year changing together, so I think you can just remove the deprecated calls and it'll still work as intended. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#707268: Bug#740085: Bug#725957: [NMU] Bug#740085: package plplot 5.10.0
On Thu, Jul 17, 2014 at 02:15:41PM +0200, Thibaut Paumard wrote: Le 17/07/2014 13:09, Axel Beckert a écrit : I'm though likely not able to sponsor the (fixed or workarounded) package the next few days as I'm currently travelling. So feel free to sponsor it, if you have time. I'd be happy about it. I can forward you my findings this evening, if preferred. I should have some spare time next week. I'll be glad to read your findings, and we can keep each other informed on whether we get to it. It's been more than 3 weeks now - what's the status of the upload? Looking at the package on mentors, the minified JS source seems to be the only major issue. But as the current package in unstable also has that issue, and this upload will close 5 RC bugs, 2 important bugs, and a request for a new upstream version, I'm inclined to think we shouldn't let the perfect be the enemy of the good. The package that is waiting on mentors looks like a vast improvement over what's in the archive currently. I'd really like to see the last few wxwidgets3.0 transition bugs dealt with, and ideally not by removing packages (unless that's what the maintainer prefers). And plplot is also holding up gnudatalanguage there - that's 2 of the 7 remaining packages which I'm hoping to see transitioned. I'd prefer an upload sponsored by someone who's actively sponsoring plplot uploads, but the freeze is less than 2 months away now, so I'm starting to consider just sponsoring it myself. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#760691: ipython: Please update to use wxpython3.0
Package: ipython Version: 2.2.0-1 Severity: important Tags: sid jessie patch User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 Dear maintainer, Currently ipython build-depends on python-wxgtk2.8 (though oddly there's no corresponding runtime dependency of any sort). Anyway, I tried updating this to python-wxgtk3.0 and the package still builds OK. I'm happy to NMU this change - just let me know. Cheers, Olly diff -Nru ipython-2.2.0/debian/changelog ipython-2.2.0/debian/changelog --- ipython-2.2.0/debian/changelog 2014-08-17 09:01:41.0 -0300 +++ ipython-2.2.0/debian/changelog 2014-09-06 01:39:02.0 -0300 @@ -1,3 +1,10 @@ +ipython (2.2.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Update BD from python-wxgtk2.8 to python-wxgtk3.0. + + -- Olly Betts o...@survex.com Sat, 06 Sep 2014 04:38:39 + + ipython (2.2.0-1) unstable; urgency=medium * New upstream bugfix release diff -Nru ipython-2.2.0/debian/control ipython-2.2.0/debian/control --- ipython-2.2.0/debian/control 2014-08-17 09:01:41.0 -0300 +++ ipython-2.2.0/debian/control 2014-09-06 01:37:05.0 -0300 @@ -28,7 +28,7 @@ python-sphinx (= 1.0.7+dfsg-1~), python-tk, python-tornado (= 3.1.0), - python-wxgtk2.8, + python-wxgtk3.0, python-zmq (= 2.1.11), python3-all, python3-setuptools,
Bug#759048: hachoir-wx: Patch for wxPython 3.0
Control: tags 759048 + patch
With the attached patch, hachoir-wx builds. When run, it seems to want
me to select a file, but I'm not sure I have a suitable input, so I
haven't really been able to usefully test it.
Please could you give it a more thorough workout, and upload if all is
well.
Cheers,
Olly
diff -Nru hachoir-wx-0.3/debian/changelog hachoir-wx-0.3/debian/changelog
--- hachoir-wx-0.3/debian/changelog 2011-10-19 17:19:52.0 -0300
+++ hachoir-wx-0.3/debian/changelog 2014-09-06 21:33:12.0 -0300
@@ -1,3 +1,11 @@
+hachoir-wx (0.3-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759048):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Sun, 07 Sep 2014 00:31:31 +
+
hachoir-wx (0.3-2) unstable; urgency=low
[ Sandro Tosi ]
diff -Nru hachoir-wx-0.3/debian/control hachoir-wx-0.3/debian/control
--- hachoir-wx-0.3/debian/control 2011-10-19 14:49:11.0 -0300
+++ hachoir-wx-0.3/debian/control 2014-09-06 21:31:52.0 -0300
@@ -12,7 +12,7 @@
Package: python-hachoir-wx
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-hachoir-parser (= 1.2), python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-hachoir-parser (= 1.2), python-wxgtk3.0
Description: wxWidgets GUI for the hachoir binary parser
hachoir-wx is a wxWidgets-based program that's meant to provide a
(more) user-friendly interface to the facilities provided by the
diff -Nru hachoir-wx-0.3/debian/patches/series hachoir-wx-0.3/debian/patches/series
--- hachoir-wx-0.3/debian/patches/series 2011-02-15 18:13:27.0 -0300
+++ hachoir-wx-0.3/debian/patches/series 2014-09-06 21:32:03.0 -0300
@@ -1 +1,2 @@
fix-project-url.patch
+wxpython3.0.patch
diff -Nru hachoir-wx-0.3/debian/patches/wxpython3.0.patch hachoir-wx-0.3/debian/patches/wxpython3.0.patch
--- hachoir-wx-0.3/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ hachoir-wx-0.3/debian/patches/wxpython3.0.patch 2014-09-06 21:32:49.0 -0300
@@ -0,0 +1,27 @@
+Description: Update for wxPython 3.0
+ These changes retain compatibility with wxPython 2.8.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759048
+Forwarded: no
+Last-Update: 2014-09-06
+
+--- hachoir-wx-0.3.orig/hachoir_wx/dialogs.py
hachoir-wx-0.3/hachoir_wx/dialogs.py
+@@ -4,7 +4,7 @@ import wx, os
+ from hachoir_core.i18n import _
+
+ def file_open_dialog():
+-dialog_style = wx.OPEN | wx.FILE_MUST_EXIST
++dialog_style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST
+
+ dialog = wx.FileDialog(
+ None, message = _('Open'),
+@@ -14,7 +14,7 @@ def file_open_dialog():
+ return dialog
+
+ def file_save_dialog(title):
+-dialog_style = wx.SAVE
++dialog_style = wx.FD_SAVE
+
+ dialog = wx.FileDialog(
+ None, message = title,
Bug#758714: kiki: diff for NMU version 0.5.6-8.1
Control: tags 758714 + pending
Dear maintainer,
I've prepared an NMU for kiki (versioned as 0.5.6-8.1) and
uploaded it to DELAYED/5. The patch is the same as that in
the bug already, except debian/changelog now references the bug
number, and I updated the changelog entry date.
Please feel free to tell me if I should delay it longer.
Cheers,
Olly
diff -Nru kiki-0.5.6/debian/changelog kiki-0.5.6/debian/changelog
--- kiki-0.5.6/debian/changelog 2011-11-25 02:26:28.0 -0300
+++ kiki-0.5.6/debian/changelog 2014-09-06 22:19:40.0 -0300
@@ -1,3 +1,11 @@
+kiki (0.5.6-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxPython 3.0 (Closes: #758714):
++ New patch: 04_wxpy3.0-compat.patch
+
+ -- Olly Betts o...@survex.com Sun, 07 Sep 2014 01:19:05 +
+
kiki (0.5.6-8) unstable; urgency=low
* debian/patch:
diff -Nru kiki-0.5.6/debian/control kiki-0.5.6/debian/control
--- kiki-0.5.6/debian/control 2011-11-18 14:54:49.0 -0300
+++ kiki-0.5.6/debian/control 2014-08-18 08:40:14.0 -0300
@@ -11,7 +11,7 @@
Package: kiki
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0
XB-Python-Version: ${python:Versions}
Description: tool for python regular expression testing
A free environment for regular expression testing (ferret). It allows
diff -Nru kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch
--- kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch 1969-12-31 21:00:00.0 -0300
+++ kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch 2014-08-20 08:59:21.0 -0300
@@ -0,0 +1,27 @@
+Description: Updates for wxPython 3.0
+ Allow wxPython 3.0 to be used.
+ Avoid deprecation warning (wx.InitAllImageHandlers() is a no-op under wxPython
+ 2.8, so removing it remains compatible with wxPython 2.8).
+Author: Olly Betts o...@survex.com
+Forwarded: no
+Last-Update: 2014-08-20
+
+--- a/kiki.py
b/kiki.py
+@@ -23,7 +23,7 @@
+
+
+ import wxversion
+-wxversion.select('2.8')
++wxversion.ensureMinimal('2.8')
+
+ import wx
+ import wx.html
+@@ -705,7 +705,6 @@
+ global settings
+ settings = Settings(dirname=.kiki, filename=kikicfg.py, debugfile=kikidebug)
+ Kiki = wx.PySimpleApp()
+-wx.InitAllImageHandlers()
+ mw = MyFrameWithEvents(None, -1, )
+ mw.icon()
+ Kiki.SetTopWindow(mw)
diff -Nru kiki-0.5.6/debian/patches/series kiki-0.5.6/debian/patches/series
--- kiki-0.5.6/debian/patches/series 2011-11-25 02:11:40.0 -0300
+++ kiki-0.5.6/debian/patches/series 2014-08-20 08:55:39.0 -0300
@@ -1,3 +1,4 @@
01_path_changes.diff
02_remove_wx.NotebookSizer.diff
03_setup.py.diff
+04_wxpy3.0-compat.patch
Bug#759057: douf00: diff for NMU version 3.0.0-1.1
Control: tags 759057 + patch Control: tags 759057 + pending Dear maintainer, I've prepared an NMU for douf00 for the wxPython 3.0 transition (versioned as 3.0.0-1.1) and uploaded it (since you're on the LowThresholdNMU list). Cheers, Olly diff -Nru douf00-3.0.0/debian/changelog douf00-3.0.0/debian/changelog --- douf00-3.0.0/debian/changelog 2014-09-06 22:47:23.0 -0300 +++ douf00-3.0.0/debian/changelog 2014-09-06 22:33:23.0 -0300 @@ -1,3 +1,12 @@ +douf00 (3.0.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/source/format: Set to '3.0 (quilt)' so I can easily add a patch. + * Update for wxPython 3.0 (Closes: #759057): +- New patch: wxpython3.0.patch + + -- Olly Betts o...@survex.com Sun, 07 Sep 2014 01:32:44 + + douf00 (3.0.0-1) unstable; urgency=low * New upstream version. diff -Nru douf00-3.0.0/debian/patches/series douf00-3.0.0/debian/patches/series --- douf00-3.0.0/debian/patches/series 1969-12-31 21:00:00.0 -0300 +++ douf00-3.0.0/debian/patches/series 2014-09-06 22:31:59.0 -0300 @@ -0,0 +1 @@ +wxpython3.0.patch diff -Nru douf00-3.0.0/debian/patches/wxpython3.0.patch douf00-3.0.0/debian/patches/wxpython3.0.patch --- douf00-3.0.0/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300 +++ douf00-3.0.0/debian/patches/wxpython3.0.patch 2014-09-06 22:32:34.0 -0300 @@ -0,0 +1,18 @@ +Description: Update for wxPython 3.0 + Also compatible with wxPython 2.8. +Author: Olly Betts o...@survex.com +Bug-Debian: https://bugs.debian.org/759057 +Forwarded: no +Last-Update: 2014-09-06 + +--- douf00-3.0.0.orig/pysrc/DouF00/appcfg.py douf00-3.0.0/pysrc/DouF00/appcfg.py +@@ -40,7 +40,7 @@ thumbnaillist = None + EVT_CLOCK_ID = wx.NewId() + pause = False + index = False +-presentorBackgroundColor = wx.Color(80, 80, 80) ++presentorBackgroundColor = wx.Colour(80, 80, 80) + presentorBorderColor = (255, 0, 0) + blankThumbnail = None + pdfdoc = None diff -Nru douf00-3.0.0/debian/source/format douf00-3.0.0/debian/source/format --- douf00-3.0.0/debian/source/format 1969-12-31 21:00:00.0 -0300 +++ douf00-3.0.0/debian/source/format 2014-09-06 22:31:54.0 -0300 @@ -0,0 +1 @@ +3.0 (quilt)
Bug#733623: wxgeometrie: ImportError: No module named pyparsing
# Justification: makes the package in question unusable or mostly so Control: severity -1 grave Since wxgeom fails on start up, this package is currently unusable, so setting the appropriate severity. On Wed, Jun 18, 2014 at 07:36:21PM +0200, Georges Khaznadar wrote: As its author will no longer maintain wxgeometrie, I suggest you to switch to geophar if you can install it manually; the new package should enter Debian in a few weeks, and then I shall probably ask for the removal of the former one. It looks like it has been in NEW for ~2 weeks now. However, I notice that the geophar binary package has a dependency on python-wxgtk2.8 - please can you look at updating that to python-wxgtk3.0? Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759054: python-fs: Patch for wxPython 3.0
Control: tags 759054 + patch
Dear maintainer,
I've attached a patch to update python-fs for wxPython 3.0. I've
tested the rebuilt package by running 'pstree -g'.
I'm happy to NMU this change - just let me know.
Cheers,
Olly
diff -Nru python-fs-0.4.0/debian/changelog python-fs-0.4.0/debian/changelog
--- python-fs-0.4.0/debian/changelog 2014-02-24 11:00:56.0 -0300
+++ python-fs-0.4.0/debian/changelog 2014-09-07 00:59:41.0 -0300
@@ -1,3 +1,11 @@
+python-fs (0.4.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759054):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Sun, 07 Sep 2014 03:59:39 +
+
python-fs (0.4.0-1) unstable; urgency=low
[ Janos Guljas ]
diff -Nru python-fs-0.4.0/debian/control python-fs-0.4.0/debian/control
--- python-fs-0.4.0/debian/control 2014-02-24 10:59:25.0 -0300
+++ python-fs-0.4.0/debian/control 2014-09-07 00:59:35.0 -0300
@@ -28,7 +28,7 @@
Package: python-fs-browser
Architecture: all
-Depends: python-fs, python-wxgtk2.8, ${misc:Depends}
+Depends: python-fs, python-wxgtk3.0, ${misc:Depends}
Description: Python filesystem abstraction - Gtk browser
Pyfilesystem is a Python module that provides a common interface to many types
of filesystem, and provides some powerful features such as exposing
diff -Nru python-fs-0.4.0/debian/patches/series python-fs-0.4.0/debian/patches/series
--- python-fs-0.4.0/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ python-fs-0.4.0/debian/patches/series 2014-09-07 00:44:34.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru python-fs-0.4.0/debian/patches/wxpython3.0.patch python-fs-0.4.0/debian/patches/wxpython3.0.patch
--- python-fs-0.4.0/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ python-fs-0.4.0/debian/patches/wxpython3.0.patch 2014-09-07 00:44:57.0 -0300
@@ -0,0 +1,20 @@
+Description: Update for wxPython 3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759054
+Forwarded: no
+Last-Update: 2014-09-07
+
+--- python-fs-0.4.0.orig/fs/browsewin.py
python-fs-0.4.0/fs/browsewin.py
+@@ -187,7 +187,10 @@ def browse(fs, hide_dotfiles=False):
+
+
+
+-app = wx.PySimpleApp()
++class PySimpleApp(wx.App):
++def OnInit(self):
++return True
++app = PySimpleApp()
+ frame = BrowseFrame(fs, hide_dotfiles=hide_dotfiles)
+ frame.Show()
+ app.MainLoop()
Bug#759057: douf00: diff for NMU version 3.0.0-1.2
Dear maintainer,
I spotted that I'd failed to actually update the dependency from
python-wxgtk2.8 to python-wxgtk3.0 in my recent NMU, so I've done
that, rebuilt, retested, and reuploaded.
Cheers,
Olly
diff -Nru douf00-3.0.0/debian/changelog douf00-3.0.0/debian/changelog
--- douf00-3.0.0/debian/changelog 2014-09-06 22:33:23.0 -0300
+++ douf00-3.0.0/debian/changelog 2014-09-07 01:15:19.0 -0300
@@ -1,3 +1,11 @@
+douf00 (3.0.0-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control: Actually update dependency from python-wxgtk2.8 to
+python-wxgtk3.0.
+
+ -- Olly Betts o...@survex.com Sun, 07 Sep 2014 04:14:33 +
+
douf00 (3.0.0-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru douf00-3.0.0/debian/control douf00-3.0.0/debian/control
--- douf00-3.0.0/debian/control 2014-09-06 22:27:50.0 -0300
+++ douf00-3.0.0/debian/control 2014-09-07 01:14:23.0 -0300
@@ -11,7 +11,7 @@
Package: douf00
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8, python-cairo, python-poppler
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0, python-cairo, python-poppler
Description: lightweight, slim and straight forward Presentation Tool
It assists novice as well as experienced speakers when giving lectures
and business meetings. With its simple presenters Screen that includes
Bug#758956: quisk: Patch for wxPython 3.0
Control: tags 758956 + patch
Dear maintainer,
I rebuilt quisk with the attached patch, and it starts up OK.
It looks like it needs special hardware which I don't have, so
I haven't been able to do more than click a few buttons. Please
could you give it a more thorough test?
Cheers,
Olly
diff -Nru quisk-3.6.16/debian/changelog quisk-3.6.16/debian/changelog
--- quisk-3.6.16/debian/changelog 2014-05-02 21:02:35.0 -0300
+++ quisk-3.6.16/debian/changelog 2014-09-04 19:51:49.0 -0300
@@ -1,3 +1,10 @@
+quisk (3.6.16-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0. (Closes: #758956)
+
+ -- Olly Betts o...@survex.com Thu, 04 Sep 2014 22:51:49 +
+
quisk (3.6.16-1) unstable; urgency=low
* New upstream release
diff -Nru quisk-3.6.16/debian/control quisk-3.6.16/debian/control
--- quisk-3.6.16/debian/control 2013-10-16 19:31:50.0 -0300
+++ quisk-3.6.16/debian/control 2014-09-04 19:51:59.0 -0300
@@ -2,13 +2,13 @@
Section: hamradio
Priority: optional
Maintainer: A. Maitland Bottoms bott...@debian.org
-Build-Depends: debhelper (= 9.0.0~), python, portaudio19-dev, libusb-dev, libfftw3-dev, python-all-dev, libasound2-dev, python-wxgtk2.8, hardening-wrapper
+Build-Depends: debhelper (= 9.0.0~), python, portaudio19-dev, libusb-dev, libfftw3-dev, python-all-dev, libasound2-dev, python-wxgtk3.0, hardening-wrapper
Standards-Version: 3.9.3
Homepage: http://james.ahlstrom.name/quisk/
Package: quisk
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-wxgtk2.8
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-wxgtk3.0
Recommends: alsa-utils, python-serial, python-usb, udev
Description: Software Defined Radio (SDR)
Quisk uses ALSA sound drivers or PortAudio and offers these capabilities:
Bug#759046: python-wxmpl: Patch for wxPython 3.0
Control: tags 759046 + patch
The attached patch seems to make python-wxmpl work well with wxpython3.0.
Let me know if you'd like me to NMU.
Cheers,
Olly
diff -Nru python-wxmpl-2.0.0/debian/changelog python-wxmpl-2.0.0/debian/changelog
--- python-wxmpl-2.0.0/debian/changelog 2011-12-05 01:58:28.0 -0300
+++ python-wxmpl-2.0.0/debian/changelog 2014-09-06 00:23:15.0 -0300
@@ -1,3 +1,11 @@
+python-wxmpl (2.0.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759046):
++ New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Sat, 06 Sep 2014 03:22:38 +
+
python-wxmpl (2.0.0-2) unstable; urgency=low
* Remove dependency on python-wxgtk2.6 which is removed from sid
diff -Nru python-wxmpl-2.0.0/debian/control python-wxmpl-2.0.0/debian/control
--- python-wxmpl-2.0.0/debian/control 2011-10-21 04:23:42.0 -0300
+++ python-wxmpl-2.0.0/debian/control 2014-09-06 00:20:13.0 -0300
@@ -10,7 +10,7 @@
Package: python-wxmpl
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-matplotlib ( 0.72),
- python-wxgtk2.8
+ python-wxgtk3.0
Provides: ${python:Provides}
Homepage: http://csrri.iit.edu/~wxmpl/
Description: Painless matplotlib embedding in wxPython
diff -Nru python-wxmpl-2.0.0/debian/patches/series python-wxmpl-2.0.0/debian/patches/series
--- python-wxmpl-2.0.0/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ python-wxmpl-2.0.0/debian/patches/series 2014-09-06 00:21:50.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch
--- python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch 2014-09-06 01:05:06.0 -0300
@@ -0,0 +1,47 @@
+Description: Update for wxPython 3.0
+ Should retain compatibility with 2.8.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759046
+Forwarded: no
+Last-Update: 2014-09-06
+
+Index: python-wxmpl-2.0.0/demos/plotting.py
+===
+--- python-wxmpl-2.0.0.orig/demos/plotting.py
python-wxmpl-2.0.0/demos/plotting.py
+@@ -335,9 +335,12 @@ class TestFrame(wx.Frame):
+ def OnWindowDestroy(self, evt):
+ wx.GetApp().ExitMainLoop()
+
++class PySimpleApp(wx.App):
++def OnInit(self):
++return True
+
+ def main():
+-app = wx.PySimpleApp()
++app = PySimpleApp()
+ frame = TestFrame(None, -1, 'WxMpl Demos')
+ frame.Show(True)
+ app.MainLoop()
+Index: python-wxmpl-2.0.0/lib/wxmpl.py
+===
+--- python-wxmpl-2.0.0.orig/lib/wxmpl.py
python-wxmpl-2.0.0/lib/wxmpl.py
+@@ -1124,7 +1124,7 @@ class PlotPanel(FigureCanvasWxAgg):
+ # find the toplevel parent window and register an activation event
+ # handler that is keyed to the id of this PlotPanel
+ topwin = toplevel_parent_of_window(self)
+-topwin.Connect(-1, self.GetId(), wx.wxEVT_ACTIVATE, self.OnActivate)
++topwin.Connect(self.GetId(), -1, wx.wxEVT_ACTIVATE, self.OnActivate)
+
+ wx.EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
+ wx.EVT_WINDOW_DESTROY(self, self.OnDestroy)
+@@ -1422,7 +1422,7 @@ class PlotFrame(wx.Frame):
+ fileName = wx.FileSelector('Save Plot', default_extension='png',
+ wildcard=('Portable Network Graphics (*.png)|*.png|'
+ + 'Encapsulated Postscript (*.eps)|*.eps|All files (*.*)|*.*'),
+-parent=self, flags=wx.SAVE|wx.OVERWRITE_PROMPT)
++parent=self, flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+
+ if not fileName:
+ return
Bug#759043: dballe: Patch for wxPython 3.0
Control: tags 759043 + patch
I rebuilt dballe with the attached patch. It seems to need a
database to work, which I don't have set up - please could you
test it works smoothly with wxPython 3.0?
The code changes should retain compatibility with wxPython 2.8.
Cheers,
Olly
diff -Nru dballe-5.18/debian/changelog dballe-5.18/debian/changelog
--- dballe-5.18/debian/changelog 2012-05-16 15:47:29.0 -0300
+++ dballe-5.18/debian/changelog 2014-09-04 21:25:10.0 -0300
@@ -1,3 +1,11 @@
+dballe (5.18-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759043):
+ - New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Fri, 05 Sep 2014 00:24:53 +
+
dballe (5.18-1) unstable; urgency=low
* New upstream release
diff -Nru dballe-5.18/debian/control dballe-5.18/debian/control
--- dballe-5.18/debian/control 2012-05-16 15:47:20.0 -0300
+++ dballe-5.18/debian/control 2014-09-04 20:48:51.0 -0300
@@ -159,7 +159,7 @@
Package: provami
Section: misc
Architecture: all
-Depends: python-dballe, python-wxgtk2.8, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: python-dballe, python-wxgtk3.0, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Suggests: python-rpy2
XB-Python-Version: ${python:Versions}
Provides: ${python:Provides}
diff -Nru dballe-5.18/debian/patches/series dballe-5.18/debian/patches/series
--- dballe-5.18/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ dballe-5.18/debian/patches/series 2014-09-04 20:49:09.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru dballe-5.18/debian/patches/wxpython3.0.patch dballe-5.18/debian/patches/wxpython3.0.patch
--- dballe-5.18/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ dballe-5.18/debian/patches/wxpython3.0.patch 2014-09-04 21:25:31.0 -0300
@@ -0,0 +1,47 @@
+Description: Update for wxWidgets 3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759043
+Forwarded: no
+Last-Update: 2014-09-04
+
+Index: dballe-5.18/provami/provami/Navigator.py
+===
+--- dballe-5.18.orig/provami/provami/Navigator.py
dballe-5.18/provami/provami/Navigator.py
+@@ -237,7 +237,7 @@ class Navigator(wx.Frame, ProgressListen
+ elif event.GetId() == Navigator.ACTION_EXPORT:
+ # dlg = wx.FileDialog(
+ # self, message=Save file as..., defaultDir=os.getcwd(),
+-# defaultFile=, style=wx.SAVE
++# defaultFile=, style=wx.FD_SAVE
+ # )
+ wildcards=According to file extension|*|BUFR optimal template (*.bufr)|*.bufr|BUFR generic template (*.bufr)|*.bufr|CREX (*.crex)|*.crex|Comma Separated Values (*.csv)|*.csv
+ if Model.HAS_RPY:
+@@ -245,8 +245,8 @@ class Navigator(wx.Frame, ProgressListen
+
+ dlg = wx.FileDialog(
+ self, message=Save file as..., defaultDir=os.getcwd(),
+-#defaultFile=, wildcard=According to file extension|*|BUFR optimal template (*.bufr)|*.bufr|BUFR generic template (*.bufr)|*.bufr|CREX (*.crex)|*.crex|Comma Separated Values (*.csv)|*.csv|GNU R data file (*.Rdata)|*.Rdata|Pickled volNd Python objects (*.volnd)|*.volnd, style=wx.SAVE
+-defaultFile=, wildcard=wildcards, style=wx.SAVE
++#defaultFile=, wildcard=According to file extension|*|BUFR optimal template (*.bufr)|*.bufr|BUFR generic template (*.bufr)|*.bufr|CREX (*.crex)|*.crex|Comma Separated Values (*.csv)|*.csv|GNU R data file (*.Rdata)|*.Rdata|Pickled volNd Python objects (*.volnd)|*.volnd, style=wx.FD_SAVE
++defaultFile=, wildcard=wildcards, style=wx.FD_SAVE
+ )
+
+ # Show the dialog and retrieve the user response. If it is the OK response,
+Index: dballe-5.18/provami/provami.py
+===
+--- dballe-5.18.orig/provami/provami.py
dballe-5.18/provami/provami.py
+@@ -43,7 +43,11 @@ if __name__ == __main__:
+ from provami.ProvamiArtProvider import ProvamiArtProvider
+ from provami.Navigator import Navigator
+
+-app = wx.PySimpleApp()
++class PySimpleApp(wx.App):
++ def OnInit(self):
++ return True
++
++app = PySimpleApp()
+ db = dballe.DB()
+ if dballe.DB.is_url(opts.dsn):
+ db.connect_from_url(opts.dsn)
Bug#759045: congruity: Patch for wxWidgets 3.0
Control: tags 759045 + patch
I rebuilt congruity with the attached patch. This allows it to
be run, but it seems I can't get very far without an EZX file,
which I don't have.
Please could you test the patched package works as intended?
Cheers,
Olly
diff -Nru congruity-18/debian/changelog congruity-18/debian/changelog
--- congruity-18/debian/changelog 2014-04-23 21:32:11.0 -0300
+++ congruity-18/debian/changelog 2014-09-05 22:41:55.0 -0300
@@ -1,3 +1,11 @@
+congruity (18-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759045):
+- New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Sat, 06 Sep 2014 00:56:45 +
+
congruity (18-1) unstable; urgency=medium
* New upstream release (Closes: #743050)
diff -Nru congruity-18/debian/control congruity-18/debian/control
--- congruity-18/debian/control 2014-04-23 21:31:06.0 -0300
+++ congruity-18/debian/control 2014-09-05 21:23:54.0 -0300
@@ -11,7 +11,7 @@
Depends: python, python (= 2.5) | python-ctypes,
python-libconcord (= 1.0),
python-suds,
- python-wxgtk2.8,
+ python-wxgtk3.0,
shared-mime-info,
${misc:Depends}
Description: graphical utility to configure Logitech Harmony remotes
diff -Nru congruity-18/debian/patches/series congruity-18/debian/patches/series
--- congruity-18/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ congruity-18/debian/patches/series 2014-09-05 22:34:59.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru congruity-18/debian/patches/wxpython3.0.patch congruity-18/debian/patches/wxpython3.0.patch
--- congruity-18/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ congruity-18/debian/patches/wxpython3.0.patch 2014-09-05 22:42:59.0 -0300
@@ -0,0 +1,54 @@
+Description: Updates for wxPython 3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759045
+Forwarded: no
+Last-Update: 2014-09-05
+
+--- congruity-18.orig/congruity
congruity-18/congruity
+@@ -33,11 +33,17 @@ import wx.lib.dialogs
+
+ version = 18
+
++class MySimpleApp(wx.App):
++def OnInit(self):
++ # Suppress WXDEBUG assertions, as happens by default with wx2.8.
++ self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
++ return True
++
+ try:
+ import libconcord
+ except:
+ str = traceback.format_exc()
+-app = wx.PySimpleApp()
++app = MySimpleApp()
+ dlg = wx.MessageDialog(
+ None,
+ Could not load libconcord; please ensure it, and the Python
+@@ -53,7 +59,7 @@ try:
+ libconcord.update_configuration
+ except:
+ str = traceback.format_exc()
+-app = wx.PySimpleApp()
++app = MySimpleApp()
+ dlg = wx.MessageDialog(
+ None,
+ Could not load the correct version of libconcord; please ensure
+@@ -224,6 +230,7 @@ class DecoratedContainer(wx.Panel):
+ wx.Panel.__init__(self, parent)
+
+ self.sizer = wx.GridBagSizer(5, 5)
++self.sizer.SetCols(3)
+ self.sizer.AddGrowableCol(2)
+ self.SetSizer(self.sizer)
+
+@@ -1873,8 +1880,7 @@ def main(argv):
+ ezhex_filename = None
+ initial_exception = (Command-line error, exception_message())
+
+-app = wx.PySimpleApp()
+-wx.InitAllImageHandlers()
++app = MySimpleApp()
+
+ resources = Resources(appdir, no_web)
+ resources.LoadImages()
Bug#760619: qutemol: diff for NMU version 0.4.1~cvs20081111-3.2
Package: qutemol Version: 0.4.1~cvs2008-3.1 Severity: normal Tags: patch Dear maintainer, My recent NMU fails to build on non-Linux platforms (due to an unnecessary '#ifdef __linux__' in an existing patch), so I've fixed that with another NMU with just removes that check, versioned as 0.4.1~cvs2008-3.2. Cheers, Olly diff -u qutemol-0.4.1~cvs2008/debian/changelog qutemol-0.4.1~cvs2008/debian/changelog --- qutemol-0.4.1~cvs2008/debian/changelog +++ qutemol-0.4.1~cvs2008/debian/changelog @@ -1,3 +1,11 @@ +qutemol (0.4.1~cvs2008-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/20_main.cpp.dpatch: Fix to load the XPM icon on non-Linux +too - should fix FTBFS on kfreebsd and hurd. + + -- Olly Betts o...@survex.com Thu, 04 Sep 2014 22:15:31 + + qutemol (0.4.1~cvs2008-3.1) unstable; urgency=medium * Non-maintainer upload. diff -u qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch --- qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch +++ qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch @@ -8,15 +8,12 @@ --- a/src/main.cpp +++ b/src/main.cpp -@@ -52,7 +52,10 @@ +@@ -52,7 +52,7 @@ # include GL/glu.h #endif -//#include sample.xpm -+#ifdef __linux__ +#include sample.xpm -+typedef unsigned char byte; -+#endif typedef unsigned char Byte; typedef unsigned int uint;
Bug#758950: djvusmooth: Please update to use wxpython3.0
On Thu, Sep 04, 2014 at 09:31:42AM +0200, Daniel Stender wrote: I've rechecked 0.2.14-3 and PageUp/PageDown for page turning aren't yet working on my Laptop, is that reproducible? Those work for me with focus in the Outline, but not the Hyperlinks or Text. Looks like those will also need a wx.EVT_KEY_DOWN handler for these keys, like I added to OutlineBrowser. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759056: dicompyler: Please update to use wxpython3.0
Hi Andreas, On Thu, Sep 04, 2014 at 12:26:39AM +0200, Andreas Tille wrote: On Sun, Aug 24, 2014 at 12:19:35PM +1200, Olly Betts wrote: Source: dicompyler Version: 0.4.1-1-2 Severity: important Tags: sid jessie User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 ... http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git ... I used the script I found there but if I run the patched application (see Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/dicompyler/trunk/ ) I get: $ dicompyler Traceback (most recent call last): File /usr/lib/python2.7/runpy.py, line 162, in _run_module_as_main __main__, fname, loader, pkg_name) File /usr/lib/python2.7/runpy.py, line 72, in _run_code exec code in run_globals File /usr/share/dicompyler/main.py, line 23, in module from wx.lib.pubsub import Publisher as pub ImportError: cannot import name Publisher swig/python detected a memory leak of type 'wxPyXmlSubclassFactory *', no destructor found. Any hint how to fix this? It seems the pubsub stuff (which isn't in the C++ API but wxPython bundles) changed API quite a bit. I hit that ImportError when I tried to rebuild bitpim, but ucko fixed it before I looked into what was going on: Use a less ancient pubsub interface. https://packages.qa.debian.org/b/bitpim/news/20140829T230338Z.html It looks like bitpim's patches aren't split out, but a debdiff between -3 and -4 would likely be instructive: http://sources.debian.net/src/bitpim/1.0.7%2Bdfsg1-4/debian/ Hope that's a helpful pointer. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#757886: fontypython: diff for NMU version 0.4.4-1.1
Control: tags 757886 + pending
Dear maintainer,
I've upload an NMU for fontypython (versioned as 0.4.4-1.1).
The only changes from the patch I attached before is that the bug number
is now in the changelog, and the changelog entry date updated to today.
Cheers,
Olly
diff -Nru fontypython-0.4.4/debian/changelog fontypython-0.4.4/debian/changelog
--- fontypython-0.4.4/debian/changelog 2012-04-15 04:51:49.0 -0300
+++ fontypython-0.4.4/debian/changelog 2014-09-03 21:18:51.0 -0300
@@ -1,3 +1,11 @@
+fontypython (0.4.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8.
+(Closes: #757886)
+
+ -- Olly Betts o...@survex.com Thu, 04 Sep 2014 00:18:50 +
+
fontypython (0.4.4-1) unstable; urgency=low
* New upstream release
diff -Nru fontypython-0.4.4/debian/control fontypython-0.4.4/debian/control
--- fontypython-0.4.4/debian/control 2012-03-22 09:48:34.0 -0300
+++ fontypython-0.4.4/debian/control 2014-08-11 19:33:49.0 -0300
@@ -5,7 +5,7 @@
Build-Depends: debhelper (= 7.0.50~)
Build-Depends-Indep: python (= 2.6),
python-imaging,
- python-wxgtk2.8
+ python-wxgtk3.0
Homepage: https://savannah.nongnu.org/projects/fontypython
Standards-Version: 3.9.3
X-Python-Version: = 2.6
@@ -15,7 +15,7 @@
Depends: ${misc:Depends},
${python:Depends},
python-imaging,
- python-wxgtk2.8
+ python-wxgtk3.0
Description: Find, view and manage font files of all kinds
You can quickly view and filter arbitrary TTF, TTC, OTF or Type1 font files
and then gather them together into 'pogs' which can be installed or removed as
Bug#742031: openbabel: diff for NMU version 2.3.2+dfsg-1.4
I've uploaded an NMU for openbabel (versioned as 2.3.2+dfsg-1.4). It's the same patch I originally posted to this ticket, except rebased on top of the more recent NMUs. Cheers, Olly diff -Nru openbabel-2.3.2+dfsg/debian/changelog openbabel-2.3.2+dfsg/debian/changelog --- openbabel-2.3.2+dfsg/debian/changelog 2014-08-11 05:08:40.0 -0300 +++ openbabel-2.3.2+dfsg/debian/changelog 2014-09-03 20:48:37.0 -0300 @@ -1,3 +1,10 @@ +openbabel (2.3.2+dfsg-1.4) unstable; urgency=low + + * Non-maintainer upload. + * Update to use wxwidgets3.0. + + -- Olly Betts o...@survex.com Wed, 03 Sep 2014 23:48:34 + + openbabel (2.3.2+dfsg-1.3) unstable; urgency=medium * Non-maintainer upload diff -Nru openbabel-2.3.2+dfsg/debian/control openbabel-2.3.2+dfsg/debian/control --- openbabel-2.3.2+dfsg/debian/control 2014-01-16 15:06:20.0 -0300 +++ openbabel-2.3.2+dfsg/debian/control 2014-09-03 20:47:26.0 -0300 @@ -9,7 +9,7 @@ libcairo2-dev, libeigen3-dev, libperl-dev, - libwxgtk2.8-dev, + libwxgtk3.0-dev, libxml2-dev, pkg-config, python-all-dev ( 2.6.6-3~),
Bug#758950: djvusmooth: Please update to use wxpython3.0
On Wed, Sep 03, 2014 at 01:43:39PM +0200, Jakub Wilk wrote:
* Olly Betts o...@survex.com, 2014-08-24, 03:53:
I'm not sure why it doesn't just work (as
wxPython/demo/TreeCtrl.py from the wxPython 3.0 sources does and
the code is very similar) but adding a handler for EVT_RIGHT_CLICK
which calls EditLabel() makes it work as before.
Wait, _right_ click? With wxPython 2.8, if you had wx.TR_EDIT_LABELS
in the style, you could edit stuff with _left_ click.
There's something odd here, which I can't entirely explain.
These editable labels aren't a feature I've used before, and the wx docs
seem silent on how you are meant to actually trigger an edit. So I
experimented using demo/TreeCtrl.py in the wxPython sources.
With that, you have to *right* click on an item to edit its label, so
that's the behaviour I reproduced in my patch.
But looking more closely at the code of that demo, the rather odd thing
is that it doesn't actually enabled wx.TR_EDIT_LABELS - there's a line
for it, but it is commented out. If you turn it on, then left click
also edits (as you say).
You might need to similarly fix the other wx.TreeCtrl - the djvu
file I had to hand for testing had no text so I couldn't check
that.
I use /usr/share/doc/libdjvulibre-dev/djvulibre-book-ru.djvu for
testing.
Thanks, that's a much more useful file for testing.
The attached patch fixes edits to work in both the controls on left
click (which is the ACTIVATED event).
Cheers,
Olly
diff -Nru djvusmooth-0.2.14/debian/changelog djvusmooth-0.2.14/debian/changelog
--- djvusmooth-0.2.14/debian/changelog 2014-08-25 05:08:06.0 -0300
+++ djvusmooth-0.2.14/debian/changelog 2014-09-03 22:16:02.0 -0300
@@ -1,3 +1,10 @@
+djvusmooth (0.2.14-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix label editing in tree controls.
+
+ -- Olly Betts o...@survex.com Thu, 04 Sep 2014 01:15:34 +
+
djvusmooth (0.2.14-3) unstable; urgency=low
* wxpython3.0 transition (Closes: #758950):
diff -Nru djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch
--- djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch 2014-08-25 04:59:44.0 -0300
+++ djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch 2014-09-03 22:31:14.0 -0300
@@ -3,10 +3,12 @@
Bug: https://bugs.debian.org/758950
Forwarded: yes
Reviewed-by: Olly Betts o...@survex.com
-Last-Update: 2014-08-25
+Last-Update: 2014-09-03
a/lib/dependencies.py
-+++ b/lib/dependencies.py
+Index: djvusmooth-0.2.14/lib/dependencies.py
+===
+--- djvusmooth-0.2.14.orig/lib/dependencies.py
djvusmooth-0.2.14/lib/dependencies.py
@@ -14,7 +14,10 @@
Checks for djvusmooth dependencies.
'''
@@ -19,7 +21,7 @@
DDJVU_API_MIN_VERSION = 26
PYTHON_DJVULIBRE_MIN_VERSION = (0, 1, 4)
-@@ -55,7 +58,7 @@
+@@ -55,7 +58,7 @@ def _check_wx():
except ImportError, ex:
raise ImportError('%s; perhaps wxPython is not installed' % (ex,))
if not wxversion.checkInstalled(WX_VERSIONS):
@@ -28,9 +30,11 @@
wxversion.select(WX_VERSIONS)
_check_signals()
a/lib/gui/main.py
-+++ b/lib/gui/main.py
-@@ -62,10 +62,6 @@
+Index: djvusmooth-0.2.14/lib/gui/main.py
+===
+--- djvusmooth-0.2.14.orig/lib/gui/main.py
djvusmooth-0.2.14/lib/gui/main.py
+@@ -62,10 +62,6 @@ WxDjVuMessage, wx.EVT_DJVU_MESSAGE = wx.
system_encoding = locale.getpreferredencoding()
@@ -41,7 +45,7 @@
class OpenDialog(wx.FileDialog):
__wildcard = _(
-@@ -75,7 +71,7 @@
+@@ -75,7 +71,7 @@ class OpenDialog(wx.FileDialog):
def __init__(self, parent):
wx.FileDialog.__init__(self, parent,
@@ -50,7 +54,7 @@
wildcard=self.__wildcard,
message=_('Open a DjVu document')
)
-@@ -355,7 +351,7 @@
+@@ -355,7 +351,7 @@ class MainWindow(wx.Frame):
self.status_bar = self.CreateStatusBar(2, style = wx.ST_SIZEGRIP)
self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
self.splitter.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, self.on_splitter_sash_changed)
@@ -59,7 +63,7 @@
self.text_browser = TextBrowser(self.sidebar)
self.outline_browser = OutlineBrowser(self.sidebar)
self.maparea_browser = MapAreaBrowser(self.sidebar)
-@@ -363,7 +359,7 @@
+@@ -363,7 +359,7 @@ class MainWindow(wx.Frame):
self.sidebar.AddPage(self.maparea_browser, _('Hyperlinks'))
self.sidebar.AddPage(self.text_browser, _('Text'))
self.sidebar.Bind(
@@ -68,9 +72,11 @@
self._on_sidebar_page_changed(
self.on_display_no_nonraster,
self.on_display_maparea,
a/lib/gui/page.py
-+++ b/lib/gui/page.py
-@@ -327,7 +327,7 @@
+Index: djvusmooth-0.2.14/lib/gui/page.py
Bug#758953: python-chaco: Patch for wxPython 3.0
Control: tags 758953 + patch
Dear maintainer,
The attached patch update python-chaco for wxWidgets 3.0.
The package builds cleanly, but it seems to be a module without any
scripts which use it, so I'm not easily able to test it. Please can
you give it a go?
Cheers,
Olly
diff -Nru python-chaco-4.4.1/debian/changelog python-chaco-4.4.1/debian/changelog
--- python-chaco-4.4.1/debian/changelog 2014-07-06 17:27:15.0 -0300
+++ python-chaco-4.4.1/debian/changelog 2014-09-03 23:20:49.0 -0300
@@ -1,3 +1,10 @@
+python-chaco (4.4.1-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0. (Closes: #758953)
+
+ -- Olly Betts o...@survex.com Thu, 04 Sep 2014 02:20:49 +
+
python-chaco (4.4.1-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru python-chaco-4.4.1/debian/control python-chaco-4.4.1/debian/control
--- python-chaco-4.4.1/debian/control 2014-03-15 23:52:57.0 -0300
+++ python-chaco-4.4.1/debian/control 2014-09-03 23:37:50.0 -0300
@@ -14,7 +14,7 @@
Package: python-chaco
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-numpy, python-traitsui, python-enable, python-wxgtk2.8,
+ python-numpy, python-traitsui, python-enable, python-wxgtk3.0,
python-pkg-resources
Description: interactive plotting application toolkit
Chaco is a Python plotting application toolkit and a part of
Bug#758952: python-enable: Patch for wxPython 3.0
Control: tags 758952 + patch
Dear maintainer,
The attached patch updates python-enable for wxWidgets 3.0.
The package builds cleanly, but it seems to be a module without any
scripts which use it, so I'm not easily able to test it. Please can
you give it a go?
Cheers,
Olly
diff -Nru python-enable-4.3.0/debian/changelog python-enable-4.3.0/debian/changelog
--- python-enable-4.3.0/debian/changelog 2014-07-06 16:40:20.0 -0300
+++ python-enable-4.3.0/debian/changelog 2014-09-03 23:18:13.0 -0300
@@ -1,3 +1,10 @@
+python-enable (4.3.0-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0. (Closes: #758952)
+
+ -- Olly Betts o...@survex.com Thu, 04 Sep 2014 02:17:41 +
+
python-enable (4.3.0-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru python-enable-4.3.0/debian/control python-enable-4.3.0/debian/control
--- python-enable-4.3.0/debian/control 2014-03-16 00:29:56.0 -0300
+++ python-enable-4.3.0/debian/control 2014-09-03 23:16:59.0 -0300
@@ -15,7 +15,7 @@
Package: python-enable
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, fonttools,
- python-numpy, python-traitsui, python-wxgtk2.8, python-pkg-resources
+ python-numpy, python-traitsui, python-wxgtk3.0, python-pkg-resources
Description: Drawing and interaction packages
The Enable project provides two related multi-platform packages for
drawing GUI objects.
Bug#758954: drpython: Please update to use wxpython3.0
Control: tag -1 + fixed-upstream On Sat, Aug 23, 2014 at 07:24:26PM +1200, Olly Betts wrote: We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. I noticed there are newer upstream releases of drpython which have already addressed support for wxPython 3.0, but aren't picked up by the watch file - 3.11.4 is currently the newest: https://sourceforge.net/projects/drpython/files/DrPython%20%283.x%29/3.11.4/ Please can you update to the latest upstream version? Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#760323: nautic: diff for NMU version 1.5-1.1
Package: nautic
Version: 1.5-1
Severity: normal
Tags: patch
Dear maintainer,
I've uploaded an NMU for nautic (versioned as 1.5-1.1), fixing the four RC
bugs, the lintian errors and warnings, and some typos.
I dropped DM-Upload-Allowed from debian/control as it is obsolete and
no longer has any effect - the replacement mechanism is detailed here:
https://lists.debian.org/debian-devel-announce/2012/09/msg8.html
There's a minor visual issue with the heights of a few controls in the
rebuilt version - I believe this is a wxwidgets3 bug, which is already
reported upstream. Once there's a fix, I'll apply it to the package.
It doesn't really affect usability - just some of the controls aren't quite
tall enough.
Cheers,
Olly
diff -Nru nautic-1.5/debian/changelog nautic-1.5/debian/changelog
--- nautic-1.5/debian/changelog 2012-10-21 20:11:27.0 -0300
+++ nautic-1.5/debian/changelog 2014-09-02 10:11:27.0 -0300
@@ -1,3 +1,28 @@
+nautic (1.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload with maintainer's consent.
+
+ [ Hideki Yamane ]
+ * debian/rules
+- Just use dh-autoreconf to fix FTBFS (Closes: #662221, #713547)
+ * debian/control
+- add Build-Depends: dh-autoreconf
+
+ [ Olly Betts ]
+ * Update to use wxWidgets 3.0 (Closes: #750972):
+- New patch: wx3.0-compat.patch
+ * Fix a buffer overrun (Closes: #750974):
+- New patch: fix-buffer-overrun.patch
+ * Update to use dh compat level 9 to enable hardening flags.
+ * Standards-Version: 3.9.5 - only change is to drop obsolete
+DM-Upload-Allowed: yes.
+ * Fix typo in long description.
+ * Fix typo in About dialog spotted by lintian (new patch typos.patch).
+ * Override lintian errors about symlinks pointing outside the source
+tree - dh_autoreconf replaces these with files.
+
+ -- Olly Betts o...@survex.com Tue, 02 Sep 2014 13:11:15 +
+
nautic (1.5-1) unstable; urgency=low
* new issue with new view and major changes
diff -Nru nautic-1.5/debian/compat nautic-1.5/debian/compat
--- nautic-1.5/debian/compat 2011-07-02 10:04:00.0 -0300
+++ nautic-1.5/debian/compat 2014-06-09 02:04:37.0 -0300
@@ -1 +1 @@
-7
+9
diff -Nru nautic-1.5/debian/control nautic-1.5/debian/control
--- nautic-1.5/debian/control 2012-10-21 20:14:06.0 -0300
+++ nautic-1.5/debian/control 2014-06-09 02:04:30.0 -0300
@@ -2,12 +2,11 @@
Section: science
Priority: optional
Maintainer: Enas Giovanni gio.e...@alice.it
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (= 7.0.50~),
- autoconf(= 2.13), automake, autotools-dev,
- libglib2.0-0,wx-common,
- libwxgtk2.8-dev,libwxbase2.8-dev
-Standards-Version: 3.9.4
+Build-Depends: debhelper (= 9),
+ dh-autoreconf,
+ libglib2.0-0,
+ libwxgtk3.0-dev
+Standards-Version: 3.9.5
Homepage: https://sourceforge.net/projects/nauticalmanac/
Package: nautic
@@ -16,7 +15,7 @@
Description: computation of observer position in astro-navigation
Nautical ephemeris are included until 2030 with no relevant error for
all navigational bodies, 56 stars, Sun, Moon and 4 major planets.
- The local meridan time can be computed directly from time UT: sextant
+ The local meridian time can be computed directly from time UT: sextant
altitude correction is computed automatically after inserting the
value of height of eye with the correction tables of the Admiralty
Nautical Almanac.
diff -Nru nautic-1.5/debian/patches/fix-buffer-overrun.patch nautic-1.5/debian/patches/fix-buffer-overrun.patch
--- nautic-1.5/debian/patches/fix-buffer-overrun.patch 1969-12-31 21:00:00.0 -0300
+++ nautic-1.5/debian/patches/fix-buffer-overrun.patch 2014-06-09 02:46:01.0 -0300
@@ -0,0 +1,17 @@
+Description: Fix buffer overrrun
+ The loops which access moon_alt assume it has 514 elements, not 504.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/750974
+Last-Update: 2014-06-09
+
+--- nautic-1.5.orig/src/h_correction.cpp
nautic-1.5/src/h_correction.cpp
+@@ -79,7 +79,7 @@ static double mean_alt[]= {
+ 9,14,19,24,29,34,39,44,49,54,59,64,69,74,79,84,89,
+ };
+
+-static double moon_alt[504];
++static double moon_alt[514];
+
+ static double moon_refrac[] = { 0.0, 0.0,
+ 66.9, 67.2, 67.4, 67.6, 67.8, 68.0, 68.2, 68.4, 68.6, 68.7, 68.9, 69.0,
diff -Nru nautic-1.5/debian/patches/series nautic-1.5/debian/patches/series
--- nautic-1.5/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ nautic-1.5/debian/patches/series 2014-06-09 02:09:42.0 -0300
@@ -0,0 +1,3 @@
+wx3.0-compat.patch
+fix-buffer-overrun.patch
+typos.patch
diff -Nru nautic-1.5/debian/patches/typos.patch nautic-1.5/debian/patches/typos.patch
--- nautic-1.5/debian/patches/typos.patch 1969-12-31 21:00:00.0 -0300
+++ nautic-1.5/debian/patches/typos.patch 2014-06-09 02:10:08.0 -0300
@@ -0,0 +1,15 @@
+Description: Fix typo spotted by lintian
+Author: Olly Betts o...@survex.com
+Last-Update: 2014-06-09
+
+--- nautic-1.5.orig/src/about.cpp
nautic
Bug#751262: barry: diff for NMU version 0.18.5-1.1
Control: tags 751262 + pending
Dear maintainer,
I've prepared an NMU for barry (versioned as 0.18.5-1.1) and
uploaded it. This is the same patch I sent before, but with the
debian/changelog entry date updated, and the package rebuilt.
Cheers,
Olly
diff -Nru barry-0.18.5/debian/changelog barry-0.18.5/debian/changelog
--- barry-0.18.5/debian/changelog 2013-11-18 15:32:59.0 -0300
+++ barry-0.18.5/debian/changelog 2014-09-02 20:18:39.0 -0300
@@ -1,3 +1,13 @@
+barry (0.18.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to build with wxWidgets 3.0 (Closes: #751262):
+- New patch: wx3.0-compat.patch
+ * Fix bad use of sizeof():
+- New patch: fix-sizeof-use.patch
+
+ -- Olly Betts o...@survex.com Tue, 02 Sep 2014 23:18:25 +
+
barry (0.18.5-1) unstable; urgency=low
* New upstream version 0.18.5
diff -Nru barry-0.18.5/debian/control barry-0.18.5/debian/control
--- barry-0.18.5/debian/control 2013-11-18 15:32:59.0 -0300
+++ barry-0.18.5/debian/control 2014-03-13 22:48:15.0 -0300
@@ -32,7 +32,7 @@
Section: misc
Priority: optional
Maintainer: Chris Frey cdf...@foursquare.net
-Build-Depends: debhelper (= 7.0.0), g++ (= 4.1), cdbs, autoconf, autoconf-archive, automake, libtool, pkg-config, libusb-dev, libboost-serialization-dev, libxml++2.6-dev, libfuse-dev (= 2.5), zlib1g-dev, libtar-dev, libglibmm-2.4-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, autopoint | gettext ( 0.18), libgcal-dev, wx-common, libwxgtk2.8-dev, libsdl-dev, php5-cli
+Build-Depends: debhelper (= 7.0.0), g++ (= 4.1), cdbs, autoconf, autoconf-archive, automake, libtool, pkg-config, libusb-dev, libboost-serialization-dev, libxml++2.6-dev, libfuse-dev (= 2.5), zlib1g-dev, libtar-dev, libglibmm-2.4-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, autopoint | gettext ( 0.18), libgcal-dev, wx-common, libwxgtk3.0-dev, libsdl-dev, php5-cli
Standards-Version: 3.9.4
Homepage: http://netdirect.ca/barry
Vcs-Git: git://repo.or.cz/barry.git -b v0.18.x
diff -Nru barry-0.18.5/debian/patches/fix-sizeof-use.patch barry-0.18.5/debian/patches/fix-sizeof-use.patch
--- barry-0.18.5/debian/patches/fix-sizeof-use.patch 1969-12-31 21:00:00.0 -0300
+++ barry-0.18.5/debian/patches/fix-sizeof-use.patch 2014-08-13 21:48:01.0 -0300
@@ -0,0 +1,30 @@
+Description: Fix sizeof(pointer) to be sizeof(buffer_pointed_to)
+Author: Olly Betts o...@survex.com
+Forwarded: no
+Last-Update: 2014-08-14
+
+--- a/src/vformat.c
b/src/vformat.c
+@@ -1881,11 +1881,11 @@
+
+ //static unsigned char _evc_base64_rank[256];
+
+-static void base64_init(char *rank)
++static void base64_init(char *rank, size_t len)
+ {
+ int i;
+
+- memset(rank, 0xff, sizeof(rank));
++ memset(rank, 0xff, len);
+ for (i=0;i64;i++) {
+ rank[(unsigned int)base64_alphabet[i]] = i;
+ }
+@@ -2011,7 +2011,7 @@
+ static size_t base64_decode_step(const unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save)
+ {
+ unsigned char base64_rank[256];
+- base64_init((char*)base64_rank);
++ base64_init((char*)base64_rank, sizeof(base64_rank));
+
+ register const unsigned char *inptr;
+ register unsigned char *outptr;
diff -Nru barry-0.18.5/debian/patches/series barry-0.18.5/debian/patches/series
--- barry-0.18.5/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ barry-0.18.5/debian/patches/series 2014-08-13 21:48:34.0 -0300
@@ -0,0 +1,2 @@
+wx3.0-compat.patch
+fix-sizeof-use.patch
diff -Nru barry-0.18.5/debian/patches/wx3.0-compat.patch barry-0.18.5/debian/patches/wx3.0-compat.patch
--- barry-0.18.5/debian/patches/wx3.0-compat.patch 1969-12-31 21:00:00.0 -0300
+++ barry-0.18.5/debian/patches/wx3.0-compat.patch 2014-08-13 21:46:23.0 -0300
@@ -0,0 +1,58 @@
+Description: Fix to build with wxWidgets 3.0
+Author: Olly Betts o...@survex.com
+Last-Update: 2014-08-14
+
+--- a/desktop/src/Mode.h
b/desktop/src/Mode.h
+@@ -23,6 +23,7 @@
+ #define __BARRYDESKTOP_MODE_H__
+
+ #include wx/wx.h
++#include wx/listctrl.h
+
+ class Mode
+ {
+--- a/desktop/src/bsyncjail.cc
b/desktop/src/bsyncjail.cc
+@@ -177,8 +177,8 @@
+ void BarrySyncJail::HandleConflict(OpenSync::SyncConflict conflict)
+ {
+ OpenSync::SyncConflict::iterator i;
+- int size = 0;
+- wxChar *buf = 0;
++ size_t size = 0;
++ const wxChar *buf = 0;
+
+ // start with a new sequence ID
+ m_sequenceID++;
+@@ -218,7 +218,7 @@
+ }
+
+ // then wait on the server to tell us what choice was made
+- buf = m_conflict_con-Request(CONFLICT_ITEM_ANSWER, size);
++ buf = (const wxChar *)m_conflict_con-Request(CONFLICT_ITEM_ANSWER, size);
+ if( buf ) {
+ wxString msg(buf);
+ istringstream iss(string(msg.utf8_str()));
+--- a/desktop/src/MigrateDlg.cc
b/desktop/src/MigrateDlg.cc
+@@ -81,7 +81,7 @@
+ wxCommandEvent event(MET_PROMPT_PASSWORD, wxID_ANY);
+ event.SetEventObject(m_dlg);
+ event.SetInt(bp.remaining_tries());
+- m_dlg-AddPendingEvent(event);
++ m_dlg-GetEventHandler()-ProcessEvent(event);
+ m_dlg
Bug#756061: Lack of time by maintainer
On Tue, Sep 02, 2014 at 02:48:14PM -0400, Chris Frey wrote: I don't mind if you upload with your patch. Thanks, uploaded. I'd kinda like to have a patch that still allows things to work with wxWidgets 2.8, but if I really want that, I'll probably have to code it. :-) I've not actually tried it, but I'd be most surprised if my patch wasn't compatible with wx 2.8 too. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#757304: pyro: diff for NMU version 1:3.14-1.2
Control: tags 757304 + pending
Dear maintainer,
I've prepared an NMU for pyro (versioned as 1:3.14-1.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Cheers,
Olly
diff -Nru pyro-3.14/debian/changelog pyro-3.14/debian/changelog
--- pyro-3.14/debian/changelog 2011-11-24 00:49:18.0 -0300
+++ pyro-3.14/debian/changelog 2014-09-02 21:57:35.0 -0300
@@ -1,3 +1,10 @@
+pyro (1:3.14-1.2) unstable; urgency=medium
+
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8.
+(Closes: #757304)
+
+ -- Olly Betts o...@survex.com Thu, 07 Aug 2014 13:51:50 +1200
+
pyro (1:3.14-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru pyro-3.14/debian/control pyro-3.14/debian/control
--- pyro-3.14/debian/control 2011-11-24 00:43:53.0 -0300
+++ pyro-3.14/debian/control 2014-08-06 22:51:25.0 -0300
@@ -34,7 +34,7 @@
Package: pyro-gui
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, pyro, python-tk, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, pyro, python-tk, python-wxgtk3.0
Description: graphical tool for Pyro
Pyro (PYthon Remote Object) is an easy to use and powerful distributed object
system for Python.
Bug#758949: mmass: Patch for wxWidgets3.0 compatibility
Control: tags 758949 + patch
Attached is a patch for wxWidgets 3.0 compatibility.
I've rebuilt with this patch, and the GUI seems to run OK, but I don't know
enough about the domain it works in to really be able to usefully test its
specific functionality.
Cheers,
Olly
diff -Nru mmass-5.5.0/debian/changelog mmass-5.5.0/debian/changelog
--- mmass-5.5.0/debian/changelog 2014-08-18 10:11:16.0 -0300
+++ mmass-5.5.0/debian/changelog 2014-09-02 22:03:49.0 -0300
@@ -1,3 +1,11 @@
+mmass (5.5.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxwidgets3.0 (Closes: #758949):
++ New patch wxwidgets3.0.patch
+
+ -- Olly Betts o...@survex.com Wed, 03 Sep 2014 01:03:47 +
+
mmass (5.5.0-3) unstable; urgency=medium
* mv upstream upstream/metadata;
diff -Nru mmass-5.5.0/debian/control mmass-5.5.0/debian/control
--- mmass-5.5.0/debian/control 2014-08-18 10:11:16.0 -0300
+++ mmass-5.5.0/debian/control 2014-09-02 21:41:19.0 -0300
@@ -12,7 +12,7 @@
Package: mmass
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.8 (= 2.8.10.1-3+b1), python-numpy (= 1.4.1), mmass-modules (= ${binary:Version})
+Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk3.0, python-numpy (= 1.4.1), mmass-modules (= ${binary:Version})
XB-Python-Version: ${python:Versions}
Description: Mass spectrometry tool for proteomics
mMass is a free mass spectrum viewer/analyzer in which the
diff -Nru mmass-5.5.0/debian/patches/series mmass-5.5.0/debian/patches/series
--- mmass-5.5.0/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ mmass-5.5.0/debian/patches/series 2014-09-02 21:45:15.0 -0300
@@ -0,0 +1 @@
+wxwidgets3.0.patch
diff -Nru mmass-5.5.0/debian/patches/wxwidgets3.0.patch mmass-5.5.0/debian/patches/wxwidgets3.0.patch
--- mmass-5.5.0/debian/patches/wxwidgets3.0.patch 1969-12-31 21:00:00.0 -0300
+++ mmass-5.5.0/debian/patches/wxwidgets3.0.patch 2014-09-02 22:03:46.0 -0300
@@ -0,0 +1,295 @@
+Description: Update for wxWidgets3.0
+ Changes should also be compatible with wxWidgets2.8.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/758949
+Forwarded: no
+Last-Update: 2014-09-02
+
+Index: mmass-5.5.0/gui/main_frame.py
+===
+--- mmass-5.5.0.orig/gui/main_frame.py
mmass-5.5.0/gui/main_frame.py
+@@ -1526,7 +1526,7 @@ class mainFrame(wx.Frame):
+
+ # ask for name
+ fileName = document.title+'.msd'
+-dlg = wx.FileDialog(self, Save, config.main['lastDir'], fileName, mMass Spectrum Document|*.msd, wx.SAVE|wx.OVERWRITE_PROMPT)
++dlg = wx.FileDialog(self, Save, config.main['lastDir'], fileName, mMass Spectrum Document|*.msd, wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath()
+ config.main['lastDir'] = os.path.split(path)[0]
+Index: mmass-5.5.0/gui/panel_about.py
+===
+--- mmass-5.5.0.orig/gui/panel_about.py
mmass-5.5.0/gui/panel_about.py
+@@ -40,7 +40,7 @@ class panelAbout(frame):
+ About mMass.
+
+ def __init__(self, parent):
+-frame.__init__(self, parent, -1, frameTitle, style=wx.DEFAULT_FRAME_STYLE ~ (wx.RESIZE_BORDER | wx.RESIZE_BOX | wx.MAXIMIZE_BOX | wx.MINIMIZE_BOX))
++frame.__init__(self, parent, -1, frameTitle, style=wx.DEFAULT_FRAME_STYLE ~ (wx.RESIZE_BORDER | wx.MAXIMIZE_BOX | wx.MINIMIZE_BOX))
+ self.parent = parent
+
+ # make gui items
+Index: mmass-5.5.0/gui/panel_calibration.py
+===
+--- mmass-5.5.0.orig/gui/panel_calibration.py
mmass-5.5.0/gui/panel_calibration.py
+@@ -38,7 +38,7 @@ class panelCalibration(wx.MiniFrame):
+ Calibration tool.
+
+ def __init__(self, parent, tool='references'):
+-wx.MiniFrame.__init__(self, parent, -1, 'Calibration', size=(400, 300), style=wx.DEFAULT_FRAME_STYLE ~ (wx.RESIZE_BOX | wx.MAXIMIZE_BOX))
++wx.MiniFrame.__init__(self, parent, -1, 'Calibration', size=(400, 300), style=wx.DEFAULT_FRAME_STYLE ~ wx.MAXIMIZE_BOX)
+
+ self.parent = parent
+ self.processing = None
+Index: mmass-5.5.0/gui/panel_compounds_search.py
+===
+--- mmass-5.5.0.orig/gui/panel_compounds_search.py
mmass-5.5.0/gui/panel_compounds_search.py
+@@ -39,7 +39,7 @@ class panelCompoundsSearch(wx.MiniFrame)
+ Compounds search tool.
+
+ def __init__(self, parent, tool='compounds'):
+-wx.MiniFrame.__init__(self, parent, -1, 'Compounds Search', size=(400, 300), style=wx.DEFAULT_FRAME_STYLE ~ (wx.RESIZE_BOX | wx.MAXIMIZE_BOX))
++wx.MiniFrame.__init__(self, parent, -1, 'Compounds Search', size=(400, 300), style=wx.DEFAULT_FRAME_STYLE
Bug#758951: torchat: Patch for wxwidgets3.0 support
Control: tags 758951 + patch
Attached is a patch for wxwidgets3.0 support. The UI seems to function,
though I don't know anyone using torchat to actually test chatting, so
it would be good if someone who actually uses the package could give it
a more thorough test.
Let me know if you'd like me to NMU these changes.
Cheers,
Olly
diff -Nru torchat-0.9.9.553/debian/changelog torchat-0.9.9.553/debian/changelog
--- torchat-0.9.9.553/debian/changelog 2013-01-14 00:53:06.0 -0300
+++ torchat-0.9.9.553/debian/changelog 2014-09-03 00:09:43.0 -0300
@@ -1,3 +1,11 @@
+torchat (0.9.9.553-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxwidgets3.0 (Closes: #758951):
+- New patch: wxwidgets3.0.patch
+
+ -- Olly Betts o...@survex.com Wed, 03 Sep 2014 03:09:41 +
+
torchat (0.9.9.553-1) unstable; urgency=low
* New upstream release.
diff -Nru torchat-0.9.9.553/debian/control torchat-0.9.9.553/debian/control
--- torchat-0.9.9.553/debian/control 2013-01-14 00:52:51.0 -0300
+++ torchat-0.9.9.553/debian/control 2014-09-02 23:46:33.0 -0300
@@ -11,7 +11,7 @@
Package: torchat
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, tor (= 0.2.1.30-1),
- python-socksipy, python-wxgtk2.8
+ python-socksipy, python-wxgtk3.0
Description: decentralized instant messenger built on top of the Tor Network
TorChat is a peer to peer instant messenger with a completely decentralized
design, built on top of Tor's location hidden services, providing strong
diff -Nru torchat-0.9.9.553/debian/patches/series torchat-0.9.9.553/debian/patches/series
--- torchat-0.9.9.553/debian/patches/series 2013-01-13 22:11:10.0 -0300
+++ torchat-0.9.9.553/debian/patches/series 2014-09-02 23:49:33.0 -0300
@@ -1,2 +1,3 @@
use-system-lib-fix-versions.patch
include-spanish-translations.patch
+wxwidgets3.0.patch
diff -Nru torchat-0.9.9.553/debian/patches/wxwidgets3.0.patch torchat-0.9.9.553/debian/patches/wxwidgets3.0.patch
--- torchat-0.9.9.553/debian/patches/wxwidgets3.0.patch 1969-12-31 21:00:00.0 -0300
+++ torchat-0.9.9.553/debian/patches/wxwidgets3.0.patch 2014-09-03 00:09:39.0 -0300
@@ -0,0 +1,100 @@
+Description: Update for wxwidgets3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/758951
+Forwarded: no
+Last-Update: 2014-09-02
+
+Index: torchat-0.9.9.553/tc_gui.py
+===
+--- torchat-0.9.9.553.orig/tc_gui.py
torchat-0.9.9.553/tc_gui.py
+@@ -306,7 +306,7 @@ class PopupMenu(wx.Menu):
+
+ def onSendFile(self, evt):
+ title = lang.DFT_FILE_OPEN_TITLE % self.buddy.getAddressAndDisplayName()
+-dialog = wx.FileDialog(self.mw, title, style=wx.OPEN)
++dialog = wx.FileDialog(self.mw, title, style=wx.FD_OPEN)
+ dialog.SetDirectory(config.getHomeDir())
+ if dialog.ShowModal() == wx.ID_OK:
+ file_name = dialog.GetPath()
+@@ -516,10 +516,10 @@ class DlgEditContact(wx.Dialog):
+ except:
+ pass
+
+-self.Close()
++self.Destroy()
+
+ def onCancel(self,evt):
+-self.Close()
++self.Destroy()
+
+
+ class DlgEditProfile(wx.Dialog):
+@@ -652,7 +652,7 @@ class DlgEditProfile(wx.Dialog):
+
+ def onAvatar(self, evt):
+ title = lang.DEP_AVATAR_SELECT_PNG
+-dialog = wx.FileDialog(self, title, style=wx.OPEN)
++dialog = wx.FileDialog(self, title, style=wx.FD_OPEN)
+ dialog.SetWildcard(%s (*.png)|*.png|%s (*.*)|*.* % (lang.DEP_PNG_FILES, lang.DEP_ALL_FILES))
+ dialog.SetDirectory(config.getHomeDir())
+ if dialog.ShowModal() == wx.ID_OK:
+@@ -667,7 +667,7 @@ class DlgEditProfile(wx.Dialog):
+ if os.path.exists(avatar_new):
+ tc_client.wipeFile(avatar_new)
+
+-self.Close()
++self.Destroy()
+
+ def onOk(self, evt):
+ config.set(profile, name, self.txt_name.GetValue())
+@@ -695,7 +695,7 @@ class DlgEditProfile(wx.Dialog):
+ buddy.sendProfile()
+ buddy.sendStatus()
+
+-self.Close()
++self.Destroy()
+
+
+ class BuddyList(wx.ListCtrl):
+@@ -1451,7 +1451,7 @@ class ChatWindow(wx.Frame):
+
+ def onSendFile(self, evt):
+ title = lang.DFT_FILE_OPEN_TITLE % self.buddy.getAddressAndDisplayName()
+-dialog = wx.FileDialog(self, title, style=wx.OPEN)
++dialog = wx.FileDialog(self, title, style=wx.FD_OPEN)
+ dialog.SetDirectory(config.getHomeDir())
+ if dialog.ShowModal() == wx.ID_OK:
+ file_name = dialog.GetPath()
+@@ -1748,11 +1748,11 @@ class FileTransferWindow(wx.Frame):
+ self.transfer_object.close()
+ except:
+ pass
+-self.Close()
++self.Destroy()
+
+ def onSave(self, evt):
+ title = lang.DFT_FILE_SAVE_TITLE % self.buddy.getAddressAndDisplayName()
+-dialog = wx.FileDialog
Bug#758944: svn-workbench: Patch for wxPython 3.0
On Wed, Sep 03, 2014 at 12:42:46PM +0900, Hideki Yamane wrote: Go ahead, it'll be nice to put into Jessie, IMO. Thanks, uploaded. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#737050: Some corrections to the package
On Mon, Sep 01, 2014 at 02:52:43PM +0100, Gianfranco Costamagna wrote: Hi, I packaged wx3.0 doc, and after that I discovered this ITP and the package on mentors... I'm happy someone's packaging it, but slightly surprised that nobody thought to mention it to the wx maintainers. For the maintainer I think freewx-maint is the best choice... But I don't have a strong opinion and I have no upload possibilities It seems sensible to me for it to be under the team umbrella, since we maintain the package it is the documentation for, and coordinating uploads of new versions would be helpful to users. I'm certainly happy for more people to join the team. diff -Nru wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees --- wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees1970-01-01 01:00:00.0 +0100 +++ wx3.0-doc-3.0.1/debian/wx3.0-doc.linktrees2014-09-01 15:34:21.0 +0200 @@ -0,0 +1 @@ +replace usr/share/javascript/jquery/jquery.js usr/share/doc/wx3.0-doc/jquery.js My understanding is that doxygen uses a patched version of jquery, so this replacement isn't correct. I'm not sure what the recommended way to fix this is though. There's some information here: https://bugs.debian.org/736360 Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758165: [Freewx-maint] debian bug #755361: saga FTBS on arm*
On Sun, Aug 03, 2014 at 08:10:09PM +0200, Johan Van de Wauw wrote: I am the maintainer of Saga GIS in debian. This package fails to build from source on arm/armel architectures as detailed in: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755361 | /usr/lib/arm-linux-gnueabi/libwx_gtk2u_propgrid-3.0.so: undefined reference to `wxCommandEvent::Clone() const' | collect2: error: ld returned 1 exit status | make[6]: *** [saga_gui] Error 1 | Makefile:756: recipe for target 'saga_gui' failed | make[6]: Leaving directory '/?BUILDDIR?/saga-2.1.2+dfsg/src/saga_core/saga_gui' Since building works fine on other architectures and the error is an undefined reference within one of wx libs I suppose the error is actually in wx rather than in saga. Is this a known problem? This sounds like the same underlying issue: https://bugs.debian.org/758165 Unfortunately, we've yet to get to the bottom of that one. There's an issue with devirtualisation in GCC 4.9 which wx3 triggers, which may be connected: https://bugs.debian.org/752733 That affects wxCommandEvent::Clone() - we have a workaround patch applied, but perhaps it doesn't work on armel. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759092: closing 759092
Control: fixed -1 0.7-2 On Mon, Sep 01, 2014 at 06:20:51PM -0400, Tiago Bortoletto Vaz wrote: close 759092 thanks You're supposed to say how it was fixed, i.e.: python-pyo (0.7-2) unstable; urgency=low . * Depends on python-wxgtk3.0 instead of python-wxgtk2.8 to have the graphical IDE (E-Pyo) working. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#757313: python-pyface: patch to fix wxPython 3.0 deprecation warnings
Control: tags 757313 + pending
Dear maintainer,
The attached patch updates python-pyface to use wxpython3.0, fixes some
deprecation warnings I saw testing some of the packages which use
python-pyface, and updates some constants to use preferred new names.
It would be good to get this update into unstable to aid testing the reverse
dependencies.
Let me know if you'd like me to NMU this change.
Cheers,
Olly
diff -Nru python-pyface-4.4.0/debian/changelog python-pyface-4.4.0/debian/changelog
--- python-pyface-4.4.0/debian/changelog 2014-07-06 17:19:24.0 -0300
+++ python-pyface-4.4.0/debian/changelog 2014-08-31 16:25:39.0 -0300
@@ -1,3 +1,11 @@
+python-pyface (4.4.0-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxpython3.0 (Closes: #757313):
++ New patch: wxpy3.0-compat.patch
+
+ -- Olly Betts o...@survex.com Sun, 31 Aug 2014 19:09:23 +
+
python-pyface (4.4.0-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru python-pyface-4.4.0/debian/control python-pyface-4.4.0/debian/control
--- python-pyface-4.4.0/debian/control 2014-03-16 00:44:34.0 -0300
+++ python-pyface-4.4.0/debian/control 2014-08-07 02:10:41.0 -0300
@@ -13,7 +13,7 @@
Package: python-pyface
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-wxgtk2.8, python-qt4
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-wxgtk3.0, python-qt4
Breaks: python-traitsbackendqt, python-traitsbackendwx
Replaces: python-traitsbackendqt, python-traitsbackendwx
Description: traits-capable windowing framework
diff -Nru python-pyface-4.4.0/debian/patches/series python-pyface-4.4.0/debian/patches/series
--- python-pyface-4.4.0/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ python-pyface-4.4.0/debian/patches/series 2014-08-15 07:54:32.0 -0300
@@ -0,0 +1 @@
+wxpy3.0-compat.patch
diff -Nru python-pyface-4.4.0/debian/patches/wxpy3.0-compat.patch python-pyface-4.4.0/debian/patches/wxpy3.0-compat.patch
--- python-pyface-4.4.0/debian/patches/wxpy3.0-compat.patch 1969-12-31 21:00:00.0 -0300
+++ python-pyface-4.4.0/debian/patches/wxpy3.0-compat.patch 2014-08-31 16:36:09.0 -0300
@@ -0,0 +1,116 @@
+Description: Updates for wxPython 3.0
+ These changes should maintain compatibility with wxPython 2.8.
+Author: Olly Betts o...@survex.com
+Forwarded: no
+Last-Update: 2014-08-15
+
+Index: python-pyface-4.4.0/pyface/ui/wx/directory_dialog.py
+===
+--- python-pyface-4.4.0.orig/pyface/ui/wx/directory_dialog.py
python-pyface-4.4.0/pyface/ui/wx/directory_dialog.py
+@@ -70,7 +70,7 @@ class DirectoryDialog(MDirectoryDialog,
+
+ def _create_control(self, parent):
+ # The default style.
+-style = wx.OPEN
++style = 0
+
+ # Create the wx style depending on which buttons are required etc.
+ if self.new_directory:
+Index: python-pyface-4.4.0/pyface/ui/wx/file_dialog.py
+===
+--- python-pyface-4.4.0.orig/pyface/ui/wx/file_dialog.py
python-pyface-4.4.0/pyface/ui/wx/file_dialog.py
+@@ -105,11 +105,11 @@ class FileDialog(MFileDialog, Dialog):
+ default_filename = self.default_filename
+
+ if self.action == 'open':
+-style = wx.OPEN
++style = wx.FD_OPEN
+ elif self.action == 'open files':
+-style = wx.OPEN | wx.MULTIPLE
++style = wx.FD_OPEN | wx.FD_MULTIPLE
+ else:
+-style = wx.SAVE | wx.OVERWRITE_PROMPT
++style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT
+
+ # Create the actual dialog.
+ dialog = wx.FileDialog(parent, self.title, defaultDir=default_directory,
+Index: python-pyface-4.4.0/pyface/ui/wx/init.py
+===
+--- python-pyface-4.4.0.orig/pyface/ui/wx/init.py
python-pyface-4.4.0/pyface/ui/wx/init.py
+@@ -15,17 +15,17 @@ import wx
+
+
+ # Check the version number is late enough.
+-if wx.VERSION (2, 6):
+-raise RuntimeError, Need wx version 2.6 or higher, but got %s % str(wx.VERSION)
++if wx.VERSION (2, 8):
++raise RuntimeError, Need wx version 2.8 or higher, but got %s % str(wx.VERSION)
+
+ # It's possible that it has already been initialised.
+ _app = wx.GetApp()
+
+ if _app is None:
+-_app = wx.PySimpleApp()
+-
+-# Before we can load any images we have to initialize wxPython's image
+-# handlers.
+-wx.InitAllImageHandlers()
++# wx.PySimpleApp() is deprecated in wx3.0, but this is all it really does:
++class PySimpleApp(wx.App):
++def OnInit(self):
++return True
++_app = PySimpleApp()
+
+ EOF ##
+Index: python-pyface-4.4.0/pyface/wx/dialog.py
Bug#758942: phatch: patch for wxwidgets3.0
Control: tags 758942 + patch
I've attached a patch to update to use wxPython 3.0.
I tried to test the updated package, but wasn't able to actually convert
any images. However, the same is true for the package currently in
unstable using wxPython 2.8 - this issue looks like it's already filed as
#759146.
Let me know if you'd like me to NMU this change.
Cheers,
Olly
diff -Nru phatch-0.2.7.1/debian/changelog phatch-0.2.7.1/debian/changelog
--- phatch-0.2.7.1/debian/changelog 2013-10-02 18:39:40.0 -0300
+++ phatch-0.2.7.1/debian/changelog 2014-08-31 15:19:49.0 -0300
@@ -1,3 +1,11 @@
+phatch (0.2.7.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxpython3.0 (Closes: #758942):
++ New patch: wxpy3.0-compat.patch
+
+ -- Olly Betts o...@survex.com Sun, 31 Aug 2014 18:10:50 +
+
phatch (0.2.7.1-3) unstable; urgency=low
* Replace python-imaging-compat dependency with python-imaging
diff -Nru phatch-0.2.7.1/debian/control phatch-0.2.7.1/debian/control
--- phatch-0.2.7.1/debian/control 2013-10-02 18:41:18.0 -0300
+++ phatch-0.2.7.1/debian/control 2014-08-31 15:11:17.0 -0300
@@ -23,7 +23,7 @@
phatch-cli (= ${binary:Version}),
xdg-utils,
# move these to phatch-wx in the future:
- python-wxgtk2.8,
+ python-wxgtk3.0,
python-wxversion,
Suggests: blender, inkscape
Enhances: thunar
diff -Nru phatch-0.2.7.1/debian/patches/series phatch-0.2.7.1/debian/patches/series
--- phatch-0.2.7.1/debian/patches/series 2011-03-16 16:17:26.0 -0300
+++ phatch-0.2.7.1/debian/patches/series 2014-08-31 15:15:01.0 -0300
@@ -1,2 +1,3 @@
do_not_raise_string_exceptions.patch
pyexiv2.patch
+wxpy3.0-compat.patch
diff -Nru phatch-0.2.7.1/debian/patches/wxpy3.0-compat.patch phatch-0.2.7.1/debian/patches/wxpy3.0-compat.patch
--- phatch-0.2.7.1/debian/patches/wxpy3.0-compat.patch 1969-12-31 21:00:00.0 -0300
+++ phatch-0.2.7.1/debian/patches/wxpy3.0-compat.patch 2014-08-31 15:19:06.0 -0300
@@ -0,0 +1,160 @@
+Description: Updates for wxPython3.0
+ Retains compatibility with 2.8 - there wx.InitAllImageHandlers() is a no-op
+ and wx.THICK_FRAME has the same value as wx.RESIZE_BORDER.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/758942
+Forwarded: no
+Last-Update: 2014-08-31
+
+--- phatch-0.2.7.1.orig/phatch/lib/pyWx/dialogsInspector.py
phatch-0.2.7.1/phatch/lib/pyWx/dialogsInspector.py
+@@ -76,7 +76,6 @@ if __name__ == __main__:
+ gettext.install(app) # replace with the appropriate catalog name
+
+ app = wx.PySimpleApp(0)
+-wx.InitAllImageHandlers()
+ dialog = AddTagDialog(None, -1, )
+ app.SetTopWindow(dialog)
+ dialog.Show()
+--- phatch-0.2.7.1.orig/phatch/lib/pyWx/imageInspector.py
phatch-0.2.7.1/phatch/lib/pyWx/imageInspector.py
+@@ -792,7 +792,7 @@ class Grid(droplet.Mixin, gridlib.Grid):
+ class OpenMixin(object):
+
+ def OnOpen(self, event):
+-style = wx.OPEN | wx.CHANGE_DIR
++style = wx.FD_OPEN | wx.FD_CHANGE_DIR
+ if hasattr(wx, 'FD_PREVIEW'):
+ style |= wx.FD_PREVIEW
+ path = os.path.dirname(self.image_table.images[-1].filename)
+--- phatch-0.2.7.1.orig/phatch/lib/pyWx/paint.py
phatch-0.2.7.1/phatch/lib/pyWx/paint.py
+@@ -115,7 +115,6 @@ def example():
+
+ class TestApp(wx.App):
+ def OnInit(self):
+-wx.InitAllImageHandlers()
+ frame = TestFrame(None, -1, Test, size=(600, 400))
+ frame.EnableBackgroundPainting(frame) # ,color=(245,245,255))
+ self.SetTopWindow(frame)
+--- phatch-0.2.7.1.orig/phatch/lib/pyWx/popup.py
phatch-0.2.7.1/phatch/lib/pyWx/popup.py
+@@ -415,7 +415,7 @@ class FileCtrl(_PathCtrl):
+ wildcard = _t('All files') + '|*'
+
+ def OnBrowse(self, event):
+-style = wx.OPEN | wx.CHANGE_DIR
++style = wx.FD_OPEN | wx.FD_CHANGE_DIR
+ if hasattr(wx, 'FD_PREVIEW'):
+ style |= wx.FD_PREVIEW
+ dlg = wx.FileDialog(self, self._to_local(Choose a file),
+--- phatch-0.2.7.1.orig/phatch/pyWx/dialogs.py
phatch-0.2.7.1/phatch/pyWx/dialogs.py
+@@ -133,7 +133,7 @@ class ExecuteDialog(BrowseMixin, dialogs
+ self.set_drop(drop)
+
+ def browse_files(self):
+-style = wx.OPEN | wx.MULTIPLE | wx.CHANGE_DIR
++style = wx.FD_OPEN | wx.FD_MULTIPLE | wx.FD_CHANGE_DIR
+ if hasattr(wx, 'FD_PREVIEW'):
+ style |= wx.FD_PREVIEW
+ dlg = wx.FileDialog(
+@@ -529,7 +529,6 @@ def example():
+ class App(wx.App):
+
+ def OnInit(self):
+-wx.InitAllImageHandlers()
+ frame = wx.Frame(None, -1, )
+ self.SetTopWindow(frame)
+ frame.Show(False)
+--- phatch-0.2.7.1.orig/phatch/pyWx/gui.py
phatch-0.2.7.1/phatch/pyWx/gui.py
+@@ -29,7 +29,7 @@ import sys
+ #check wx
+ from lib.pyWx.wxcheck import ensure
+ try:
+-wx = ensure('2.8', '2.8')
++wx = ensure
Bug#758940: spe: Patch for wxpython3.0
Control: tags 758940 + patch
I've attached a patch to update spe to use wxPython 3.0.
I did some simple testing of spe with this patch, and it seems to work,
but it isn't an application I'm familiar with and it would be good if
somebody who habitually uses it could do more in-depth testing.
Let me know if you'd like me to NMU this change.
Cheers,
Olly
diff -Nru spe-0.8.4.h/debian/changelog spe-0.8.4.h/debian/changelog
--- spe-0.8.4.h/debian/changelog 2014-08-31 22:15:44.0 -0300
+++ spe-0.8.4.h/debian/changelog 2014-08-31 20:46:36.0 -0300
@@ -1,3 +1,11 @@
+spe (0.8.4.h-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #758940):
++ New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Sun, 31 Aug 2014 23:42:19 +
+
spe (0.8.4.h-3) unstable; urgency=low
* Team upload.
diff -Nru spe-0.8.4.h/debian/control spe-0.8.4.h/debian/control
--- spe-0.8.4.h/debian/control 2014-08-31 22:15:44.0 -0300
+++ spe-0.8.4.h/debian/control 2014-08-31 20:41:38.0 -0300
@@ -15,12 +15,12 @@
Architecture: all
Depends: ${python:Depends},
${misc:Depends},
- python-wxgtk2.8,
+ python-wxgtk3.0,
python-wxglade,
kiki,
winpdb,
pychecker (= 0.8.17-5)
-Recommends: wx2.8-doc
+Recommends: wx3.0-doc
Suggests: blender (= 2.35), python-doc, python-wxtools
Description: Stani's Python Editor
Spe is a Python IDE with auto-indentation, auto completion, call
diff -Nru spe-0.8.4.h/debian/patches/series spe-0.8.4.h/debian/patches/series
--- spe-0.8.4.h/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ spe-0.8.4.h/debian/patches/series 2014-08-31 20:55:48.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru spe-0.8.4.h/debian/patches/wxpython3.0.patch spe-0.8.4.h/debian/patches/wxpython3.0.patch
--- spe-0.8.4.h/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ spe-0.8.4.h/debian/patches/wxpython3.0.patch 2014-08-31 21:08:31.0 -0300
@@ -0,0 +1,330 @@
+Description: Update for wxPython 3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/758940
+Forwarded: no
+Last-Update: 2014-08-31
+
+Index: spe-0.8.4.h/_spe/Child.py
+===
+--- spe-0.8.4.h.orig/_spe/Child.py
spe-0.8.4.h/_spe/Child.py
+@@ -390,7 +390,7 @@ Please try then to change the encoding o
+ dlg = wx.FileDialog(self, Save As - www.stani.be,
+ defaultDir = defaultDir,
+ wildcard= info.WILDCARD,
+-style = wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
++style = wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT|wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() == wx.ID_OK:
+ path= dlg.GetPaths()[0]
+ self.save(path)
+@@ -406,7 +406,7 @@ Please try then to change the encoding o
+ dlg = wx.FileDialog(self, Save a Copy - www.stani.be,
+ defaultDir = defaultDir,
+ wildcard= info.WILDCARD,
+-style = wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
++style = wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT|wx.FD_CHANGE_DIR)
+ if dlg.ShowModal() == wx.ID_OK:
+ path= dlg.GetPaths()[0]
+ try:
+@@ -486,7 +486,7 @@ Please try then to change the encoding o
+ #defaultDir = os.getcwd(),
+ #defaultFile = ,
+ wildcard= Python source (*.py)|*.py|Text (*.txt)|*.txt|All files (*.*)|*.*,
+-style = wx.OPEN | wx.FILE_MUST_EXIST
++style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST
+ )
+ answer = dlg.ShowModal()
+ signature = dlg.GetPath()
+Index: spe-0.8.4.h/_spe/Parent.py
+===
+--- spe-0.8.4.h.orig/_spe/Parent.py
spe-0.8.4.h/_spe/Parent.py
+@@ -430,7 +430,7 @@ class Panel(wx.Notebook):
+ dlg = wx.FileDialog(self, Choose a file - www.stani.be,
+ defaultDir=defaultDir, defaultFile=,
+ wildcard=info.WILDCARD,
+-style=wx.OPEN|wx.MULTIPLE)
++style=wx.FD_OPEN|wx.FD_MULTIPLE)
+ if dlg.ShowModal() == wx.ID_OK:
+ fileList = dlg.GetPaths()
+ if fileList and self.app.children:
+@@ -449,7 +449,7 @@ class Panel(wx.Notebook):
+ dlg = wx.FileDialog(self, Choose a file - www.stani.be,
+ defaultDir=defaultDir, defaultFile=,
+ wildcard=info.WORKSPACE_WILDCARD,
+-style=wx.OPEN)
++style=wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ file = dlg.GetPath()
+ try:
+@@ -479,7 +479,7 @@ class Panel(wx.Notebook):
+ defaultFile = defaultFile,
+ defaultDir = info.dirname(defaultFile),
+ wildcard= info.WORKSPACE_WILDCARD
Bug#750972: nautic: Please update to use wxwidgets3.0
On Mon, Jun 09, 2014 at 08:06:50AM +0200, Gianni Enas wrote: thanks for the advise, I'll try to fix it as soon as I can, please give me time I'm very busy at the moment Time's passing, and the jessie freeze is on November 5th. If nautic is to make it into the next stable release, it would be good to get an upload made fairly soon, so that there's time to uncover any issues arising from switching to wxwidgets 3.0. If you're still busy, would you like me to NMU nautic to fix the 4 RC bugs currently open against it? Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759788: whyteboard: diff for NMU version 0.41.1-4.1
Package: whyteboard
Version: 0.41.1-4
Severity: normal
Tags: patch pending
Control: tags 758204 + pending
Control: tags 725711 + pending
Dear maintainer,
I've prepared an NMU for whyteboard (versioned as 0.41.1-4.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Cheers,
Olly
diff -Nru whyteboard-0.41.1/debian/changelog whyteboard-0.41.1/debian/changelog
--- whyteboard-0.41.1/debian/changelog 2011-08-16 12:22:12.0 -0300
+++ whyteboard-0.41.1/debian/changelog 2014-08-28 22:03:40.0 -0300
@@ -1,3 +1,13 @@
+whyteboard (0.41.1-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8
+(Closes: #758204):
++ New patch: 01_wxpy3.0-compat.patch
+ * Add dependency on python-wxgtk-media3.0. (Closes: #725711)
+
+ -- Olly Betts o...@survex.com Fri, 29 Aug 2014 01:03:39 +
+
whyteboard (0.41.1-4) unstable; urgency=low
* Add python-setuptools to Build-Depends. (Closes: #634411)
diff -Nru whyteboard-0.41.1/debian/control whyteboard-0.41.1/debian/control
--- whyteboard-0.41.1/debian/control 2011-08-16 12:15:08.0 -0300
+++ whyteboard-0.41.1/debian/control 2014-08-17 08:28:01.0 -0300
@@ -12,7 +12,7 @@
Package: whyteboard
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0, python-wxgtk-media3.0
Description: overlay painting and annotation application
Whyteboard is a free painting application for Linux, Windows and Mac. It is
suited towards creating visual presentations and for overlaying PDF images
diff -Nru whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch
--- whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch 1969-12-31 21:00:00.0 -0300
+++ whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch 2014-08-17 09:17:05.0 -0300
@@ -0,0 +1,107 @@
+Description: Fix to work with wxpython3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: http://bugs.debian.org/725711
+Forwarded: no
+Last-Update: 2014-08-15
+
+--- a/whyteboard/gui/frame.py
b/whyteboard/gui/frame.py
+@@ -264,7 +264,7 @@
+ _file = _file.replace(u:, u-).replace(u/, u-)
+
+ name = file_dialog(self, _(Save Whyteboard As...),
+- wx.SAVE | wx.OVERWRITE_PROMPT, wildcard, _dir, _file)
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, wildcard, _dir, _file)
+ if name:
+ if not os.path.splitext(name)[1]: # no file extension
+ name += u'.wtbd'
+@@ -290,7 +290,7 @@
+
+ _dir = self.util.config.get('last_opened_dir') or u
+
+-filename = file_dialog(self, _(Open file...), wx.OPEN, wildcard, _dir)
++filename = file_dialog(self, _(Open file...), wx.FD_OPEN, wildcard, _dir)
+ self.open_file(filename)
+
+
+@@ -330,7 +330,7 @@
+ if not self.util.im_location:
+ return
+ filename = file_dialog(self, _(Export data to...),
+- wx.SAVE | wx.OVERWRITE_PROMPT, uPDF (*.pdf)|*.pdf)
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, uPDF (*.pdf)|*.pdf)
+
+ if filename:
+ ext = os.path.splitext(filename)[1]
+@@ -395,7 +395,7 @@
+ wildcard = _(Whyteboard Preference Files) + u (*.pref)|*.pref
+
+ filename = file_dialog(self, _(Export preferences to...),
+- wx.SAVE | wx.OVERWRITE_PROMPT, wildcard)
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, wildcard)
+ if filename:
+ if not os.path.splitext(filename)[1]:
+ filename += u.pref
+@@ -409,7 +409,7 @@
+
+ wildcard = _(Whyteboard Preference Files) + u (*.pref)|*.pref
+
+-filename = file_dialog(self, _(Import Preferences From...), wx.OPEN,
++filename = file_dialog(self, _(Import Preferences From...), wx.FD_OPEN,
+wildcard, get_home_dir())
+
+ if filename:
+@@ -454,7 +454,7 @@
+ uBMP (*.bmp)|*.bmp|TIFF (*.tiff)|*.tiff)
+
+ dlg = wx.FileDialog(self, _(Export data to...),
+-style=wx.SAVE | wx.OVERWRITE_PROMPT, wildcard=wildcard)
++style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, wildcard=wildcard)
+ if dlg.ShowModal() == wx.ID_OK:
+ filename = dlg.GetPath()
+ _name = os.path.splitext(filename)[1].replace(u., u)
+--- a/whyteboard/gui/panels.py
b/whyteboard/gui/panels.py
+@@ -485,7 +485,7 @@
+ if self.directory:
+ _dir = self.directory
+
+-name = file_dialog(self, _(Choose a media file), wx.OPEN, wildcard, _dir)
++name = file_dialog(self, _(Choose a media file), wx.FD_OPEN, wildcard, _dir)
+ if name:
+ self.do_load_file
Bug#751241: amule: Please update to use wxwidgets3.0
On Wed, Jun 11, 2014 at 03:37:45PM +0200, Werner Mahr wrote: There are just no new features to do, that would need a new release and for now it's more a state of waiting. A new release could fix bugs even if there are no features to do (the BTS suggests there are a number of bugs). There's also updating it to work with newer releases of its dependencies (not just wxWidgets, though that is a current case in point). I want to try wx-3.0 for several weeks now. Maybe in one or two, I find the time. Any progress? If you're stuck on a particular error message (either at build time or run time), I might be able to assist. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#757289: stimfit: Please update to use wxwidgets3.0
Control: severity -1 serious Justification: Blocks two on-going transitions (wxwidgets3.0 and wxpython3.0) On Thu, Aug 07, 2014 at 11:08:54AM -0400, Yaroslav Halchenko wrote: On Thu, 07 Aug 2014, Christoph Schmidt-Hieber wrote: I'm unsure whether we should release 0.13.19 including these changes or use your NMU instead given that we've just uploaded 0.13.18 - Yaro, what do you think? I would not mind NMU at all - but you would need to not forget to ACK it in your next upload (so might end up more of work for you, depending on how easy/complex is to cut a new release). I think it's time we got a fix uploaded one way or the other - if we do it now, there's two months to find and fix any resulting issues before the jessie freeze, which is a comfortable margin. I infer from the above that you probably wouldn't object to an NMU, but I'd rather have a more explicit ACK (or a NACK if you're intending to make an upload yourself shortly). Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#757289: stimfit: Please update to use wxwidgets3.0
On Sat, Aug 30, 2014 at 04:01:47PM +0100, Christoph Schmidt-Hieber wrote: I'm putting together 0.13.19 for upload. Cool. How can I test Debian packaging with wx-3.0 on my local system? Currently pbuilder complains about unresolved dependencies. What's the exact error? It should just work - I just did a quick rebase of my nmudiff onto 1.3.18 and that builds fine for me in sbuild. I'd make sure your pbuilder unstable chroot is up-to-date, and perhaps try recreating it. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#757289: stimfit: Please update to use wxwidgets3.0
Control: tags -1 + pending On Sat, Aug 30, 2014 at 05:02:46PM +0100, Christoph Schmidt-Hieber wrote: @Yaro: stimfit 0.13.19, addressing this bug, has been uploaded to Debian mentors: https://mentors.debian.net/package/stimfit Thanks for uploading. Awesome. If Yaro's unable to sponsor it in a timely fashion, feel free to ping me. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#749659: audacity + wxWidgets 3.0 — Proposing patch
Control: tags -1 + patch
On Wed, Aug 20, 2014 at 11:17:42PM +0200, Martin Steghöfer wrote:
Last weekend I was able to work on this bug. I managed to compile and run
audacity with wxWidgets 3.0 successfully. However, there are still a few
issues to resolve (mainly by wxWidgets upstream).
Sounds great - sorry for not responding sooner, but I only just noticed
your message. Be aware that the Debian BTS doesn't send replies to the
submitter of the bug by default (IMO, a complete misfeature).
As the patch has gotten way larger than I had expected, I feel the need to
explain the changes:
A lot of these changes are things I've seen needed in other packages.
Generally the patch looks good to me (I'm not familiar with the audacity
code, but I am quite familiar with porting code to wx3).
--- a/src/widgets/FileHistory.cpp
+++ b/src/widgets/FileHistory.cpp
@@ -142,7 +142,7 @@
// Stored in reverse order
int n = mHistory.GetCount() - 1;
for (size_t i = 1; i = mHistory.GetCount(); i++) {
- config.Write(wxString::Format(wxT(file%02d), i), mHistory[n--]);
+ config.Write(wxString::Format(wxT(file%02lld), i), mHistory[n--]);
The amended code here assumes sizeof(size_t) == sizeof(long long) - that's not
true on all architectures (both i386 and armel have 4 vs 8, for example). The
same assumption is made elsewhere in the patch.
At least in this case, since we're clearly not going to have billions of
history entries, I'd probably just cast to unsigned:
config.Write(wxString::Format(wxT(file%02u), (unsigned)i), mHistory[n--]);
Maintainers - let me know if you'd like me to NMU with these patches.
Cheers,
Olly
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#749493: gambit: Please update to use wxwidgets3.0
On Tue, May 27, 2014 at 11:54:26PM +1200, Olly Betts wrote: We're aiming to migrate the archive to using wxwidgets3.0 instead of wxwidgets2.8. There's a newer upstream version of gambit which apparently supports wx2.9 (which was the development series leading up to 3.0), so updating the package to the latest upstream release is probably all that's needed to allow it to be built with wxwidgets3.0. The gambit package is orphaned, and has been for 18 months without any indication of interest in adopting it in the O bug. The last maintainer upload for over 3.5 years ago, and the only NMU since was to fix a FTBFS with GCC 4.7. There's a newer upstream release which likely works with wx3.0, but an update from upstream version 0.2010.09.01 to 14.0.2 seems too much for a QA upload. Popcon shows 64 installs, but only 6 votes. So I'm proposing to request removal of the package (RoQA) unless someone steps forward to adopt it. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758507: p9m4: diff for NMU version 0.5.dfsg-2.2
Control: tags 758507 + pending
Dear maintainer,
I've prepared an NMU for p9m4 (versioned as 0.5.dfsg-2.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
This is the same as the nmudiff I sent previously, except I've
added the bug# and bumped the date in the debian/changelog entry.
Cheers,
Olly
diff -u p9m4-0.5.dfsg/debian/control p9m4-0.5.dfsg/debian/control
--- p9m4-0.5.dfsg/debian/control
+++ p9m4-0.5.dfsg/debian/control
@@ -13,7 +13,7 @@
Package: prover9-mace4
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8, prover9 (= 0.0.200712-1)
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0, prover9 (= 0.0.200712-1)
Description: GUI for Prover9 and Mace4
This package provides a graphical user interface for easily running
the Prover9 theorem prover and the Mace4 countermodel generator
diff -u p9m4-0.5.dfsg/debian/changelog p9m4-0.5.dfsg/debian/changelog
--- p9m4-0.5.dfsg/debian/changelog
+++ p9m4-0.5.dfsg/debian/changelog
@@ -1,3 +1,11 @@
+p9m4 (0.5.dfsg-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8.
+(Closes: #758507)
+
+ -- Olly Betts o...@survex.com Sat, 30 Aug 2014 15:56:58 +
+
p9m4 (0.5.dfsg-2.1) unstable; urgency=low
* Non-maintainer upload.
Bug#757308: grass: Please update to use wxpython3.0
Hi Hamish, On Wed, Aug 20, 2014 at 03:35:36PM +1200, Hamish B wrote: If there are parts of the patch suitable for upstream I would be happy to commit them, just be aware that changes (even debian/patches/) should be compatible back to at least squeeze and Ubuntu 10.04 LTS, since we aim for wide cross-platform compatibility. i.e. backports are pretty trivial right now, and they should stay that way. All the changes in debian/patches/wxpy3.0-compat.patch in the debdiff I attached should be suitable for upstream I think - they remain compatible with wxpython 2.8, and there's already a check in there that the wxPython version is at least 2.8.1.1, so compatibility with 2.6 isn't a concern. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#749861: qutemol: diff for NMU version 0.4.1~cvs20081111-3.1
Control: tags 749861 + pending
Dear maintainer,
I've prepared an NMU for qutemol (versioned as 0.4.1~cvs2008-3.1) and
uploaded it to DELAYED/5. The patch is the same as the one I previously
posted, except I've updated the date of the debian/changelog entry.
Please feel free to tell me if I should delay it longer.
Cheers,
Olly
diff -u qutemol-0.4.1~cvs2008/debian/changelog qutemol-0.4.1~cvs2008/debian/changelog
--- qutemol-0.4.1~cvs2008/debian/changelog
+++ qutemol-0.4.1~cvs2008/debian/changelog
@@ -1,3 +1,14 @@
+qutemol (0.4.1~cvs2008-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxWidgets 3.0 (Closes: #749861):
++ New patch: debian/patches/36_wx3.0_compat.dpatch
+ * debian/patches/20_main.cpp.dpatch: Update to actually set the icon from
+the XPM data correctly (wx3.0 gives a warning dialog for this rather
+than quietly failing to load the file sample_xpm).
+
+ -- Olly Betts o...@survex.com Sat, 30 Aug 2014 14:52:32 +
+
qutemol (0.4.1~cvs2008-3) unstable; urgency=low
* debian/upstream: New file.
diff -u qutemol-0.4.1~cvs2008/debian/control qutemol-0.4.1~cvs2008/debian/control
--- qutemol-0.4.1~cvs2008/debian/control
+++ qutemol-0.4.1~cvs2008/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debichem Team debichem-de...@lists.alioth.debian.org
Uploaders: Morten Kjeldgaard m...@ubuntu.com, Michael Banck mba...@debian.org
-Build-Depends: debhelper (= 5), cdbs, dpatch, libwxgtk2.8-dev, libglew1.5-dev,
+Build-Depends: debhelper (= 5), cdbs, dpatch, libwxgtk3.0-dev, libglew1.5-dev,
libgif-dev, libpng12-dev
Standards-Version: 3.9.2
Homepage: http://qutemol.sourceforge.net/
diff -u qutemol-0.4.1~cvs2008/debian/patches/00list qutemol-0.4.1~cvs2008/debian/patches/00list
--- qutemol-0.4.1~cvs2008/debian/patches/00list
+++ qutemol-0.4.1~cvs2008/debian/patches/00list
@@ -35,0 +36 @@
+36_wx3.0_compat.dpatch
diff -u qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch
--- qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch
+++ qutemol-0.4.1~cvs2008/debian/patches/20_main.cpp.dpatch
@@ -110,7 +110,7 @@
+#if WIN32
+SetIcon(wxIcon(_T(sample),wxBITMAP_TYPE_ICO_RESOURCE,32,32));
+#else
-+SetIcon(wxIcon(_T(sample_xpm),wxBITMAP_TYPE_XPM,32,32));
++SetIcon(wxIcon(sample_xpm));
#endif
+
resize_mode=NATURAL;
diff -u qutemol-0.4.1~cvs2008/debian/rules qutemol-0.4.1~cvs2008/debian/rules
--- qutemol-0.4.1~cvs2008/debian/rules
+++ qutemol-0.4.1~cvs2008/debian/rules
@@ -4,7 +4,9 @@
INCDIRS = -Ivcg -Isrc -I.
#OPTFLAGS = -Os -Wall -g
-CXXFLAGS = -DPKGDATADIR='\/usr/share/qutemol\' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags`
+# Define NDEBUG to quietly ignore WXDEBUG assertion failures (as happens by
+# default under wx2.8).
+CXXFLAGS = -DPKGDATADIR='\/usr/share/qutemol\' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags` -DNDEBUG
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
only in patch2:
unchanged:
--- qutemol-0.4.1~cvs2008.orig/debian/patches/36_wx3.0_compat.dpatch
+++ qutemol-0.4.1~cvs2008/debian/patches/36_wx3.0_compat.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wx3.0_compact.dpatch by Olly Betts o...@survex.com
+## These changes should maintain compatibility with wxwidgets2.8.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: modification to source code
+
+@DPATCH@
+
+--- a/src/main.cpp
b/src/main.cpp
+@@ -421,15 +421,15 @@
+ static const wxCmdLineEntryDesc cmdLineDesc[] =
+ {
+ {
+-wxCMD_LINE_PARAM,_T(),_T(),_T(filename.pdb:(molecule to be drawn)),
++wxCMD_LINE_PARAM,wxT_2(),wxT_2(),wxT_2(filename.pdb:(molecule to be drawn)),
+ wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+ },
+ {
+-wxCMD_LINE_OPTION,_T(a),_T(),_T(filename.art: optional Atom Render Table),
++wxCMD_LINE_OPTION,wxT_2(a),wxT_2(),wxT_2(filename.art: optional Atom Render Table),
+ wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+ },
+ {
+-wxCMD_LINE_SWITCH,_T(v),_T(),_T(don't start, show version name),
++wxCMD_LINE_SWITCH,wxT_2(v),wxT_2(),wxT_2(don't start, show version name),
+ wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+ },
+ { wxCMD_LINE_NONE }
+@@ -836,7 +836,7 @@
+ wxString(), // def path
+ wxString(),
+ FILETYPES,
+- wxSAVE | /*wxCHANGE_DIR |*/ wxOVERWRITE_PROMPT
++ wxFD_SAVE | /*wxFD_CHANGE_DIR |*/ wxFD_OVERWRITE_PROMPT
+ );
+
+static int lastFilterIndex=-1;
+@@ -1004,7 +1004,7 @@
+ wxString(), // def path
Bug#758941: wxglade: Please update to use wxpython3.0
On Sat, Aug 23, 2014 at 06:58:30PM +1200, Olly Betts wrote: We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. This transition is already underway, and is being tracked by the release team here: https://release.debian.org/transitions/html/wxpython3.0.html I notice that wxglade upstream have added wxPython 3.0 support in their source repository: https://bitbucket.org/agriggio/wxglade/src/cd2ee3030556e6ceaacf8d0a70d5224eda41db61/NEWS.txt?at=default Also: http://article.gmane.org/gmane.comp.python.wxglade/3073 Have you talked to them about when the next release is likely to be? Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#756061: Lack of time by maintainer
On Fri, Jul 25, 2014 at 04:14:22PM -0400, Chris Frey wrote: As the maintainer of the package, I don't have enough time to handle important bugs like the recent wxWidgets 3.0 transition. This time situation may change in the near future, but until then, Barry is not suitable for a stable release. It would be a bit of a shame to lose this package, as it seems to be the only package for talking to BlackBerry mobiles that we have in Debian. You could consider seeking a co-maintainer to help out. Another option would be for us to upload with my patch, and if it proves problematic, get the release team to drop the package from jessie before it is actually released. There are no reverse dependencies to be broken by the removal. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#749834: freespace2-launcher-wxlauncher: patch for wx3.0 compatibility
Control: tags 749834 + patch
With the attached patch, the package builds. I don't have the games it can
launch, so I can't test thoroughly, but the parts of the UI I can exercise
appear to work fine.
Cheers,
Olly
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/changelog freespace2-launcher-wxlauncher-0.9.4/debian/changelog
--- freespace2-launcher-wxlauncher-0.9.4/debian/changelog 2013-09-14 22:17:07.0 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/changelog 2014-08-30 20:10:07.0 -0300
@@ -1,3 +1,12 @@
+freespace2-launcher-wxlauncher (0.9.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxwidgets3.0 (Closes: #749834):
++ New patch: wx3.0-compat.patch
++ Pass -DNDEBUG to disable WXDEBUG checks.
+
+ -- Olly Betts o...@survex.com Sat, 30 Aug 2014 23:09:51 +
+
freespace2-launcher-wxlauncher (0.9.4-1) unstable; urgency=low
* New upstream release [June 2013].
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/control freespace2-launcher-wxlauncher-0.9.4/debian/control
--- freespace2-launcher-wxlauncher-0.9.4/debian/control 2013-05-21 01:36:04.0 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/control 2014-08-30 14:38:36.0 -0300
@@ -6,7 +6,7 @@
,cmake
,libopenal-dev
,libsdl-dev
- ,libwxgtk2.8-dev
+ ,libwxgtk3.0-dev
,python
,python-markdown
Standards-Version: 3.9.4
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/patches/series freespace2-launcher-wxlauncher-0.9.4/debian/patches/series
--- freespace2-launcher-wxlauncher-0.9.4/debian/patches/series 2013-09-14 21:55:41.0 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/patches/series 2014-08-30 16:39:01.0 -0300
@@ -1,2 +1,3 @@
debian-path.patch
issue_93.patch
+wx3.0-compat.patch
diff -Nru freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch
--- freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch 1969-12-31 21:00:00.0 -0300
+++ freespace2-launcher-wxlauncher-0.9.4/debian/patches/wx3.0-compat.patch 2014-08-30 19:56:45.0 -0300
@@ -0,0 +1,92 @@
+Description: Fixes for wxwidgets 3.0 compatibility
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/749834
+Forwarded: no
+Last-Update: 2014-08-30
+
+Index: freespace2-launcher-wxlauncher-0.9.4/code/controls/ModList.cpp
+===
+--- freespace2-launcher-wxlauncher-0.9.4.orig/code/controls/ModList.cpp
freespace2-launcher-wxlauncher-0.9.4/code/controls/ModList.cpp
+@@ -1351,8 +1351,8 @@ ModInfoDialog::ModInfoDialog(ModItem* it
+ links-SetPage(wxString::Format(_T(center%s%s%s%s/center),
+ (!item-website.IsEmpty()) ?
+ wxString::Format(_T(a href='%s'%s/a :: ), item-website.c_str(), _(Website)).c_str():wxEmptyString,
+- wxString::Format(_T(a href='%s'%s/a), (!item-forum.IsEmpty()) ?
+- item-forum.c_str():_(http://www.hard-light.net/forums/index.php?board=124.0;), _(Forum)).c_str(),
++ wxString::Format(_T(a href='%s'%s/a), (!item-forum.IsEmpty() ?
++ item-forum:_(http://www.hard-light.net/forums/index.php?board=124.0;)).c_str(), _(Forum)).c_str(),
+ (!item-bugs.IsEmpty()) ?
+ wxString::Format(_T( :: a href='%s'%s/a), item-bugs.c_str(), _(Bugs)).c_str() : wxEmptyString,
+ (!item-support.IsEmpty()) ?
+Index: freespace2-launcher-wxlauncher-0.9.4/code/apis/HelpManager.cpp
+===
+--- freespace2-launcher-wxlauncher-0.9.4.orig/code/apis/HelpManager.cpp
freespace2-launcher-wxlauncher-0.9.4/code/apis/HelpManager.cpp
+@@ -59,7 +59,7 @@ bool HelpManager::Initialize() {
+ if ( file.FileExists() ) {
+ controller-AddBook(file, false);
+ } else {
+- ::wxLogWarning(_T(Unable to find help file %s), file.GetFullName().c_str());
++ wxLogWarning(_T(Unable to find help file %s), file.GetFullName().c_str());
+ delete controller;
+ controller = NULL;
+ return false;
+@@ -93,7 +93,7 @@ void HelpManager::OpenHelpById(WindowIDS
+ return;
+ }
+ }
+- ::wxLogInfo(_T( ID %d does not have more specific help), id);
++ wxLogInfo(_T( ID %d does not have more specific help), id);
+ }
+
+ void HelpManager::OpenMainHelpPage() {
+Index: freespace2-launcher-wxlauncher-0.9.4/code/apis/ProfileManager.cpp
+===
+--- freespace2-launcher-wxlauncher-0.9.4.orig/code/apis/ProfileManager.cpp
freespace2-launcher-wxlauncher-0.9.4/code/apis/ProfileManager.cpp
+@@ -308,8 +308,8 @@ void ProMan::LoadNewsMapFromGlobalProfil
+ while (groupKeepGoing) {
+ globalProfile-SetPath(groupName);
+
+- if (globalProfile-Read(GBL_CFG_NET_THE_NEWS, theNews)
+- (globalProfile-Read(GBL_CFG_NET_NEWS_LAST_TIME, lastDownloadNewsStr))) {
++ if (globalProfile-Read
Bug#758947: editra: patch for wxPython 3.0
Control: tags 758947 + patch
I've done some simple testing of Editra with wxPython 3.0, and it seems to
work.
I used the attached patch, which updates the dependencies, and also some
constants to the newer names - wx.SAVE, etc are still supported as aliases
for the newer names in wxPython 3.0, but wx.FD_SAVE, etc also work with
wxPython 2.8 and wxSAVE, etc have been removed from the C++ API, so these
updates should help with compatibility in the future.
I'm happy to NMU - just let me know. If I don't hear back, I'll do so
in a couple of weeks so there's time for users test this more thoroughly
before the freeze.
Cheers,
Olly
diff -Nru editra-0.7.20+dfsg.1/debian/changelog editra-0.7.20+dfsg.1/debian/changelog
--- editra-0.7.20+dfsg.1/debian/changelog 2014-08-18 23:44:19.0 -0300
+++ editra-0.7.20+dfsg.1/debian/changelog 2014-08-30 21:51:40.0 -0300
@@ -1,3 +1,12 @@
+editra (0.7.20+dfsg.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8
+(Closes: #758947):
++ New patch: wxpython3.0.patch
+
+ -- Olly Betts o...@survex.com Sun, 31 Aug 2014 00:50:20 +
+
editra (0.7.20+dfsg.1-2) unstable; urgency=medium
* Update Standards-Version field in d/control.
diff -Nru editra-0.7.20+dfsg.1/debian/control editra-0.7.20+dfsg.1/debian/control
--- editra-0.7.20+dfsg.1/debian/control 2014-08-18 23:44:19.0 -0300
+++ editra-0.7.20+dfsg.1/debian/control 2014-08-30 21:52:27.0 -0300
@@ -6,7 +6,7 @@
python-all,
python (= 2.6),
python-setuptools,
- python-wxgtk2.8
+ python-wxgtk3.0
Standards-Version: 3.9.5
X-Python-Version: = 2.6
Homepage: http://editra.org
@@ -17,7 +17,7 @@
Architecture: all
Depends: ${misc:Depends},
python,
- python-wxgtk2.8,
+ python-wxgtk3.0,
Description: simple multi-platform text editor
Editra is a multi-platform text editor with an implementation that
focuses on creating an easy to use interface and features that aid
diff -Nru editra-0.7.20+dfsg.1/debian/patches/series editra-0.7.20+dfsg.1/debian/patches/series
--- editra-0.7.20+dfsg.1/debian/patches/series 1969-12-31 21:00:00.0 -0300
+++ editra-0.7.20+dfsg.1/debian/patches/series 2014-08-30 21:52:46.0 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch
--- editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.0 -0300
+++ editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch 2014-08-30 21:53:39.0 -0300
@@ -0,0 +1,44 @@
+Description: Updates for better wxPython 3.0 compatibility
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/758947
+Forwarded: no
+Last-Update: 2014-08-30
+
+--- editra-0.7.20+dfsg.1.orig/src/ed_main.py
editra-0.7.20+dfsg.1/src/ed_main.py
+@@ -432,7 +432,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+
+ dlg = wx.FileDialog(self, _(Editra: Open), fdir, ,
+ ''.join(syntax.GenFileFilters()),
+-wx.OPEN | wx.MULTIPLE | wx.CHANGE_DIR)
++wx.FD_OPEN | wx.FD_MULTIPLE | wx.FD_CHANGE_DIR)
+ dlg.SetFilterIndex(_PGET('FFILTER', 'int', 0))
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+@@ -680,7 +680,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+ os.path.dirname(sdir),
+ title.lstrip(u*),
+ u''.join(syntax.GenFileFilters()),
+-wx.SAVE | wx.OVERWRITE_PROMPT)
++wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+ path = dlg.GetPath()
+@@ -713,7 +713,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+ dlg = wx.FileDialog(self, _(Where to Save Profile?), \
+CONFIG['PROFILE_DIR'], default.ppb, \
+_(Profile) + (*.ppb)|*.ppb,
+-wx.SAVE | wx.OVERWRITE_PROMPT)
++wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+ profiler.TheProfile.Write(dlg.GetPath())
+@@ -732,7 +732,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+ if evt.Id == ID_LOAD_PROFILE:
+ dlg = wx.FileDialog(self, _(Load a Custom Profile),
+ CONFIG['PROFILE_DIR'], default.ppb,
+-_(Profile) + (*.ppb)|*.ppb, wx.OPEN)
++_(Profile) + (*.ppb)|*.ppb, wx.FD_OPEN)
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+ profiler.TheProfile.Load(dlg.GetPath())
Bug#758944: svn-workbench: Patch for wxPython 3.0
Control: tags 758944 + patch
Attached is a patch for wxPython 3.0 support. Using it, the package
builds and seems to work in my testing (though this isn't an application
I've used before). The patch should maintain 2.8 compatibility.
I'm happy to NMU - just let me know. If I don't hear back, I'll do so
in a couple of weeks so there's time for users test this more thoroughly
before the freeze.
Cheers,
Olly
diff -Nru svn-workbench-1.6.8/debian/changelog svn-workbench-1.6.8/debian/changelog
--- svn-workbench-1.6.8/debian/changelog 2013-10-09 18:45:09.0 -0300
+++ svn-workbench-1.6.8/debian/changelog 2014-08-30 23:50:05.0 -0300
@@ -1,3 +1,11 @@
+svn-workbench (1.6.8-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #758944):
+- New patch: wxpython3.0-compat.patch
+
+ -- Olly Betts o...@survex.com Sun, 31 Aug 2014 02:49:04 +
+
svn-workbench (1.6.8-2) unstable; urgency=low
* debian/patches
diff -Nru svn-workbench-1.6.8/debian/patches/series svn-workbench-1.6.8/debian/patches/series
--- svn-workbench-1.6.8/debian/patches/series 2013-10-09 18:43:36.0 -0300
+++ svn-workbench-1.6.8/debian/patches/series 2014-08-30 23:50:15.0 -0300
@@ -1,2 +1,3 @@
fix_Source_make_po_file.py_shebang.patch
force_wx2.8.patch
+wxpython3.0-compat.patch
diff -Nru svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch
--- svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch 1969-12-31 21:00:00.0 -0300
+++ svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch 2014-08-30 23:52:15.0 -0300
@@ -0,0 +1,57 @@
+Description: Update for wxPython 3.0
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/758944
+Forwarded: no
+Last-Update: 2014-08-30
+
+--- svn-workbench-1.6.8.orig/Source/wb_diff_main.py
svn-workbench-1.6.8/Source/wb_diff_main.py
+@@ -16,11 +16,10 @@ VERSION_STRING = Uncontrolled
+
+ import sys
+
+-# make sure that we get 2.6 and not an earlier version
+-# 2.8 is reported to work as well
++# make sure that we get at least 2.8 and not an earlier version
+ if not hasattr(sys, 'frozen'):
+ import wxversion
+-wxversion.select( ['2.8', '2.9'] )
++wxversion.ensureMinimal('2.8')
+
+ def noTranslate(msg):
+ return msg
+--- svn-workbench-1.6.8.orig/Source/wb_main.py
svn-workbench-1.6.8/Source/wb_main.py
+@@ -40,10 +40,10 @@ if stdout_filename is not None:
+ except EnvironmentError:
+ pass
+
+-# make sure that we get 2.8 and not an earlier version
++# make sure that we get at least 2.8 and not an earlier version
+ try:
+ import wxversion
+-wxversion.select( ['2.8'] )
++wxversion.ensureMinimal('2.8')
+
+ except:
+ pass
+--- svn-workbench-1.6.8.orig/Source/wb_preferences_dialog.py
svn-workbench-1.6.8/Source/wb_preferences_dialog.py
+@@ -154,7 +154,7 @@ class EditorPage(PagePanel):
+ os.path.dirname( filename ),
+ os.path.basename( filename ),
+ file_type,
+-wx.OPEN )
++wx.FD_OPEN )
+
+ if file_dialog.ShowModal() == wx.ID_OK:
+ self.text_ctrl_editor.SetValue( file_dialog.GetPath() )
+@@ -278,7 +278,7 @@ class DiffToolPage(PagePanel):
+ os.path.dirname( filename ),
+ os.path.basename( filename ),
+ file_type,
+-wx.OPEN )
++wx.FD_OPEN )
+
+ if file_dialog.ShowModal() == wx.ID_OK:
+ self.text_ctrl_diff_tool.SetValue( file_dialog.GetPath() )
Bug#758949: [Debichem-devel] Bug#758949: mmass: Please update to use wxpython3.0
On Mon, Aug 25, 2014 at 01:51:39PM +0200, Filippo Rusconi lopi...@debian.org sent from wrote: On Sat, Aug 23, 2014 at 07:18:40PM +1200, Olly Betts wrote: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git Thank you for your bug report. I tried to perform the migration using your script and it seemed to run fine. Roughly 10 files were updated. I then set Depends to python-wxgtk3.0. But I get the the following run-time error: Traceback (most recent call last): File /usr/share/mmass/mmass.py, line 168, in module app = mMass(0) File /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py, line 8631, in __init__ self._BootstrapApp() File /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py, line 8196, in _BootstrapApp return _core_.PyApp__BootstrapApp(*args, **kwargs) File /usr/share/mmass/mmass.py, line 45, in OnInit self.frame = mainFrame(None, -1, 'mMass') File /usr/share/mmass/gui/main_frame.py, line 135, in __init__ self.makeGUI() File /usr/share/mmass/gui/main_frame.py, line 733, in makeGUI self.spectrumPanel = panelSpectrum(self, self.documents) File /usr/share/mmass/gui/panel_spectrum.py, line 57, in __init__ self.makeGUI() File /usr/share/mmass/gui/panel_spectrum.py, line 68, in makeGUI self.makeSpectrumCanvas() File /usr/share/mmass/gui/panel_spectrum.py, line 89, in makeSpectrumCanvas self.spectrumCanvas.draw(self.container) File /usr/share/mmass/mspy/plot_canvas.py, line 1080, in draw dc = wx.BufferedDC(wx.ClientDC(self), self.plotBuffer) File /usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_gdi.py, line 5100, in __init__ _gdi_.ClientDC_swiginit(self,_gdi_.new_ClientDC(*args, **kwargs)) PyAssertionError: C++ assertion m_window failed at ../src/gtk/dcclient.cpp(2043) in DoGetSize(): GetSize() doesn't work without window [...] Apparently this is related to drawing to a given window context. But my knowledge is very sparse in this field. If you wanted to look to it, I'd be delighted. It looks to me like its trying to draw on a window which doesn't actually yet exist at the Gtk level - this probably means that Show() hasn't yet been called (or at least that it hasn't yet resulted in the window actually being shown). The quick fix is to disable such checks (they are off by default in wx 2.8, so this probably isn't actually a new issue) - details are here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README#n30 If you want to address the reported issue, then I think gating this drawing code on IsShown() returning true for the window should work. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#742031: [Debichem-devel] Bug#742031: openbabel: Please update to use wxwidgets3.0
On Fri, May 30, 2014 at 01:43:04PM +0200, Michael Banck wrote: tags 742031 +pending thanks [...] Thanks, I have committed this in subversion now and it will be in the next upload. This bug has been tagged pending for almost 3 months now. I'd like to get the remaining packages in the wxwidgets3.0 transition uploaded while there's still a decent span of time for any bugs to get shaken out before the jessie freeze. It looks like perl 5.20 is now in testing, and openbabel is due to migrate today: https://release.debian.org/migration/testing.pl?package=openbabel Once that has happened, any objections to me making an NMU for this? Or would you prefer to make a maintainer upload? Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#744115: codeblocks is marked for autoremoval from testing
On Tue, Jul 01, 2014 at 02:33:51PM -0700, Vincent Cheng wrote: according to the forwarded bug report, it sounds like upstream is going to take a look at this. There's been no update on the upstream ticket for ages, so I've pinged it to see if they have made a decision on whether to make a new major release with wx3 compatibility. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758578: gamera-gui: gamera_gui crashes on exit
While filing bugs for the wxpython3.0 transition, I noticed #758578 which looks like it's related to wxpython3.0 - if so, the quick fix is to suppress WXDEBUG assertion messages - see: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README#n30 The proper fix is to actually make sure that event handler changes are undone before the window is destroyed, but that can be tricky to figure out how to cleanly achieve. But the same thing is almost certainly happening with 2.8 and just getting quietly handled there. Looking at the packaging repo, I noticed this patch: http://anonscm.debian.org/viewvc/python-modules/packages/gamera/trunk/debian/patches/fix-gamera_display.diff?revision=30139view=markup Unless you care about wxPython 2.6 (which you really shouldn't at this point - it's been dead for 8 years), you can just remove any calls to wx.InitAllImageHandlers() as it's a no-op with wxPython 2.8. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759052: closed by Julián Moreno Patiño jul...@debian.org (Bug#759052: fixed in pyragua 0.2.5-6)
On Mon, Aug 25, 2014 at 03:39:10AM +, Debian Bug Tracking System wrote: #759052: pyragua: Please update to use wxpython3.0 Thanks for the prompt upload. + Remove wx2.8-doc and wx2.8-examples from Suggest. Hopefully wx3.0-doc will appear before the freeze (it's only gone because upstream now ship it as a separate download, and getting the transitions moving has been my main focus). But Gianfranco Costamagna offered to try to sort out packaging them at the weekend. We do have wx3.0-examples, but as you probably noticed that only has the C++ examples in, and not the Python ones - that's due to the source packages being separated in 3.0. I guess we should package the example code from wxpython3.0 as a new binary package - I've Cc-ed Gianfranco in case he wants to look at that too. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758940: spe: Please update to use wxpython3.0
Source: spe Version: 0.8.4.h-3 Severity: important Tags: sid jessie User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. This transition is already underway, and is being tracked by the release team here: https://release.debian.org/transitions/html/wxpython3.0.html The wxPython 3.0 API mostly adds to the wxPython2.8 API. Many packages work with wxPython 3.0 without any changes, but there are a few incompatibilities. For example, wx.Color is no longer supported as an alias for wx.Colour, and some constants which were deprecated in 2.8 have been removed. All the removed constants I'm aware of were set to 0 in wxPython 2.8, so removing them is still compatible with 2.8. To assist updating to wxPython 3.0, I've put together a script which will help make the mechanical changes required. This is in a git repo on collab-maint along with a README about using it and updating packages for wxPython 3.0 in general: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git The script has some options to control the sorts of changes it makes - see the README and --help output for more information - you can view the latest version of the README online here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I've developed this script by trying to convert 20+ packages. Please try it out on your package - in many cases, it should be enough to get your package working (if it doesn't already) - if it does, please upload (and close this bug). If the script doesn't do the job, please let me know (or improve the script if you can figure out what it needs to do to get your package working). Another issue you may hit is that wxWidgets 3.0 now defaults to enabling its WXDEBUG checks for incorrect API usage, so some applications will emit scary sounding assertion failures. These are unlikely to actually be new, just in a default build of 2.8, such incorrect uses were handled quietly behind the scenes. Sometimes these are easy to fix, but if not you can easily patch the application to tell wx 3.0 to handle them in the same way wx 2.8 does - details of how to do so are in the README: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I'm happy to sponsor uploads for this transition, though if you have an active sponsor already check with them first - I don't want to tread on anyone's toes. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758939: mayavi2: Please update to use wxpython3.0
Source: mayavi2 Version: 4.3.1-3 Severity: important Tags: sid jessie User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. This transition is already underway, and is being tracked by the release team here: https://release.debian.org/transitions/html/wxpython3.0.html The wxPython 3.0 API mostly adds to the wxPython2.8 API. Many packages work with wxPython 3.0 without any changes, but there are a few incompatibilities. For example, wx.Color is no longer supported as an alias for wx.Colour, and some constants which were deprecated in 2.8 have been removed. All the removed constants I'm aware of were set to 0 in wxPython 2.8, so removing them is still compatible with 2.8. To assist updating to wxPython 3.0, I've put together a script which will help make the mechanical changes required. This is in a git repo on collab-maint along with a README about using it and updating packages for wxPython 3.0 in general: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git The script has some options to control the sorts of changes it makes - see the README and --help output for more information - you can view the latest version of the README online here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I've developed this script by trying to convert 20+ packages. Please try it out on your package - in many cases, it should be enough to get your package working (if it doesn't already) - if it does, please upload (and close this bug). If the script doesn't do the job, please let me know (or improve the script if you can figure out what it needs to do to get your package working). Another issue you may hit is that wxWidgets 3.0 now defaults to enabling its WXDEBUG checks for incorrect API usage, so some applications will emit scary sounding assertion failures. These are unlikely to actually be new, just in a default build of 2.8, such incorrect uses were handled quietly behind the scenes. Sometimes these are easy to fix, but if not you can easily patch the application to tell wx 3.0 to handle them in the same way wx 2.8 does - details of how to do so are in the README: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I'm happy to sponsor uploads for this transition, though if you have an active sponsor already check with them first - I don't want to tread on anyone's toes. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758942: phatch: Please update to use wxpython3.0
Source: phatch Version: 0.2.7.1-3 Severity: important Tags: sid jessie User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. This transition is already underway, and is being tracked by the release team here: https://release.debian.org/transitions/html/wxpython3.0.html The wxPython 3.0 API mostly adds to the wxPython2.8 API. Many packages work with wxPython 3.0 without any changes, but there are a few incompatibilities. For example, wx.Color is no longer supported as an alias for wx.Colour, and some constants which were deprecated in 2.8 have been removed. All the removed constants I'm aware of were set to 0 in wxPython 2.8, so removing them is still compatible with 2.8. To assist updating to wxPython 3.0, I've put together a script which will help make the mechanical changes required. This is in a git repo on collab-maint along with a README about using it and updating packages for wxPython 3.0 in general: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git The script has some options to control the sorts of changes it makes - see the README and --help output for more information - you can view the latest version of the README online here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I've developed this script by trying to convert 20+ packages. Please try it out on your package - in many cases, it should be enough to get your package working (if it doesn't already) - if it does, please upload (and close this bug). If the script doesn't do the job, please let me know (or improve the script if you can figure out what it needs to do to get your package working). Another issue you may hit is that wxWidgets 3.0 now defaults to enabling its WXDEBUG checks for incorrect API usage, so some applications will emit scary sounding assertion failures. These are unlikely to actually be new, just in a default build of 2.8, such incorrect uses were handled quietly behind the scenes. Sometimes these are easy to fix, but if not you can easily patch the application to tell wx 3.0 to handle them in the same way wx 2.8 does - details of how to do so are in the README: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I'm happy to sponsor uploads for this transition, though if you have an active sponsor already check with them first - I don't want to tread on anyone's toes. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758943: bibus: Please update to use wxpython3.0
Source: bibus Version: 1.5.2-3 Severity: important Tags: sid jessie User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. This transition is already underway, and is being tracked by the release team here: https://release.debian.org/transitions/html/wxpython3.0.html The wxPython 3.0 API mostly adds to the wxPython2.8 API. Many packages work with wxPython 3.0 without any changes, but there are a few incompatibilities. For example, wx.Color is no longer supported as an alias for wx.Colour, and some constants which were deprecated in 2.8 have been removed. All the removed constants I'm aware of were set to 0 in wxPython 2.8, so removing them is still compatible with 2.8. To assist updating to wxPython 3.0, I've put together a script which will help make the mechanical changes required. This is in a git repo on collab-maint along with a README about using it and updating packages for wxPython 3.0 in general: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git The script has some options to control the sorts of changes it makes - see the README and --help output for more information - you can view the latest version of the README online here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I've developed this script by trying to convert 20+ packages. Please try it out on your package - in many cases, it should be enough to get your package working (if it doesn't already) - if it does, please upload (and close this bug). If the script doesn't do the job, please let me know (or improve the script if you can figure out what it needs to do to get your package working). Another issue you may hit is that wxWidgets 3.0 now defaults to enabling its WXDEBUG checks for incorrect API usage, so some applications will emit scary sounding assertion failures. These are unlikely to actually be new, just in a default build of 2.8, such incorrect uses were handled quietly behind the scenes. Sometimes these are easy to fix, but if not you can easily patch the application to tell wx 3.0 to handle them in the same way wx 2.8 does - details of how to do so are in the README: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I'm happy to sponsor uploads for this transition, though if you have an active sponsor already check with them first - I don't want to tread on anyone's toes. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758941: wxglade: Please update to use wxpython3.0
Source: wxglade Version: 0.6.8-1 Severity: important Tags: sid jessie User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. This transition is already underway, and is being tracked by the release team here: https://release.debian.org/transitions/html/wxpython3.0.html The wxPython 3.0 API mostly adds to the wxPython2.8 API. Many packages work with wxPython 3.0 without any changes, but there are a few incompatibilities. For example, wx.Color is no longer supported as an alias for wx.Colour, and some constants which were deprecated in 2.8 have been removed. All the removed constants I'm aware of were set to 0 in wxPython 2.8, so removing them is still compatible with 2.8. To assist updating to wxPython 3.0, I've put together a script which will help make the mechanical changes required. This is in a git repo on collab-maint along with a README about using it and updating packages for wxPython 3.0 in general: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git The script has some options to control the sorts of changes it makes - see the README and --help output for more information - you can view the latest version of the README online here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I've developed this script by trying to convert 20+ packages. Please try it out on your package - in many cases, it should be enough to get your package working (if it doesn't already) - if it does, please upload (and close this bug). If the script doesn't do the job, please let me know (or improve the script if you can figure out what it needs to do to get your package working). Another issue you may hit is that wxWidgets 3.0 now defaults to enabling its WXDEBUG checks for incorrect API usage, so some applications will emit scary sounding assertion failures. These are unlikely to actually be new, just in a default build of 2.8, such incorrect uses were handled quietly behind the scenes. Sometimes these are easy to fix, but if not you can easily patch the application to tell wx 3.0 to handle them in the same way wx 2.8 does - details of how to do so are in the README: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I'm happy to sponsor uploads for this transition, though if you have an active sponsor already check with them first - I don't want to tread on anyone's toes. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758944: svn-workbench: Please update to use wxpython3.0
Source: svn-workbench Version: 1.6.8-2 Severity: important Tags: sid jessie User: freewx-ma...@lists.alioth.debian.org Usertags: wxpy3.0 Control: block 755757 by -1 We're aiming to migrate the archive to using wxpython3.0 instead of wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released. This transition is already underway, and is being tracked by the release team here: https://release.debian.org/transitions/html/wxpython3.0.html The wxPython 3.0 API mostly adds to the wxPython2.8 API. Many packages work with wxPython 3.0 without any changes, but there are a few incompatibilities. For example, wx.Color is no longer supported as an alias for wx.Colour, and some constants which were deprecated in 2.8 have been removed. All the removed constants I'm aware of were set to 0 in wxPython 2.8, so removing them is still compatible with 2.8. To assist updating to wxPython 3.0, I've put together a script which will help make the mechanical changes required. This is in a git repo on collab-maint along with a README about using it and updating packages for wxPython 3.0 in general: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git The script has some options to control the sorts of changes it makes - see the README and --help output for more information - you can view the latest version of the README online here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I've developed this script by trying to convert 20+ packages. Please try it out on your package - in many cases, it should be enough to get your package working (if it doesn't already) - if it does, please upload (and close this bug). If the script doesn't do the job, please let me know (or improve the script if you can figure out what it needs to do to get your package working). Another issue you may hit is that wxWidgets 3.0 now defaults to enabling its WXDEBUG checks for incorrect API usage, so some applications will emit scary sounding assertion failures. These are unlikely to actually be new, just in a default build of 2.8, such incorrect uses were handled quietly behind the scenes. Sometimes these are easy to fix, but if not you can easily patch the application to tell wx 3.0 to handle them in the same way wx 2.8 does - details of how to do so are in the README: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README I'm happy to sponsor uploads for this transition, though if you have an active sponsor already check with them first - I don't want to tread on anyone's toes. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#757208: gamera: bump wxpython dependency to 3.0
On Wed, Aug 06, 2014 at 10:29:51AM +0200, Daniel Stender wrote: Due to the transition to Wxwidgets 3.0 [1], the dependencies should be updated to python-wxgtk3.0 [2,3,4]. Thanks for being on to this already. In case you're not already aware of it, I've put together a script to help make the mechanical changes which may be required. This is in a git repo on collab-maint along with a README about using it and updating packages for wxPython 3.0 in general: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git The script has some options to control the sorts of changes it makes - see the README and --help output for more information - you can view the latest version of the README online here: http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git/tree/README If the script doesn't do the job, please let me know (or improve the script if you can figure out what it needs to do to get your package working). Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758959: antiword: fails on a Microsoft Word 2007+ document
Control: severity -1 minor Control: retitle -1 antiword: give more helpful error for docx On Sat, Aug 23, 2014 at 10:27:45AM +0200, Vincent Lefevre wrote: On a Microsoft Word 2007+ document (according to the file utility), I get: $ antiword test.docx test.docx is not a Word Document. which is wrong since the file utility correctly recognized this file as a Word document: $ file test.docx test.docx: Microsoft Word 2007+ This is the new-style XML-in-a-zip-container format, which is completely different to the binary Microsoft Word formats which antiword handles most of. There's no realistic likelihood of antiword supporting this - the last antiword upstream release was 2005-10-21 (which predates this XML format). The antiword package is still useful for handling the files it handles, but I don't plan to take on maintaining the upstream code to the extent of adding support for entirely new formats. The error message isn't very helpful though - it was correct at the time of the last upstream release, but arguably isn't now, as you point out. We can at least improve that. Not sure what a good lightweight extractor for docx files is - I see docx2txt in the archive, but I've never tried it. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758950: djvusmooth: Please update to use wxpython3.0
On Sat, Aug 23, 2014 at 06:25:14PM +0200, Jakub Wilk wrote:
-WX_VERSIONS = ('2.8-unicode', '2.6-unicode')
+WX_VERSIONS = ('3.0-unicode', '2.8-unicode', '2.6-unicode')
DDJVU_API_MIN_VERSION = 26
PYTHON_DJVULIBRE_MIN_VERSION = (0, 1, 4)
@@ -55,7 +55,7 @@ def _check_wx():
except ImportError, ex:
raise ImportError('%s; perhaps wxPython is not installed' % (ex,))
if not wxversion.checkInstalled(WX_VERSIONS):
-raise ImportError('wxPython 2.6 or 2.8 with Unicode support is
required')
+raise ImportError('wxPython 2.6, 2.8 or 3.0 with Unicode support is
required')
wxversion.select(WX_VERSIONS)
This looks good in principle, but when I had both 2.8 and 3.0
installed, the former was selected... Perhaps it's a bug in
wxversions?
I think it's a slight design flaw, coupled with the removal of
non-unicode option in 3.0.
For 3.0, you don't want the -unicode qualifier, since all builds are
Unicode builds now. You can see this with:
$ python -c 'import wxversion; print wxversion.getInstalled()'
['3.0-gtk2', '2.8-gtk2-unicode']
But (as documented) wxversion.select() will pick the version from the
list with the most matching optional components, so if you try
('3.0', '2.8-unicode') the latter scores 1 more than the former:
$ python -c 'import wxversion; wxversion.select((3.0, 2.8-unicode)); import
wx; print(wx.__version__)'
2.8.12.1
A workaround is to ask for 3.0-gtk2:
$ python -c 'import wxversion; wxversion.select((3.0-gtk2, 2.8-unicode));
import wx; print(wx.__version__)'
3.0.0.0
Or not to ask for 2.8-unicode:
$ python -c 'import wxversion; wxversion.select((3.0, 2.8)); import wx;
print(wx.__version__)'
3.0.0.0
We could fix this in Debian (perhaps allow -unicode for 3.0, or to
adjust the score for 3.0 if others specify -unicode or -ansi), but
it's really unhelpful for this to select different versions for
different distros. I'll try to report this upstream, but the
wxPython devs seem unresponsive to bug reports (but the wxWidgets side
are generally great).
-style=wx.OPEN,
+style=wx.FD_OPEN,
This is fine, although not strictly necessary, and it breaks
compatibility with wxPython2.6. Though perhaps I should drop support
for 2.6 anyway, as I hadn't tested it for years.
My view is that wx 2.6 is completely irrelevant now (even the last 2.8
release was over 3 years ago, last 2.6 release seems to be over 8 years
ago). And in general, you'll end up having to write code that's
conditional on the version to support both 2.6 and 3.0 (though some
simpler apps may not use any features which would require this).
In the C++ API, wxOPEN is gone in 3.0, so it seems likely that wx.OPEN
will go in Python in the next release series, so this update is really
for forward compatibility.
-self.SetBestFittingSize(size)
+self.SetInitialSize(size)
OK, although again not compatible with wxPython 2.6.
Indeed, but you get a deprecation warning from the former with 3.0.
Alas, after applying this patch djvusmooth doesn't work well with
wxPython 3.0. I spotted two problems:
* The PageUp and PageDown cannot be used for switching between
pages. I partially fixed it by using wx.Notebooks instead of
wx.Choicebook[1]. But the keys still don't work when the focus is on
a TreeCtrl widget.
* Editing items in TreeCtrl widgets doesn't work.
I'll take a look.
Cheers,
Olly
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#758950: djvusmooth: Please update to use wxpython3.0
Control: tags -1 +patch
On Sat, Aug 23, 2014 at 06:25:14PM +0200, Jakub Wilk wrote:
Alas, after applying this patch djvusmooth doesn't work well with
wxPython 3.0. I spotted two problems:
* The PageUp and PageDown cannot be used for switching between
pages. I partially fixed it by using wx.Notebooks instead of
wx.Choicebook[1]. But the keys still don't work when the focus is on
a TreeCtrl widget.
If you add a lot of bookmarks (lean on Ctrl+B for a bit), it becomes
clearer why - Page Up and Page Down are used by that control to scroll
up and down that list (and Home and End are also eaten).
We can add a handler for EVT_KEY_DOWN to steal these key presses back.
* Editing items in TreeCtrl widgets doesn't work.
I'm not sure why it doesn't just work (as wxPython/demo/TreeCtrl.py
from the wxPython 3.0 sources does and the code is very similar)
but adding a handler for EVT_RIGHT_CLICK which calls EditLabel()
makes it work as before.
If you have ideas how to fix any of these problems, I'm all ears.
:-) Unfortunately, I won't have much time to debug them myself.
I've attached a debdiff - this is against what's in unstable, using
the packaging from the SVN repo plus fixes for the two issues above.
You might need to similarly fix the other wx.TreeCtrl - the djvu file
I had to hand for testing had no text so I couldn't check that.
Cheers,
Olly
diff -Nru djvusmooth-0.2.14/debian/changelog djvusmooth-0.2.14/debian/changelog
--- djvusmooth-0.2.14/debian/changelog 2014-06-26 10:25:07.0 +1200
+++ djvusmooth-0.2.14/debian/changelog 2014-08-24 12:04:10.0 +1200
@@ -1,3 +1,13 @@
+djvusmooth (0.2.14-3) UNRELEASED; urgency=low
+
+ * wxpython3.0 transition (Closes: #758950):
+* d/control: bumped dep on python-wxgtk to 3.0.
+* added wxpython3.0-transition.patch.
+ * Fixed upstream-signing-key.
+ * Improved djvusmooth.desktop.patch.
+
+ -- Daniel Stender deb...@danielstender.com Sat, 23 Aug 2014 20:26:51 +0200
+
djvusmooth (0.2.14-2) unstable; urgency=low
* deb/control:
diff -Nru djvusmooth-0.2.14/debian/control djvusmooth-0.2.14/debian/control
--- djvusmooth-0.2.14/debian/control 2014-06-26 10:24:11.0 +1200
+++ djvusmooth-0.2.14/debian/control 2014-08-24 12:04:09.0 +1200
@@ -19,7 +19,7 @@
Depends:
djvulibre-bin,
python-djvu,
- python-wxgtk2.8,
+ python-wxgtk3.0,
python-xdg,
${misc:Depends},
${python:Depends}
diff -Nru djvusmooth-0.2.14/debian/patches/djvusmooth.desktop.patch djvusmooth-0.2.14/debian/patches/djvusmooth.desktop.patch
--- djvusmooth-0.2.14/debian/patches/djvusmooth.desktop.patch 2013-07-06 03:29:50.0 +1200
+++ djvusmooth-0.2.14/debian/patches/djvusmooth.desktop.patch 2014-08-24 12:04:10.0 +1200
@@ -1,17 +1,17 @@
Description: improvement of upstream .desktop file
-Forwarded: no
+Forwarded: yes
Author: Daniel Stender dan...@danielstender.com
-Last-Update: 2013-07-05
+Last-Update: 2014-08-23
--- a/extra/djvusmooth.desktop
+++ b/extra/djvusmooth.desktop
@@ -4,7 +4,10 @@
Name=djvusmooth
GenericName=Graphical editor for DjVu
GenericName[pl]=Graficzny edytor plików DjVu
-+GenericName[de]=Grafischer Metadaten-Editor für DjVu-Dateien
++GenericName[de]=Grafischer Editor für DjVu-Dateien
Exec=/usr/bin/djvusmooth %f
Terminal=false
MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu;
Categories=Graphics;
-+Keywords=djvu;metadata;
++Keywords=djvu;
+Icon=djvusmooth
diff -Nru djvusmooth-0.2.14/debian/patches/series djvusmooth-0.2.14/debian/patches/series
--- djvusmooth-0.2.14/debian/patches/series 2013-07-06 03:29:50.0 +1200
+++ djvusmooth-0.2.14/debian/patches/series 2014-08-24 12:04:10.0 +1200
@@ -1 +1,2 @@
+wxpython3.0-transition.patch
djvusmooth.desktop.patch
diff -Nru djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch
--- djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch 1970-01-01 12:00:00.0 +1200
+++ djvusmooth-0.2.14/debian/patches/wxpython3.0-transition.patch 2014-08-24 14:47:55.0 +1200
@@ -0,0 +1,136 @@
+Description: changes for the wxpython 3.0-transition
+Author: Daniel Stender deb...@danielstender.com
+Bug: https://bugs.debian.org/758950
+Forwarded: yes
+Last-Update: 2014-08-24
+
+--- a/lib/dependencies.py
b/lib/dependencies.py
+@@ -14,7 +14,10 @@
+ Checks for djvusmooth dependencies.
+ '''
+
+-WX_VERSIONS = ('2.8-unicode', '2.6-unicode')
++# wxversion.select() scores based on matching optional components - there's
++# no -unicode for wx3.0, so we have to ask for -gtk2 or 2.8 will always be
++# picked if installed.
++WX_VERSIONS = ('3.0-gtk2', '2.8-unicode')
+ DDJVU_API_MIN_VERSION = 26
+ PYTHON_DJVULIBRE_MIN_VERSION = (0, 1, 4)
+
+@@ -55,7 +58,7 @@
+ except ImportError, ex:
+ raise ImportError('%s; perhaps wxPython is not installed' % (ex,))
+ if not wxversion.checkInstalled(WX_VERSIONS):
+-raise ImportError('wxPython 2.6 or 2.8 with Unicode support is
Bug#759079: pyhoca-gui: patch for wxPython 3.0
Control: tags 759079 + patch
Here's a patch to fix the dependencies of pyhoca-gui on wxPython, and to
make a few code updates for better wxPython 3.0 compatibility.
I wasn't easily able to see how to actually configure the app, so I've
not done a lot of testing, but the upstream code was preferring wxPython
2.9 over wxPython 2.8, so it's likely to work well with 3.0 (2.9 was the
development series which lead to 3.0).
Let me know if you'd like me to NMU these changes.
Cheers,
Olly
diff -Nru pyhoca-gui-0.4.0.9/debian/changelog pyhoca-gui-0.4.0.9/debian/changelog
--- pyhoca-gui-0.4.0.9/debian/changelog 2014-08-07 04:17:15.0 +1200
+++ pyhoca-gui-0.4.0.9/debian/changelog 2014-08-24 15:19:24.0 +1200
@@ -1,3 +1,12 @@
+pyhoca-gui (0.4.0.9-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control: Actually depend on the wxPython module - python-wxgtk3.0
+instead of wx-common and python-wxtools.
+ * New patch wxpy3.0-compat.patch (Closes: #759079)
+
+ -- Olly Betts o...@survex.com Sun, 24 Aug 2014 15:16:59 +1200
+
pyhoca-gui (0.4.0.9-1) unstable; urgency=medium
* New upstream release.
diff -Nru pyhoca-gui-0.4.0.9/debian/control pyhoca-gui-0.4.0.9/debian/control
--- pyhoca-gui-0.4.0.9/debian/control 2014-08-07 04:16:35.0 +1200
+++ pyhoca-gui-0.4.0.9/debian/control 2014-08-24 15:16:50.0 +1200
@@ -27,8 +27,7 @@
python-argparse,
python-notify,
python-setproctitle,
- wx-common (=2.8.10.0),
- python-wxtools (=2.8.10.0),
+ python-wxgtk3.0,
gnome-colors-common,
Recommends:
mate-notification-daemon | notification-daemon,
diff -Nru pyhoca-gui-0.4.0.9/debian/patches/series pyhoca-gui-0.4.0.9/debian/patches/series
--- pyhoca-gui-0.4.0.9/debian/patches/series 1970-01-01 12:00:00.0 +1200
+++ pyhoca-gui-0.4.0.9/debian/patches/series 2014-08-24 15:19:43.0 +1200
@@ -0,0 +1 @@
+wxpy3.0-compat.patch
diff -Nru pyhoca-gui-0.4.0.9/debian/patches/wxpy3.0-compat.patch pyhoca-gui-0.4.0.9/debian/patches/wxpy3.0-compat.patch
--- pyhoca-gui-0.4.0.9/debian/patches/wxpy3.0-compat.patch 1970-01-01 12:00:00.0 +1200
+++ pyhoca-gui-0.4.0.9/debian/patches/wxpy3.0-compat.patch 2014-08-24 15:25:11.0 +1200
@@ -0,0 +1,82 @@
+Description: Fixes for wxPython 3.0
+ Still compatible with wxPython 2.8.
+Author: Olly Betts o...@survex.com
+Bug-Debian: https://bugs.debian.org/759079
+Forwarded: no
+Last-Update: 2014-08-24
+
+--- a/pyhoca/wxgui/frontend.py
b/pyhoca/wxgui/frontend.py
+@@ -22,15 +22,7 @@
+
+ try:
+ import wxversion
+-wxversion.select('2.9')
+-#print 'USING wxPython 2.9'
+-
+-except: pass
+-
+-try:
+-import wxversion
+-wxversion.select('2.8')
+-#print 'USING wxPython 2.8'
++wxversion.select(['3.0', '2.9', '2.8'])
+
+ except: pass
+
+@@ -43,6 +35,7 @@
+ gevent.monkey.patch_all()
+
+ import wx
++#print 'USING wxPython ', wx.__version__
+
+ import copy
+ import threading
+@@ -64,7 +57,6 @@
+ import serverinfo
+
+ wx.SetDefaultPyEncoding(utf-8)
+-wx.InitAllImageHandlers()
+
+ #def SetExitHandler(func):
+ #\
+--- a/pyhoca/wxgui/printingprefs.py
b/pyhoca/wxgui/printingprefs.py
+@@ -406,7 +406,7 @@
+ wildcard = All files (*.*)|*
+ dlg = wx.FileDialog(
+ self, message=_(uChoose PDF viewer application), defaultDir=_LOCAL_HOME,
+-defaultFile=, wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR )
++defaultFile=, wildcard=wildcard, style=wx.FD_OPEN | wx.FD_CHANGE_DIR )
+ # Show the dialog and retrieve the user response. If it is the OK response,
+ # process the data.
+ if dlg.ShowModal() == wx.ID_OK:
+--- a/pyhoca/wxgui/profilemanager.py
b/pyhoca/wxgui/profilemanager.py
+@@ -1459,7 +1459,7 @@
+ uAll files (*.*)|*)
+ dlg = wx.FileDialog(
+ self, message=_(uChoose an icon for this session profile), defaultDir=iconsdir,
+-defaultFile=, wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR )
++defaultFile=, wildcard=wildcard, style=wx.FD_OPEN | wx.FD_CHANGE_DIR )
+ # Show the dialog and retrieve the user response. If it is the OK response,
+ # process the data.
+ if dlg.ShowModal() == wx.ID_OK:
+@@ -1904,7 +1904,7 @@
+ wildcard = _(uAll files (*.*)|*)
+ dlg = wx.FileDialog(
+ self, message=_(uChoose a public SSH key), defaultDir=sshdir,
+-defaultFile=, wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR )
++defaultFile=, wildcard=wildcard, style=wx.FD_OPEN | wx.FD_CHANGE_DIR )
+ # Show the dialog and retrieve the user response. If it is the OK response,
+ # process the data.
+ if dlg.ShowModal() == wx.ID_OK:
+@@ -1928,7 +1928,7 @@
+ wildcard = All files (*.*)|*
+ dlg = wx.FileDialog(
+ self, message=_(uChoose a public SSH key), defaultDir=sshdir,
+-defaultFile=, wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR
Bug#749870: objcryst-fox: Please update to use wxwidgets3.0
On Fri, May 30, 2014 at 10:38:20PM +1200, Olly Betts wrote: We're aiming to migrate the archive to using wxwidgets3.0 instead of wxwidgets2.8, and intend to drop wxwidgets2.8 before jessie is released. I've rebuilt your package using the attached patch. The fox binary runs, but I don't have the data required to usefully test much of its functionality. I'm happy to NMU this change if you wish me to - just let me know. This bug has been open with a patch attached for close to 3 months now without any comment, so I'm intending to NMU this patch. It really needs testing by people who actually use the application - if it's in unstable, that is more likely to happen then if the patch just sits here any longer. Cheers, Olly -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#759087: hugin: Please update to use wxpython3.0
Package: hugin
Version: 2014.0.0~rc3+dfsg-2
Severity: normal
Tags: sid jessie patch
User: freewx-ma...@lists.alioth.debian.org
Usertags: wxpy3.0
Control: block 755757 by -1
We're aiming to migrate the archive to using wxpython3.0 instead of
wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released.
This transition is already underway, and is being tracked by the release
team here:
https://release.debian.org/transitions/html/wxpython3.0.html
The wxPython code in hugin looks fine for wxPython 3.0, but there's a
'Suggests:' dependency that needs updating. I've attached a patch.
Cheers,
Olly
diff -Nru hugin-2014.0.0~rc3+dfsg/debian/changelog hugin-2014.0.0~rc3+dfsg/debian/changelog
--- hugin-2014.0.0~rc3+dfsg/debian/changelog 2014-08-03 23:35:58.0 +1200
+++ hugin-2014.0.0~rc3+dfsg/debian/changelog 2014-08-24 16:28:01.0 +1200
@@ -1,3 +1,10 @@
+hugin (2014.0.0~rc3+dfsg-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update 'Suggests: python-wxgtk2.8' to 'Suggests: python-wxgtk3.0'.
+
+ -- Olly Betts o...@survex.com Sun, 24 Aug 2014 16:27:26 +1200
+
hugin (2014.0.0~rc3+dfsg-2) unstable; urgency=medium
* Add autopkgtest, generating a simple panorama.
diff -Nru hugin-2014.0.0~rc3+dfsg/debian/control hugin-2014.0.0~rc3+dfsg/debian/control
--- hugin-2014.0.0~rc3+dfsg/debian/control 2014-06-09 17:41:59.0 +1200
+++ hugin-2014.0.0~rc3+dfsg/debian/control 2014-08-24 16:26:12.0 +1200
@@ -87,7 +87,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Breaks: ${python:Breaks}
# imports of included plugins
-Suggests: python-wxgtk2.8
+Suggests: python-wxgtk3.0
Description: panorama photo stitcher - common data files
Hugin is a panorama photo stitching program.
.
Bug#749870: objcryst-fox: diff for NMU version 1.9.6.0-2.1
Carlo Segre se...@iit.edu wrote:
Go ahead, I have not had any time to dedicate to my packages recently
and I am not sure when that will change.
OK, done - thanks for getting back to me.
Here's the NMU diff for what I actually uploaded (I just tweaked the
changelog entry).
Cheers,
Olly
diff -Nru objcryst-fox-1.9.6.0/debian/changelog objcryst-fox-1.9.6.0/debian/changelog
--- objcryst-fox-1.9.6.0/debian/changelog 2011-06-26 13:09:20.0 +1200
+++ objcryst-fox-1.9.6.0/debian/changelog 2014-08-24 15:56:59.0 +1200
@@ -1,3 +1,12 @@
+objcryst-fox (1.9.6.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to use wxwidgets3.0 (new patch wx3.0-compat.patch) (Closes: #749870)
+ * debian/control: 'polyhedras' - 'polyhedra' in the description ('polyhedra'
+is the plural form of 'polyhedron').
+
+ -- Olly Betts o...@survex.com Sun, 24 Aug 2014 15:56:27 +1200
+
objcryst-fox (1.9.6.0-2) unstable; urgency=low
* Remove -march=native flag from Objcryst/rules-gnu.mak (Closes: #631653
diff -Nru objcryst-fox-1.9.6.0/debian/control objcryst-fox-1.9.6.0/debian/control
--- objcryst-fox-1.9.6.0/debian/control 2011-06-25 10:41:48.0 +1200
+++ objcryst-fox-1.9.6.0/debian/control 2013-11-25 08:20:07.0 +1300
@@ -2,7 +2,7 @@
Section: science
Priority: optional
Maintainer: Carlo Segre se...@debian.org
-Build-Depends: debhelper (= 7), bzip2, libwxgtk2.8-dev, freeglut3-dev,
+Build-Depends: debhelper (= 7), bzip2, libwxgtk3.0-dev, freeglut3-dev,
libfftw3-dev, libnewmat10-dev
Homepage: http://vincefn.net/Fox/
Standards-Version: 3.9.2
@@ -13,7 +13,7 @@
Description: Free Objects for Xtallography
FOX is a program for the ab initio structure determination from powder
diffraction (neutrons, X-Ray). The crystal structure can be described as any
- combination of atoms, molecules or polyhedras, without a priori information
+ combination of atoms, molecules or polyhedra, without a priori information
about the connectivity of these 'building block'. Fox can make multi-pattern
global optimizations, and automatically correct special positions.
.
diff -Nru objcryst-fox-1.9.6.0/debian/patches/series objcryst-fox-1.9.6.0/debian/patches/series
--- objcryst-fox-1.9.6.0/debian/patches/series 2011-06-26 13:06:35.0 +1200
+++ objcryst-fox-1.9.6.0/debian/patches/series 2014-05-30 15:12:41.0 +1200
@@ -1,2 +1,3 @@
install-in-build-directory
revert-march-flag
+wx3.0-compat.patch
diff -Nru objcryst-fox-1.9.6.0/debian/patches/wx3.0-compat.patch objcryst-fox-1.9.6.0/debian/patches/wx3.0-compat.patch
--- objcryst-fox-1.9.6.0/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.0 +1200
+++ objcryst-fox-1.9.6.0/debian/patches/wx3.0-compat.patch 2014-05-30 22:23:06.0 +1200
@@ -0,0 +1,453 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts o...@survex.com
+Last-Update: 2014-05-30
+
+--- a/ObjCryst/wxCryst/wxMultiGraph.cpp
b/ObjCryst/wxCryst/wxMultiGraph.cpp
+@@ -202,7 +202,6 @@
+wxBufferedPaintDC dc(this);
+this-PrepareDC(dc);
+mpParentFrame-PrepareDC(dc);
+- dc.BeginDrawing();
+
+dc.DestroyClippingRegion();
+dc.SetBackground(wxBrush(_T(white), wxSOLID));
+@@ -289,11 +288,10 @@
+ ix++;
+ VFN_DEBUG_MESSAGE(WXMultiGraph::OnPaint():Data#ix,3)
+ if((pos-second.vx.size()1)||(pos-second.vx.size()!=pos-second.vy.size())) continue;
+- wxColour *pc;//=dynamic_castwxColour*(wxTheColourDatabase-Item(ix++)-GetData());
+
+- pc=wxTheColourDatabase-FindColour(wxString::FromAscii(swxColourNameList[ix]));
+- if(pc==0) dc.SetPen(*wxGREY_PEN);
+- else dc.SetPen(wxPen(*pc,1,wxSOLID));
++ wxColour colour=wxTheColourDatabase-Find(wxString::FromAscii(swxColourNameList[ix]));
++ if(!colour.IsOk()) dc.SetPen(*wxGREY_PEN);
++ else dc.SetPen(wxPen(colour,1,wxSOLID));
+ float x1,y1,x2,y2;
+ x2=pos-second.vx[0];
+ y2=pos-second.vy[0];
+@@ -310,8 +308,8 @@
+ dc.DrawLine(wxCoord(x1),wxCoord(y1),wxCoord(x2),wxCoord(y2));
+ }
+ // Print Name
+- if(pc==0) dc.SetTextForeground(wxGREY_PEN-GetColour());
+- else dc.SetTextForeground(wxPen(*pc,1,wxSOLID).GetColour());
++ if(!colour.IsOk()) dc.SetTextForeground(wxGREY_PEN-GetColour());
++ else dc.SetTextForeground(wxPen(colour,1,wxSOLID).GetColour());
+ wxCoord tmpW,tmpH;
+ fontInfo.Printf(wxString::FromAscii(pos-second.name.c_str()));
+ dc.GetTextExtent(fontInfo, tmpW, tmpH);
+--- a/ObjCryst/wxCryst/wxPowderPattern.cpp
b/ObjCryst/wxCryst/wxPowderPattern.cpp
+@@ -713,7 +713,7 @@
+ {
+VFN_DEBUG_MESSAGE(WXPowderPattern::OnMenuSaveText(),6)
+WXCrystValidateAllUserInput();
+- wxFileDialog save(this,_T(Choose a file),_T(),_T(),_T(*.txt),wxSAVE | wxOVERWRITE_PROMPT);
++ wxFileDialog save(this,_T(Choose a file),_T(),_T(),_T(*.txt),wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+if(save.ShowModal() != wxID_OK) return;
+
+ofstream out
Bug#758846: gnuradio: Please fully update to use wxpython3.0
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.0 +1200
+++ gnuradio-3.7.4/debian/changelog 2014-08-22 11:59:39.0 +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.0 +1200
+++ gnuradio-3.7.4/debian/control 2014-08-21 17:12:43.0 +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.0 +1200
+++ gnuradio-3.7.4/debian/patches/series 2014-08-21 15:50:34.0 +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.0 +1200
+++ gnuradio-3.7.4/debian/patches/wxpy3.0-compat 2014-08-21 15:58:14.0 +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
