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

[Evgeniy Alekseev]

    Date: Saturday, March 30, 2019 @ 00:29:42
  Author: arcanis
Revision: 446159

upgpkg: eric 19.03-1

Added:
  eric/trunk/fix-noapis.patch
Modified:
  eric/trunk/ChangeLog
  eric/trunk/PKGBUILD

------------------+
 ChangeLog        |    3 +++
 PKGBUILD         |   23 +++++++++++++++--------
 fix-noapis.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 8 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2019-03-30 00:08:23 UTC (rev 446158)
+++ ChangeLog	2019-03-30 00:29:42 UTC (rev 446159)
@@ -1,3 +1,6 @@
+19.03-1:
+upstream update
+
 19.01-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-30 00:08:23 UTC (rev 446158)
+++ PKGBUILD	2019-03-30 00:29:42 UTC (rev 446159)
@@ -5,19 +5,26 @@
 
 pkgbase=eric
 pkgname=('eric-common' 'eric' 'python2-eric')
-pkgver=19.01
+pkgver=19.03
 pkgrel=1
 pkgdesc="A full-featured Python and Ruby IDE in PyQt"
 arch=('any')
-url="http://eric-ide.python-projects.org/"
+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")
-sha512sums=('bc0c92f61d8559495fce1c292c236773aa9fa9f3aff1e173121f66088fbc299831d6beff7b3fc41b95f2647cc7c804866adead9d41afb76d7725fe1fa88d6d79')
+source=("https://downloads.sourceforge.net/eric-ide/eric6-${pkgver}.tar.gz"
+        "fix-noapis.patch")
+sha512sums=('66d2aaf9b8c215c84fadcbfc0985445e22dd6ec10724a2a4680345295a6e9b73478be5ba2d96ca2036adf3e7704072f9ef3c1be313fe076affa59492fc86690e'
+            '428b0cdc1f28b9b969805e04a3b3a00a65094d968736870e00adf2fc1b46bc17e3a329d7c63c936fab6282e1f66059abc951739aa803e7015312f909c8593b2c')
 changelog=ChangeLog
 
 prepare() {
+  # fix no-apis option
+  cd "${srcdir}/eric6-${pkgver}"
+  patch -p1 -i "${srcdir}/fix-noapis.patch"
+
   cp -r "${srcdir}/eric6-${pkgver}"{,_py2}
 
   cd "${srcdir}/eric6-${pkgver}_py2/eric"
@@ -62,11 +69,11 @@
 }
 
 package_eric() {
-  depends=('eric-common' 'python-qscintilla-qt5' 'qt5-svg' 'qt5-webkit')
+  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}" --noapis
+  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" {} \;
@@ -73,11 +80,11 @@
 }
 
 package_python2-eric() {
-  depends=('eric-common' 'python2-qscintilla-qt5' 'qt5-svg' 'qt5-webkit')
+  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 --noapis
+  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --no-apis
 
   # fix paths in desktop files
   find "${pkgdir}" -name '*.desktop' -exec sed -i "s|${pkgdir}||g" {} \;

Added: fix-noapis.patch
===================================================================
--- fix-noapis.patch	                        (rev 0)
+++ fix-noapis.patch	2019-03-30 00:29:42 UTC (rev 446159)
@@ -0,0 +1,40 @@
+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()