Date: Thursday, June 13, 2019 @ 17:02:57 Author: arcanis Revision: 481280
upgpkg: eric 19.06-1 Added: eric/trunk/fix-install-dir.patch Modified: eric/trunk/ChangeLog eric/trunk/PKGBUILD Deleted: eric/trunk/fix-noapis.patch -----------------------+ ChangeLog | 3 ++ PKGBUILD | 54 ++++++++++++++++++++++++------------------------ fix-install-dir.patch | 13 +++++++++++ fix-noapis.patch | 40 ----------------------------------- 4 files changed, 43 insertions(+), 67 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2019-06-13 14:58:13 UTC (rev 481279) +++ ChangeLog 2019-06-13 17:02:57 UTC (rev 481280) @@ -1,3 +1,6 @@ +19.06-1: +upstream update + 19.03-1: upstream update Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-06-13 14:58:13 UTC (rev 481279) +++ PKGBUILD 2019-06-13 17:02:57 UTC (rev 481280) @@ -5,7 +5,8 @@ pkgbase=eric pkgname=('eric-common' 'eric' 'python2-eric') -pkgver=19.03 +pkgver=19.06 +_pkgver=19.6 pkgrel=1 pkgdesc="A full-featured Python and Ruby IDE in PyQt" arch=('any') @@ -14,20 +15,19 @@ 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-noapis.patch") -sha512sums=('66d2aaf9b8c215c84fadcbfc0985445e22dd6ec10724a2a4680345295a6e9b73478be5ba2d96ca2036adf3e7704072f9ef3c1be313fe076affa59492fc86690e' - '428b0cdc1f28b9b969805e04a3b3a00a65094d968736870e00adf2fc1b46bc17e3a329d7c63c936fab6282e1f66059abc951739aa803e7015312f909c8593b2c') +source=("https://downloads.sourceforge.net/eric-ide/eric6-${_pkgver}.tar.gz" + "fix-install-dir.patch") +sha512sums=('91401f73c3f009265b240a4654cdc1ca6af636f6f12afa40ca59bebdf4955854212400d18e5eb5d926de6afdd904a27f68523bb52dff68b256b67b00142f3ac8' + '027c79e7ec4d017e1da10f9d0256fcef28033780f3bddf29b52538b6c0128ce952adf6212607379db83bd143a8851df68c592d2c142ad02d742c9b423908fc50') changelog=ChangeLog prepare() { # fix no-apis option - cd "${srcdir}/eric6-${pkgver}" - patch -p1 -i "${srcdir}/fix-noapis.patch" + cd "${srcdir}/eric6-${_pkgver}" + patch -p1 -i "${srcdir}/fix-install-dir.patch" + cp -r "${srcdir}/eric6-${_pkgver}"{,_py2} - cp -r "${srcdir}/eric6-${pkgver}"{,_py2} - - cd "${srcdir}/eric6-${pkgver}_py2/eric" + cd "${srcdir}/eric6-${_pkgver}_py2/eric" find . -name '*.py' -exec \ sed -i -r "s:^#!/usr/bin/(env |)python(3|)$:#!/usr/bin/env python2:" {} \; } @@ -35,36 +35,36 @@ package_eric-common() { depends=() - cd "${srcdir}/eric6-${pkgver}/eric" + cd "${srcdir}/eric6-${_pkgver}/eric" # eric APIs - install -Dm644 "APIs/Python3/eric6.api" \ + install -Dm644 "eric6/APIs/Python3/eric6.api" \ "${pkgdir}/usr/share/qt/qsci/api/python/eric6.api" - install -Dm644 "APIs/Python3/eric6.bas" \ + install -Dm644 "eric6/APIs/Python3/eric6.bas" \ "${pkgdir}/usr/share/qt/qsci/api/python/eric6.bas" # pyqt APIs - install -Dm644 "APIs/Python3/PyQt5.bas" \ + install -Dm644 "eric6/APIs/Python3/PyQt5.bas" \ "${pkgdir}/usr/share/qt/qsci/api/python/PyQt5.bas" # qss APIs - install -Dm644 "APIs/QSS/qss.api" \ + install -Dm644 "eric6/APIs/QSS/qss.api" \ "${pkgdir}/usr/share/qt/qsci/api/qss/qss.api" # qscintilla APIs - install -Dm644 "APIs/Python3/QScintilla2.bas" \ + install -Dm644 "eric6/APIs/Python3/QScintilla2.bas" \ "${pkgdir}/usr/share/qt/qsci/api/python/QScintilla2.bas" # zope APIs - install -Dm644 "APIs/Python/zope-2.10.7.api" \ + install -Dm644 "eric6/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" \ + install -Dm644 "eric6/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" \ + install -Dm644 "eric6/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" \ + install -Dm644 "eric6/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" \ + install -Dm644 "eric6/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" \ + install -Dm644 "eric6/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" \ + install -Dm644 "eric6/APIs/Ruby/Ruby-1.9.1.bas" \ "${pkgdir}/usr/share/qt/qsci/api/ruby/Ruby-1.9.1.bas" } @@ -72,8 +72,8 @@ depends=('eric-common' 'python-qscintilla-qt5' 'python-pyqtwebengine' 'qt5-svg' 'qt5-webkit') optdepends=('qt5-webengine: alternative browser backend') - cd "${srcdir}/eric6-${pkgver}" - python install.py -c -b /usr/bin -i "${pkgdir}" --no-apis + cd "${srcdir}/eric6-${_pkgver}" + python 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" {} \; @@ -83,8 +83,8 @@ 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}" -y --no-apis + 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" {} \; Added: fix-install-dir.patch =================================================================== --- fix-install-dir.patch (rev 0) +++ fix-install-dir.patch 2019-06-13 17:02:57 UTC (rev 481280) @@ -0,0 +1,13 @@ +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 Deleted: fix-noapis.patch =================================================================== --- fix-noapis.patch 2019-06-13 14:58:13 UTC (rev 481279) +++ fix-noapis.patch 2019-06-13 17:02:57 UTC (rev 481280) @@ -1,40 +0,0 @@ -diff -ruN eric6-19.03-orig/eric/install.py eric6-19.03/eric/install.py ---- eric6-19.03-orig/eric/install.py 2019-03-30 03:14:11.236099494 +0300 -+++ eric6-19.03/eric/install.py 2019-03-30 03:16:36.238216137 +0300 -@@ -1905,13 +1905,13 @@ - try: - if sys.platform.startswith(("win", "cygwin")): - optlist, args = getopt.getopt( -- argv[1:], "chxyza:b:d:f:", ["help", "pyqt=", "noapis"]) -+ argv[1:], "chxyza:b:d:f:", ["help", "pyqt=", "no-apis"]) - elif sys.platform == "darwin": - optlist, args = getopt.getopt( -- argv[1:], "chxyza:b:d:f:i:m:n:p:", ["help", "pyqt=", "noapis"]) -+ argv[1:], "chxyza:b:d:f:i:m:n:p:", ["help", "pyqt=", "no-apis"]) - else: - optlist, args = getopt.getopt( -- argv[1:], "chxyza:b:d:f:i:", ["help", "pyqt=", "noapis"]) -+ argv[1:], "chxyza:b:d:f:i:", ["help", "pyqt=", "no-apis"]) - except getopt.GetoptError as err: - print(err) - usage() -diff -ruN eric6-19.03-orig/install.py eric6-19.03/install.py ---- eric6-19.03-orig/install.py 2019-03-30 03:14:11.039434611 +0300 -+++ eric6-19.03/install.py 2019-03-30 03:16:36.238216137 +0300 -@@ -1905,13 +1905,13 @@ - try: - if sys.platform.startswith(("win", "cygwin")): - optlist, args = getopt.getopt( -- argv[1:], "chxyza:b:d:f:", ["help", "pyqt=", "noapis"]) -+ argv[1:], "chxyza:b:d:f:", ["help", "pyqt=", "no-apis"]) - elif sys.platform == "darwin": - optlist, args = getopt.getopt( -- argv[1:], "chxyza:b:d:f:i:m:n:p:", ["help", "pyqt=", "noapis"]) -+ argv[1:], "chxyza:b:d:f:i:m:n:p:", ["help", "pyqt=", "no-apis"]) - else: - optlist, args = getopt.getopt( -- argv[1:], "chxyza:b:d:f:i:", ["help", "pyqt=", "noapis"]) -+ argv[1:], "chxyza:b:d:f:i:", ["help", "pyqt=", "no-apis"]) - except getopt.GetoptError as err: - print(err) - usage()