[arch-commits] Commit in eric/trunk (ChangeLog PKGBUILD eric-debugger-171.patch)

[Evgeniy Alekseev]

    Date: Tuesday, January 27, 2015 @ 08:30:12
  Author: arcanis
Revision: 126627

upgpkg: eric 6.0.1-2
* fix FS#43573
* fix API path

Added:
  eric/trunk/eric-debugger-171.patch
Modified:
  eric/trunk/ChangeLog
  eric/trunk/PKGBUILD

-------------------------+
 ChangeLog               |    4 ++
 PKGBUILD                |   16 +++++++---
 eric-debugger-171.patch |   70 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-01-27 04:04:12 UTC (rev 126626)
+++ ChangeLog	2015-01-27 07:30:12 UTC (rev 126627)
@@ -1,3 +1,7 @@
+6.0.1-2:
+* fix FS#43573
+* fix API path
+
 6.0.1-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-27 04:04:12 UTC (rev 126626)
+++ PKGBUILD	2015-01-27 07:30:12 UTC (rev 126627)
@@ -8,7 +8,7 @@
 pkgname=('eric-common' 'eric' 'python2-eric'
          'eric-common-qt4' 'eric-qt4' 'python2-eric-qt4')
 pkgver=6.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured Python and Ruby IDE in PyQt4"
 arch=('any')
 url="http://eric-ide.python-projects.org/"
@@ -17,11 +17,17 @@
          'python-qscintilla-qt5' 'python2-qscintilla-qt5'
          'qt5-svg' 'qt5-webkit')
 install=${pkgbase}.install
-source=("http://downloads.sourceforge.net/eric-ide/eric6-${pkgver}.tar.gz")
-md5sums=('532c072299b2489d6c9b2f1bb3676652')
+source=("http://downloads.sourceforge.net/eric-ide/eric6-${pkgver}.tar.gz"
+        "eric-debugger-171.patch")
+md5sums=('532c072299b2489d6c9b2f1bb3676652'
+         '3e841ee1bf3004f3a36b65d6122456d8')
 changelog=ChangeLog
 
 prepare() {
+  # fix FS#43573
+  cd "${srcdir}/eric6-${pkgver}/eric"
+  patch -p1 -i "${srcdir}/eric-debugger-171.patch"
+
   cp -r "${srcdir}/eric6-${pkgver}"{,_py2}
 
   cd "${srcdir}/eric6-${pkgver}_py2/eric"
@@ -90,9 +96,9 @@
   cd "${srcdir}/eric6-${pkgver}/eric"
   # eric APIs
   install -Dm644 "APIs/Python3/eric6.api" \
-                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.api"
+                 "${pkgdir}/usr/share/qt/qsci/api/python/eric6.api"
   install -Dm644 "APIs/Python3/eric6.bas" \
-                 "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.bas"
+                 "${pkgdir}/usr/share/qt/qsci/api/python/eric6.bas"
   # pyqt APIs
   install -Dm644 "APIs/Python3/PyQt5.bas" \
                  "${pkgdir}/usr/share/qt/qsci/api/python/PyQt5.bas"

Added: eric-debugger-171.patch
===================================================================
--- eric-debugger-171.patch	                        (rev 0)
+++ eric-debugger-171.patch	2015-01-27 07:30:12 UTC (rev 126627)
@@ -0,0 +1,70 @@
+
+# HG changeset patch
+# User Detlev Offenbach <detlev at die-offenbachs.de>
+# Date 1422041255 -3600
+# Node ID c918bd03f0ff4deffba8934d37baadaf6d7d9587
+# Parent  7d7ce7fdccfdc76f5865849e348a4a33ef104a92
+Fixed a serious issue handling 'non-error' exceptions in the debugger. This bug was about 10 years old.
+(grafted from b7269498aa95bdf2e28c7a23697e1b0a6cdc638b)
+
+diff -r 7d7ce7fdccfd -r c918bd03f0ff DebugClients/Python/DebugBase.py
+--- a/DebugClients/Python/DebugBase.py	Thu Jan 22 19:16:51 2015 +0100
++++ b/DebugClients/Python/DebugBase.py	Fri Jan 23 20:27:35 2015 +0100
+@@ -636,6 +636,11 @@
+         @param exctb traceback for the exception
+         @param unhandled flag indicating an uncaught exception
+         """
++        
++        if exctype in [GeneratorExit, StopIteration]:
++            # ignore these
++            return
++        
+         if exctype in [SystemExit, bdb.BdbQuit]:
+             atexit._run_exitfuncs()
+             if excval is None:
+diff -r 7d7ce7fdccfd -r c918bd03f0ff DebugClients/Python/DebugClientBase.py
+--- a/DebugClients/Python/DebugClientBase.py	Thu Jan 22 19:16:51 2015 +0100
++++ b/DebugClients/Python/DebugClientBase.py	Fri Jan 23 20:27:35 2015 +0100
+@@ -325,7 +325,10 @@
+             d = {}
+             d["id"] = -1
+             d["name"] = "MainThread"
+-            d["broken"] = self.isBroken()
++            if hasattr(self, "isBroken"):
++                d["broken"] = self.isBroken()
++            else:
++                d["broken"] = False
+             threadList.append(d)
+         
+         self.write('%s%s\n' % (DebugProtocol.ResponseThreadList,
+diff -r 7d7ce7fdccfd -r c918bd03f0ff DebugClients/Python3/DebugBase.py
+--- a/DebugClients/Python3/DebugBase.py	Thu Jan 22 19:16:51 2015 +0100
++++ b/DebugClients/Python3/DebugBase.py	Fri Jan 23 20:27:35 2015 +0100
+@@ -646,6 +646,11 @@
+         @param unhandled flag indicating an uncaught exception
+         """
+         exctype, excval, exctb = excinfo
++        
++        if exctype in [GeneratorExit, StopIteration]:
++            # ignore these
++            return
++        
+         if exctype in [SystemExit, bdb.BdbQuit]:
+             atexit._run_exitfuncs()
+             if excval is None:
+diff -r 7d7ce7fdccfd -r c918bd03f0ff DebugClients/Python3/DebugClientBase.py
+--- a/DebugClients/Python3/DebugClientBase.py	Thu Jan 22 19:16:51 2015 +0100
++++ b/DebugClients/Python3/DebugClientBase.py	Fri Jan 23 20:27:35 2015 +0100
+@@ -294,7 +294,10 @@
+             d = {}
+             d["id"] = -1
+             d["name"] = "MainThread"
+-            d["broken"] = self.isBroken()
++            if hasattr(self, "isBroken"):
++                d["broken"] = self.isBroken()
++            else:
++                d["broken"] = False
+             threadList.append(d)
+         
+         self.write("{0}{1!r}\n".format(DebugProtocol.ResponseThreadList,
+