[arch-commits] Commit in apm/trunk (PKGBUILD python2.patch)

[Nicola Squartini]

    Date: Saturday, November 9, 2019 @ 06:31:44
  Author: tensor5
Revision: 524782

upgpkg: apm 2.4.3-2

Update dependency to python3.

Modified:
  apm/trunk/PKGBUILD
Deleted:
  apm/trunk/python2.patch

---------------+
 PKGBUILD      |    9 ++-------
 python2.patch |   14 --------------
 2 files changed, 2 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-09 02:47:32 UTC (rev 524781)
+++ PKGBUILD	2019-11-09 06:31:44 UTC (rev 524782)
@@ -2,12 +2,12 @@
 
 pkgname=apm
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Atom package manager'
 arch=('x86_64')
 url='https://github.com/atom/apm'
 license=('MIT')
-depends=('libsecret' 'nodejs>=10' 'npm' 'python2')
+depends=('libsecret' 'nodejs>=10' 'npm' 'python')
 makedepends=('git')
 provides=('nodejs-atom-package-manager')
 conflicts=('nodejs-atom-package-manager')
@@ -18,7 +18,6 @@
         "git+https://github.com/atom/git-utils#tag=v${_gitutils_tag}"
         'apm.js'
         'no-scripts.patch'
-        'python2.patch'
         'use-system-npm.patch'
         '0001-git-utils-nodejs-12-update.patch'
         'apm-nodejs-12-update.patch')
@@ -26,7 +25,6 @@
             'SKIP'
             'acbe133eb67d603e815605b1f3d9056a03bfc4a22a7e9db081126b289b385f77'
             '897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb'
-            '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
             'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19'
             '06d3404160990aaaa7b1b18f50d566f4c98a0456ffeee57d583c5bc36f26755d'
             '53c59f698809598b1afcf0c0a77bfeaa3dc113a73852af0def95b284162ee2fc')
@@ -56,9 +54,6 @@
   patch -Np1 -i "${srcdir}"/no-scripts.patch
   rm BUNDLED_NODE_VERSION script/*
 
-  # GYP needs Python2
-  patch -Np1 -i "${srcdir}"/python2.patch
-
   # patch apm to support nodejs 12
   patch -Np1 -i "${srcdir}"/apm-nodejs-12-update.patch
 }

Deleted: python2.patch
===================================================================
--- python2.patch	2019-11-09 02:47:32 UTC (rev 524781)
+++ python2.patch	2019-11-09 06:31:44 UTC (rev 524782)
@@ -1,14 +0,0 @@
---- a/bin/python-interceptor.sh
-+++ b/bin/python-interceptor.sh
-@@ -34,9 +34,9 @@
-       ARGS+=("--format=safemake.py")
-     fi
- 
--    exec python "${ARGS[@]}"
-+    exec python2 "${ARGS[@]}"
-     ;;
-   *)
--    exec python "$@"
-+    exec python2 "$@"
-     ;;
- esac