Date: Saturday, November 9, 2019 @ 12:16:19 Author: arojas Revision: 524813
Update to 19.11, drop python2 Modified: eric/trunk/PKGBUILD Deleted: eric/trunk/fix-install-dir.patch -----------------------+ PKGBUILD | 40 +++++++--------------------------------- fix-install-dir.patch | 13 ------------- 2 files changed, 7 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-09 11:27:50 UTC (rev 524812) +++ PKGBUILD 2019-11-09 12:16:19 UTC (rev 524813) @@ -4,34 +4,19 @@ # See .contrib for older/other contributors pkgbase=eric -pkgname=('eric-common' 'eric' 'python2-eric') -pkgver=19.06 -_pkgver=19.6 -pkgrel=2 +pkgname=('eric-common' 'eric') +pkgver=19.11 +_pkgver=19.11 +pkgrel=1 pkgdesc="A full-featured Python and Ruby IDE in PyQt" arch=('any') url="https://eric-ide.python-projects.org/" license=('GPL3') -depends=('python-qscintilla-qt5' 'python2-qscintilla-qt5' - 'python-pyqtwebengine' 'python2-pyqtwebengine' - 'qt5-svg' 'qt5-webengine') -source=("https://downloads.sourceforge.net/eric-ide/eric6-${_pkgver}.tar.gz" - "fix-install-dir.patch") -sha512sums=('91401f73c3f009265b240a4654cdc1ca6af636f6f12afa40ca59bebdf4955854212400d18e5eb5d926de6afdd904a27f68523bb52dff68b256b67b00142f3ac8' - '027c79e7ec4d017e1da10f9d0256fcef28033780f3bddf29b52538b6c0128ce952adf6212607379db83bd143a8851df68c592d2c142ad02d742c9b423908fc50') +depends=('python-qscintilla-qt5' 'python-pyqtwebengine' 'python-pyqtchart' 'qt5-svg') +source=("https://downloads.sourceforge.net/eric-ide/eric6-${_pkgver}.tar.gz") +sha512sums=('a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533') changelog=ChangeLog -prepare() { - # fix no-apis option - cd "${srcdir}/eric6-${_pkgver}" - patch -p1 -i "${srcdir}/fix-install-dir.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:" {} \; -} - package_eric-common() { depends=() @@ -79,15 +64,4 @@ find "${pkgdir}" -name '*.desktop' -exec sed -i "s|${pkgdir}||g" {} \; } -package_python2-eric() { - depends=('eric-common' 'python2-qscintilla-qt5' 'python2-pyqtwebengine' 'qt5-svg' 'qt5-webkit') - optdepends=('qt5-webengine: alternative browser backend') - - cd "${srcdir}/eric6-${_pkgver}_py2" - python2 install.py -c -b "/usr/bin" -i "${pkgdir}" --no-apis - - # fix paths in desktop files - find "${pkgdir}" -name '*.desktop' -exec sed -i "s|${pkgdir}||g" {} \; -} - # vim:set ts=2 sw=2 et: Deleted: fix-install-dir.patch =================================================================== --- fix-install-dir.patch 2019-11-09 11:27:50 UTC (rev 524812) +++ fix-install-dir.patch 2019-11-09 12:16:19 UTC (rev 524813) @@ -1,13 +0,0 @@ -diff -ruN eric6-19.6-orig/install.py eric6-19.6/install.py ---- eric6-19.6-orig/install.py 2019-06-13 19:56:12.530281194 +0300 -+++ eric6-19.6/install.py 2019-06-13 19:56:58.593612194 +0300 -@@ -828,7 +828,8 @@ - # set install prefix, if not None - if distDir: - for key in list(cfg.keys()): -- cfg[key] = os.path.normpath(os.path.join(distDir, cfg[key])) -+ relpath = os.path.relpath(cfg[key], start="/") if cfg[key] else "" -+ cfg[key] = os.path.normpath(os.path.join(distDir, relpath)) - - try: - # Install the files