[med-svn] r17995 - trunk/packages/dicompyler/trunk/debian/patches
Andreas Tille
tille at moszumanska.debian.org
Fri Sep 12 06:53:27 UTC 2014
Author: tille
Date: 2014-09-12 06:53:27 +0000 (Fri, 12 Sep 2014)
New Revision: 17995
Added:
trunk/packages/dicompyler/trunk/debian/patches/fix-xrc-errors.patch
Modified:
trunk/packages/dicompyler/trunk/debian/patches/series
trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch
Log:
Fix errors at startup (thanks to Olly Betts)
Added: trunk/packages/dicompyler/trunk/debian/patches/fix-xrc-errors.patch
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/fix-xrc-errors.patch (rev 0)
+++ trunk/packages/dicompyler/trunk/debian/patches/fix-xrc-errors.patch 2014-09-12 06:53:27 UTC (rev 17995)
@@ -0,0 +1,25 @@
+Description: Fix XRC errors reported by wxPython 3.0
+Author: Olly Betts <olly at 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>
+ <cols>3</cols>
+- <rows>1</rows>
+ <vgap>5</vgap>
+ <hgap>5</hgap>
+ <growablecols>1</growablecols>
+@@ -222,7 +221,7 @@
+ <option>1</option>
+ <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+ </object>
+- <cols>4</cols>
++ <cols>8</cols>
+ <rows>2</rows>
+ <vgap>5</vgap>
+ <hgap>5</hgap>
Modified: trunk/packages/dicompyler/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/series 2014-09-11 11:37:03 UTC (rev 17994)
+++ trunk/packages/dicompyler/trunk/debian/patches/series 2014-09-12 06:53:27 UTC (rev 17995)
@@ -4,3 +4,4 @@
enable_pydicom_0.9.8.patch
allow_pillow_instead_of_pil.patch
enable_later_versions_of_matplotlib.patch
+fix-xrc-errors.patch
Modified: trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch 2014-09-11 11:37:03 UTC (rev 17994)
+++ trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch 2014-09-12 06:53:27 UTC (rev 17995)
@@ -6,134 +6,142 @@
--- a/dicompyler/baseplugins/anonymize.py
+++ b/dicompyler/baseplugins/anonymize.py
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,9 @@
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
-+from wx.lib.pubsub.core 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
-@@ -331,4 +331,4 @@ class AnonymizeDialog(wx.Dialog):
- else:
- self.privatetags = False
-
-- self.EndModal(wx.ID_OK)
-\ No newline at end of file
-+ self.EndModal(wx.ID_OK)
--- a/dicompyler/baseplugins/treeview.py
+++ b/dicompyler/baseplugins/treeview.py
-@@ -13,7 +13,7 @@ logger = logging.getLogger('dicompyler.t
+@@ -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
-+from wx.lib.pubsub.core 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,7 @@ logger = logging.getLogger('dicompyler.p
+@@ -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
-+from wx.lib.pubsub.core 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,7 @@
+@@ -11,7 +11,9 @@
import logging
logger = logging.getLogger('dicompyler.quickimport')
import wx
-from wx.lib.pubsub import Publisher as pub
-+from wx.lib.pubsub.core 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,7 @@
+@@ -10,7 +10,9 @@
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
-+from wx.lib.pubsub.core 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
-@@ -723,4 +723,4 @@ class plugin2DView(wx.Panel):
- menu.Append(id, "No tools found")
- menu.Enable(id, False)
- self.PopupMenu(menu)
-- menu.Destroy()
-\ No newline at end of file
-+ menu.Destroy()
--- a/dicompyler/baseplugins/dvh.py
+++ b/dicompyler/baseplugins/dvh.py
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,9 @@
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
-+from wx.lib.pubsub.core 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,7 @@ logger = logging.getLogger('dicompyler.d
+@@ -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
-+from wx.lib.pubsub.core 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,7 @@
+@@ -10,7 +10,9 @@
import util
import wx
from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import Publisher as pub
-+from wx.lib.pubsub.core 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,7 @@ from wx.xrc import *
+@@ -20,7 +20,9 @@ from wx.xrc import *
import wx.lib.dialogs, webbrowser
# Uncomment line to setup pubsub for frozen targets on wxPython 2.8.11 and above
# from wx.lib.pubsub import setupv1
-from wx.lib.pubsub import Publisher as pub
-+from wx.lib.pubsub.core 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 dicomgui, dvhdata, dvhdoses, dvhcalc
from dicompyler.dicomparser import DicomParser as dp
--- a/dicompyler/preferences.py
+++ b/dicompyler/preferences.py
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,9 @@
import os
import wx
from wx.xrc import *
-from wx.lib.pubsub import Publisher as pub
-+from wx.lib.pubsub.core 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
try:
-@@ -374,7 +374,7 @@ def main():
+@@ -374,7 +374,9 @@ def main():
import tempfile, os
import wx
- from wx.lib.pubsub import Publisher as pub
-+ from wx.lib.pubsub.core import Publisher as pub
++ import wx.lib.pubsub.setuparg1
++ import wx.lib.pubsub.core
++ pub = wx.lib.pubsub.core.Publisher()
app = wx.App(False)
More information about the debian-med-commit
mailing list