Date: Tuesday, January 27, 2015 @ 08:30:40 Author: arcanis Revision: 126628
archrelease: copy trunk to community-any Added: eric/repos/community-any/.contrib (from rev 126627, eric/trunk/.contrib) eric/repos/community-any/ChangeLog (from rev 126627, eric/trunk/ChangeLog) eric/repos/community-any/PKGBUILD (from rev 126627, eric/trunk/PKGBUILD) eric/repos/community-any/eric-debugger-171.patch (from rev 126627, eric/trunk/eric-debugger-171.patch) eric/repos/community-any/eric.install (from rev 126627, eric/trunk/eric.install) Deleted: eric/repos/community-any/.contrib eric/repos/community-any/ChangeLog eric/repos/community-any/PKGBUILD eric/repos/community-any/eric.install -------------------------+ .contrib | 14 +- ChangeLog | 42 +++--- PKGBUILD | 284 +++++++++++++++++++++++----------------------- eric-debugger-171.patch | 70 +++++++++++ eric.install | 18 +- 5 files changed, 254 insertions(+), 174 deletions(-) Deleted: .contrib =================================================================== --- .contrib 2015-01-27 07:30:12 UTC (rev 126627) +++ .contrib 2015-01-27 07:30:40 UTC (rev 126628) @@ -1,7 +0,0 @@ -This is a list of (past) contributors not already credited in the PKGBUILD: - -Eric Belanger <e...@archlinux.org> -riai <r...@bigfoot.com> -Ben <b...@benmazer.net> -Daniel J Griffiths <ghost1...@archlinux.us> -Felix Rohrbach <f...@gmx.de> Copied: eric/repos/community-any/.contrib (from rev 126627, eric/trunk/.contrib) =================================================================== --- .contrib (rev 0) +++ .contrib 2015-01-27 07:30:40 UTC (rev 126628) @@ -0,0 +1,7 @@ +This is a list of (past) contributors not already credited in the PKGBUILD: + +Eric Belanger <e...@archlinux.org> +riai <r...@bigfoot.com> +Ben <b...@benmazer.net> +Daniel J Griffiths <ghost1...@archlinux.us> +Felix Rohrbach <f...@gmx.de> Deleted: ChangeLog =================================================================== --- ChangeLog 2015-01-27 07:30:12 UTC (rev 126627) +++ ChangeLog 2015-01-27 07:30:40 UTC (rev 126628) @@ -1,19 +0,0 @@ -6.0.1-1: -upstream update - -6.0.0-1: -* upstream update -* split to qt5 and qt4 packages - -5.5.2-1: -upstream update - -5.5.1-1: -upstream update - -5.5.0-1: -* upstream update -* create python2-eric package - -5.4.7-1: -upstream update. Create eric-common package Copied: eric/repos/community-any/ChangeLog (from rev 126627, eric/trunk/ChangeLog) =================================================================== --- ChangeLog (rev 0) +++ ChangeLog 2015-01-27 07:30:40 UTC (rev 126628) @@ -0,0 +1,23 @@ +6.0.1-2: +* fix FS#43573 +* fix API path + +6.0.1-1: +upstream update + +6.0.0-1: +* upstream update +* split to qt5 and qt4 packages + +5.5.2-1: +upstream update + +5.5.1-1: +upstream update + +5.5.0-1: +* upstream update +* create python2-eric package + +5.4.7-1: +upstream update. Create eric-common package Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-01-27 07:30:12 UTC (rev 126627) +++ PKGBUILD 2015-01-27 07:30:40 UTC (rev 126628) @@ -1,139 +0,0 @@ -# $Id$ -# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org> -# Contributor: Ray Rashif <schiv at archlinux dot org> -# Contributor: Brad Fanella <bradfanellaat archlinux dot us> -# See .contrib for older/other contributors - -pkgbase=eric -pkgname=('eric-common' 'eric' 'python2-eric' - 'eric-common-qt4' 'eric-qt4' 'python2-eric-qt4') -pkgver=6.0.1 -pkgrel=1 -pkgdesc="A full-featured Python and Ruby IDE in PyQt4" -arch=('any') -url="http://eric-ide.python-projects.org/" -license=('GPL3') -depends=('python-qscintilla' 'python2-qscintilla' - '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') -changelog=ChangeLog - -prepare() { - cp -r "${srcdir}/eric6-${pkgver}"{,_py2} - - cd "${srcdir}/eric6-${pkgver}_py2/eric" - find . -name '*.py' -exec \ - sed -i -r "s:^#!/usr/bin/(env |)python(3|)$:#!/usr/bin/env python2:" {} \; - - cp -r "${srcdir}/eric6-${pkgver}"{,-qt4} - cp -r "${srcdir}/eric6-${pkgver}_py2"{,-qt4} -} - -package_eric-common-qt4() { - depends=() - - cd "${srcdir}/eric6-${pkgver}/eric" - # eric APIs - install -Dm644 "APIs/Python3/eric6.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.api" - install -Dm644 "APIs/Python3/eric6.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.bas" - # pyqt APIs - install -Dm644 "APIs/Python3/PyQt4.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/PyQt4.bas" - # qss APIs - install -Dm644 "APIs/QSS/qss.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/qss/qss.api" - # qscintilla APIs - install -Dm644 "APIs/Python3/QScintilla2.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/QScintilla2.bas" - # zope APIs - install -Dm644 "APIs/Python/zope-2.10.7.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/zope-2.10.7.api" - install -Dm644 "APIs/Python/zope-2.11.2.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/zope-2.11.2.api" - install -Dm644 "APIs/Python/zope-3.3.1.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/zope-3.3.1.api" - # ruby APIs - install -Dm644 "APIs/Ruby/Ruby-1.8.7.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.8.7.api" - install -Dm644 "APIs/Ruby/Ruby-1.8.7.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.8.7.bas" - install -Dm644 "APIs/Ruby/Ruby-1.9.1.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.api" - install -Dm644 "APIs/Ruby/Ruby-1.9.1.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.bas" -} - -package_eric-qt4() { - depends=('eric-common-qt4' 'python-qscintilla') - conflicts=('eric') - - cd "${srcdir}/eric6-${pkgver}-qt4" - python install.py -c -b /usr/bin -i "${pkgdir}" --noapis --pyqt=4 -} - -package_python2-eric-qt4() { - depends=('eric-common-qt4' 'python2-qscintilla') - conflicts=('python2-eric-qt4') - - cd "${srcdir}/eric6-${pkgver}_py2-qt4" - python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis --pyqt=4 -} - -package_eric-common() { - depends=() - - cd "${srcdir}/eric6-${pkgver}/eric" - # eric APIs - install -Dm644 "APIs/Python3/eric6.api" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.api" - install -Dm644 "APIs/Python3/eric6.bas" \ - "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.bas" - # pyqt APIs - install -Dm644 "APIs/Python3/PyQt5.bas" \ - "${pkgdir}/usr/share/qt/qsci/api/python/PyQt5.bas" - # qss APIs - install -Dm644 "APIs/QSS/qss.api" \ - "${pkgdir}/usr/share/qt/qsci/api/qss/qss.api" - # qscintilla APIs - install -Dm644 "APIs/Python3/QScintilla2.bas" \ - "${pkgdir}/usr/share/qt/qsci/api/python/QScintilla2.bas" - # zope APIs - install -Dm644 "APIs/Python/zope-2.10.7.api" \ - "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.10.7.api" - install -Dm644 "APIs/Python/zope-2.11.2.api" \ - "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.11.2.api" - install -Dm644 "APIs/Python/zope-3.3.1.api" \ - "${pkgdir}/usr/share/qt/qsci/api/python/zope-3.3.1.api" - # ruby APIs - install -Dm644 "APIs/Ruby/Ruby-1.8.7.api" \ - "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.api" - install -Dm644 "APIs/Ruby/Ruby-1.8.7.bas" \ - "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.bas" - install -Dm644 "APIs/Ruby/Ruby-1.9.1.api" \ - "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.api" - install -Dm644 "APIs/Ruby/Ruby-1.9.1.bas" \ - "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.bas" -} - -package_eric() { - depends=('eric-common' 'python-qscintilla-qt5' 'qt5-svg' 'qt5-webkit') - conflicts=('eric-qt4') - - cd "${srcdir}/eric6-${pkgver}" - python install.py -c -b /usr/bin -i "${pkgdir}" --noapis -} - -package_python2-eric() { - depends=('eric-common' 'python2-qscintilla-qt5' 'qt5-svg' 'qt5-webkit') - conflicts=('python2-eric-qt4') - - cd "${srcdir}/eric6-${pkgver}_py2" - python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis -} - -# vim:set ts=2 sw=2 et: Copied: eric/repos/community-any/PKGBUILD (from rev 126627, eric/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-01-27 07:30:40 UTC (rev 126628) @@ -0,0 +1,145 @@ +# $Id$ +# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org> +# Contributor: Ray Rashif <schiv at archlinux dot org> +# Contributor: Brad Fanella <bradfanellaat archlinux dot us> +# See .contrib for older/other contributors + +pkgbase=eric +pkgname=('eric-common' 'eric' 'python2-eric' + 'eric-common-qt4' 'eric-qt4' 'python2-eric-qt4') +pkgver=6.0.1 +pkgrel=2 +pkgdesc="A full-featured Python and Ruby IDE in PyQt4" +arch=('any') +url="http://eric-ide.python-projects.org/" +license=('GPL3') +depends=('python-qscintilla' 'python2-qscintilla' + 'python-qscintilla-qt5' 'python2-qscintilla-qt5' + 'qt5-svg' 'qt5-webkit') +install=${pkgbase}.install +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" + find . -name '*.py' -exec \ + sed -i -r "s:^#!/usr/bin/(env |)python(3|)$:#!/usr/bin/env python2:" {} \; + + cp -r "${srcdir}/eric6-${pkgver}"{,-qt4} + cp -r "${srcdir}/eric6-${pkgver}_py2"{,-qt4} +} + +package_eric-common-qt4() { + depends=() + + cd "${srcdir}/eric6-${pkgver}/eric" + # eric APIs + install -Dm644 "APIs/Python3/eric6.api" \ + "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.api" + install -Dm644 "APIs/Python3/eric6.bas" \ + "${pkgdir}/usr/share/qt4/qsci/api/python/eric6.bas" + # pyqt APIs + install -Dm644 "APIs/Python3/PyQt4.bas" \ + "${pkgdir}/usr/share/qt4/qsci/api/python/PyQt4.bas" + # qss APIs + install -Dm644 "APIs/QSS/qss.api" \ + "${pkgdir}/usr/share/qt4/qsci/api/qss/qss.api" + # qscintilla APIs + install -Dm644 "APIs/Python3/QScintilla2.bas" \ + "${pkgdir}/usr/share/qt4/qsci/api/python/QScintilla2.bas" + # zope APIs + install -Dm644 "APIs/Python/zope-2.10.7.api" \ + "${pkgdir}/usr/share/qt4/qsci/api/python/zope-2.10.7.api" + install -Dm644 "APIs/Python/zope-2.11.2.api" \ + "${pkgdir}/usr/share/qt4/qsci/api/python/zope-2.11.2.api" + install -Dm644 "APIs/Python/zope-3.3.1.api" \ + "${pkgdir}/usr/share/qt4/qsci/api/python/zope-3.3.1.api" + # ruby APIs + install -Dm644 "APIs/Ruby/Ruby-1.8.7.api" \ + "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.8.7.api" + install -Dm644 "APIs/Ruby/Ruby-1.8.7.bas" \ + "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.8.7.bas" + install -Dm644 "APIs/Ruby/Ruby-1.9.1.api" \ + "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.api" + install -Dm644 "APIs/Ruby/Ruby-1.9.1.bas" \ + "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.bas" +} + +package_eric-qt4() { + depends=('eric-common-qt4' 'python-qscintilla') + conflicts=('eric') + + cd "${srcdir}/eric6-${pkgver}-qt4" + python install.py -c -b /usr/bin -i "${pkgdir}" --noapis --pyqt=4 +} + +package_python2-eric-qt4() { + depends=('eric-common-qt4' 'python2-qscintilla') + conflicts=('python2-eric-qt4') + + cd "${srcdir}/eric6-${pkgver}_py2-qt4" + python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis --pyqt=4 +} + +package_eric-common() { + depends=() + + cd "${srcdir}/eric6-${pkgver}/eric" + # eric APIs + install -Dm644 "APIs/Python3/eric6.api" \ + "${pkgdir}/usr/share/qt/qsci/api/python/eric6.api" + install -Dm644 "APIs/Python3/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" + # qss APIs + install -Dm644 "APIs/QSS/qss.api" \ + "${pkgdir}/usr/share/qt/qsci/api/qss/qss.api" + # qscintilla APIs + install -Dm644 "APIs/Python3/QScintilla2.bas" \ + "${pkgdir}/usr/share/qt/qsci/api/python/QScintilla2.bas" + # zope APIs + install -Dm644 "APIs/Python/zope-2.10.7.api" \ + "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.10.7.api" + install -Dm644 "APIs/Python/zope-2.11.2.api" \ + "${pkgdir}/usr/share/qt/qsci/api/python/zope-2.11.2.api" + install -Dm644 "APIs/Python/zope-3.3.1.api" \ + "${pkgdir}/usr/share/qt/qsci/api/python/zope-3.3.1.api" + # ruby APIs + install -Dm644 "APIs/Ruby/Ruby-1.8.7.api" \ + "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.api" + install -Dm644 "APIs/Ruby/Ruby-1.8.7.bas" \ + "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.bas" + install -Dm644 "APIs/Ruby/Ruby-1.9.1.api" \ + "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.api" + install -Dm644 "APIs/Ruby/Ruby-1.9.1.bas" \ + "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.bas" +} + +package_eric() { + depends=('eric-common' 'python-qscintilla-qt5' 'qt5-svg' 'qt5-webkit') + conflicts=('eric-qt4') + + cd "${srcdir}/eric6-${pkgver}" + python install.py -c -b /usr/bin -i "${pkgdir}" --noapis +} + +package_python2-eric() { + depends=('eric-common' 'python2-qscintilla-qt5' 'qt5-svg' 'qt5-webkit') + conflicts=('python2-eric-qt4') + + cd "${srcdir}/eric6-${pkgver}_py2" + python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis +} + +# vim:set ts=2 sw=2 et: Copied: eric/repos/community-any/eric-debugger-171.patch (from rev 126627, eric/trunk/eric-debugger-171.patch) =================================================================== --- eric-debugger-171.patch (rev 0) +++ eric-debugger-171.patch 2015-01-27 07:30:40 UTC (rev 126628) @@ -0,0 +1,70 @@ + +# HG changeset patch +# User Detlev Offenbach <det...@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, + Deleted: eric.install =================================================================== --- eric.install 2015-01-27 07:30:12 UTC (rev 126627) +++ eric.install 2015-01-27 07:30:40 UTC (rev 126628) @@ -1,9 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: eric/repos/community-any/eric.install (from rev 126627, eric/trunk/eric.install) =================================================================== --- eric.install (rev 0) +++ eric.install 2015-01-27 07:30:40 UTC (rev 126628) @@ -0,0 +1,9 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: