spot pushed to winpdb (master). "apply patch from debian for improved support with wxPython 3, fix from upstream for breakpoints with commas (issue:19)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 1 15:38:38 UTC 2015
>From e7d071c1c5f1d09e22c379dcaf045374e00b0ff5 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Wed, 1 Apr 2015 11:35:05 -0400
Subject: apply patch from debian for improved support with wxPython 3, fix
from upstream for breakpoints with commas (issue:19)
diff --git a/winpdb-1.4.8-issue19-fix.patch b/winpdb-1.4.8-issue19-fix.patch
new file mode 100644
index 0000000..794c0af
--- /dev/null
+++ b/winpdb-1.4.8-issue19-fix.patch
@@ -0,0 +1,12 @@
+diff -up winpdb-1.4.8/rpdb2.py.issue19 winpdb-1.4.8/rpdb2.py
+--- winpdb-1.4.8/rpdb2.py.issue19 2015-04-01 08:47:34.601072072 -0400
++++ winpdb-1.4.8/rpdb2.py 2015-04-01 08:48:02.336901383 -0400
+@@ -12056,7 +12056,7 @@ class CConsoleInternal(cmd.Cmd, threadin
+
+
+ def __parse_bp_arg(self, arg, fAllowExpr = True):
+- _args = arg.split(BP_EVAL_SEP)
++ _args = arg.split(BP_EVAL_SEP, 1)
+
+ if (len(_args) > 1) and (not fAllowExpr):
+ raise BadArgument
diff --git a/winpdb.spec b/winpdb.spec
index 1ee64db..172102e 100644
--- a/winpdb.spec
+++ b/winpdb.spec
@@ -2,7 +2,7 @@
Name: winpdb
Version: 1.4.8
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: An advanced python debugger
Group: Development/Debuggers
License: GPLv2+
@@ -11,6 +11,9 @@ Source0: http://winpdb.googlecode.com/files/winpdb-%{version}.tar.gz
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: winpdb-1.4.8-gnome-fix.patch
+Patch1: https://sources.debian.net/data/main/w/winpdb/1.4.8-2.1/debian/patches/wxpython3.0.patch
+# https://code.google.com/p/winpdb/issues/detail?id=19
+Patch2: winpdb-1.4.8-issue19-fix.patch
BuildArch: noarch
BuildRequires: python2-devel, wxPython-devel >= 2.6, desktop-file-utils
Requires: python-crypto, wxPython >= 2.6
@@ -23,6 +26,8 @@ communication and speed of up to 20 times that of pdb.
%prep
%setup -q
%patch0 -p1 -b .gnomefix
+%patch1 -p1 -b .wxpy3
+%patch2 -p1 -b .issue19
sed -i 's/\r//g' README.txt
chmod -x README.txt
@@ -50,6 +55,10 @@ chmod +x $RPM_BUILD_ROOT%{python_sitelib}/rpdb2.py $RPM_BUILD_ROOT%{python_sitel
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Wed Apr 1 2015 Tom Callaway <spot at fedoraproject.org> - 1.4.8-9
+- apply patch from debian for improved support with wxPython 3
+- fix from upstream for breakpoints with commas (issue:19)
+
* Thu Dec 4 2014 Tom Callaway <spot at fedoraproject.org> - 1.4.8-8
- fix issue where winpdb doesn't launch in gnome-terminal properly anymore (bz1149030)
diff --git a/wxpython3.0.patch b/wxpython3.0.patch
new file mode 100644
index 0000000..a60e525
--- /dev/null
+++ b/wxpython3.0.patch
@@ -0,0 +1,47 @@
+Description: Fixes for wxPython 3.0
+ Retains compatibility with 2.8.
+Author: Olly Betts <olly at survex.com>
+Bug-Debian: https://bugs.debian.org/759093
+Forwarded: no
+Last-Update: 2014-09-20
+
+Index: winpdb-1.4.8/winpdb.py
+===================================================================
+--- winpdb-1.4.8.orig/winpdb.py
++++ winpdb-1.4.8/winpdb.py
+@@ -278,7 +278,7 @@ import sys
+
+
+
+-WXVER = "2.6"
++WXVER = "2.8"
+
+ STR_WXPYTHON_ERROR_TITLE = 'Winpdb Error'
+ STR_WXPYTHON_ERROR_MSG = """wxPython was not found.
+@@ -3870,7 +3870,7 @@ class CHTMLDialog(wx.Dialog):
+ self.m_html.SetPage(self.get_html_text(text))
+
+ ir = self.m_html.GetInternalRepresentation()
+- self.m_html.SetSize((ir.GetWidth() + 25, min(500, ir.GetHeight() + 25)))
++ self.m_html.SetMinSize((ir.GetWidth() + 25, min(500, ir.GetHeight() + 25)))
+
+ btnsizer = wx.StdDialogButtonSizer()
+ sizerv.Add(btnsizer, 0, wx.ALIGN_CENTRE | wx.ALL, 5)
+@@ -4465,7 +4465,7 @@ class COpenDialog(wx.Dialog):
+ (_path, filename, args) = rpdb2.split_command_line_path_filename_args(command_line)
+ _abs_path = os.path.abspath(_path)
+
+- dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.OPEN | wx.CHANGE_DIR)
++ dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
+ r = dlg.ShowModal()
+ if r == wx.ID_OK:
+ path = dlg.GetPaths()[0]
+@@ -4563,7 +4563,7 @@ class CLaunchDialog(wx.Dialog):
+
+ cwd = rpdb2.getcwdu()
+
+- dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.OPEN | wx.CHANGE_DIR)
++ dlg = wx.FileDialog(self, defaultDir = _abs_path, defaultFile = filename, wildcard = WINPDB_WILDCARD, style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
+ r = dlg.ShowModal()
+
+ os.chdir(cwd)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/winpdb.git/commit/?h=master&id=e7d071c1c5f1d09e22c379dcaf045374e00b0ff5
More information about the scm-commits
mailing list