Control: tags 773579 + patch

Output from nmudiff showing the fix mentioned in my previous comment.

Cheers,
    Olly
diff -Nru fontypython-0.4.4/debian/changelog fontypython-0.4.4/debian/changelog
--- fontypython-0.4.4/debian/changelog	2014-12-14 21:41:50.000000000 +1300
+++ fontypython-0.4.4/debian/changelog	2014-12-22 08:38:45.000000000 +1300
@@ -1,3 +1,12 @@
+fontypython (0.4.4-1.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Switch back to 3.0 - 2.8 won't be in jessie.
+  * Fix assertion failures.  (Closes: #773579)
+    + New patch: wx3.0-compat.patch
+
+ -- Olly Betts <o...@survex.com>  Mon, 22 Dec 2014 08:38:34 +1300
+
 fontypython (0.4.4-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru fontypython-0.4.4/debian/patches/0001-Select-wx-2.8-rather-than-3.0.patch fontypython-0.4.4/debian/patches/0001-Select-wx-2.8-rather-than-3.0.patch
--- fontypython-0.4.4/debian/patches/0001-Select-wx-2.8-rather-than-3.0.patch	2014-12-14 21:39:20.000000000 +1300
+++ fontypython-0.4.4/debian/patches/0001-Select-wx-2.8-rather-than-3.0.patch	1970-01-01 12:00:00.000000000 +1200
@@ -1,21 +0,0 @@
-From: Pietro Battiston <m...@pietrobattiston.it>
-Date: Sun, 14 Dec 2014 09:39:17 +0100
-Subject: Select wx 2.8 (rather than 3.0)
-
----
- fontypythonmodules/sanitycheck.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fontypythonmodules/sanitycheck.py b/fontypythonmodules/sanitycheck.py
-index cf4fcc1..0448b6b 100644
---- a/fontypythonmodules/sanitycheck.py
-+++ b/fontypythonmodules/sanitycheck.py
-@@ -31,7 +31,7 @@ except:
- 
- try:
- 	import wxversion ## Dec 2007: noticed that it may not be installed along with wxPython....
--	wxversion.ensureMinimal("2.8") 
-+	wxversion.select("2.8")
- except:
- 	print strings.wxVersionError
- 	print
diff -Nru fontypython-0.4.4/debian/patches/series fontypython-0.4.4/debian/patches/series
--- fontypython-0.4.4/debian/patches/series	2014-12-14 21:39:20.000000000 +1300
+++ fontypython-0.4.4/debian/patches/series	2014-12-22 08:36:36.000000000 +1300
@@ -1 +1 @@
-0001-Select-wx-2.8-rather-than-3.0.patch
+wx3.0-compat.patch
diff -Nru fontypython-0.4.4/debian/patches/wx3.0-compat.patch fontypython-0.4.4/debian/patches/wx3.0-compat.patch
--- fontypython-0.4.4/debian/patches/wx3.0-compat.patch	1970-01-01 12:00:00.000000000 +1200
+++ fontypython-0.4.4/debian/patches/wx3.0-compat.patch	2014-12-22 08:54:53.000000000 +1300
@@ -0,0 +1,101 @@
+Description: Fix compatibility with wxpython3.0
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/773579
+Forwarded: no
+Last-Update: 2014-12-22
+
+--- a/fontypythonmodules/dialogues.py
++++ b/fontypythonmodules/dialogues.py
+@@ -23,10 +23,6 @@
+ import wx.html as html
+ 
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+ ## langcode = locale.getlocale()[0] # I must not use getlocale...
+ ## This is suggested by Martin:
+ loc = locale.setlocale(locale.LC_CTYPE) # use *one* of the categories (not LC_ALL)
+--- a/fontypythonmodules/gui_Left.py
++++ b/fontypythonmodules/gui_Left.py
+@@ -17,9 +17,6 @@
+ 
+ import wx, os
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+ 
+ 
+ from pubsub import *
+--- a/fontypythonmodules/gui_Middle.py
++++ b/fontypythonmodules/gui_Middle.py
+@@ -19,9 +19,6 @@
+ import wx.lib.stattext
+ import  wx.lib.buttons  as  buttons
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+ 
+ 
+ from pubsub import *
+--- a/fontypythonmodules/gui_PogChooser.py
++++ b/fontypythonmodules/gui_PogChooser.py
+@@ -17,9 +17,6 @@
+ 
+ import wx, locale
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+ 
+ from pubsub import *
+ from wxgui import ps
+--- a/fontypythonmodules/gui_Right.py
++++ b/fontypythonmodules/gui_Right.py
+@@ -17,9 +17,6 @@
+ 
+ import wx
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+ 
+ from pubsub import *
+ from wxgui import ps
+--- a/fontypythonmodules/gui_ScrolledFontView.py
++++ b/fontypythonmodules/gui_ScrolledFontView.py
+@@ -20,9 +20,6 @@
+ 
+ from pubsub import *
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+ 
+ import fpsys # Global objects
+ 
+--- a/fontypythonmodules/wxgui.py
++++ b/fontypythonmodules/wxgui.py
+@@ -23,9 +23,6 @@
+ ## Now, bring in all those big modules
+ import wx
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+ 
+ ## Fetch my own pubsub stuff
+ from pubsub import *
+@@ -383,6 +380,9 @@
+ ## Start the main frame and then show it.
+ class App(wx.App ):#, wx.lib.mixins.inspection.InspectionMixin) :
+ 	def OnInit(self):
++		# Suppress WXDEBUG assertions, as happens by default with wx2.8.
++		self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
++
+ 		#self.Init()  # initialize the inspection tool
+ 		
+ 		## Initial dialogue to inform user about their potential fate:

Reply via email to