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

[Nicola Squartini]

    Date: Sunday, March 5, 2017 @ 09:47:25
  Author: tensor5
Revision: 214943

upgpkg: apm 1.16.0-2

GYP needs Python2.

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

---------------+
 PKGBUILD      |    7 ++++++-
 python2.patch |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-05 00:55:29 UTC (rev 214942)
+++ PKGBUILD	2017-03-05 09:47:25 UTC (rev 214943)
@@ -3,7 +3,7 @@
 
 pkgname=apm
 pkgver=1.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Atom package manager'
 arch=('i686' 'x86_64')
 url='https://github.com/atom/apm'
@@ -17,10 +17,12 @@
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/apm/archive/v${pkgver}.tar.gz"
         'apm.js'
         'no-scripts.patch'
+        'python2.patch'
         'use-system-npm.patch')
 sha256sums=('5d02e5f148b86e462ae1f62443f682bbddaba1ee1c2ecc77714b4df240fad0df'
             '4ae1e5388ec2c52d8893d56a8df816e8aa69f54690801a9d283771133b4b3752'
             '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562'
+            '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
             '78307044359a56d019dada17c92fe769e57d9bbe3f5eaa5f6e7550827cbfe802')
 
 _apmdir='/usr/lib/node_modules/atom-package-manager'
@@ -41,6 +43,9 @@
   # Don't download binary Node
   patch -Np1 -i "${srcdir}"/no-scripts.patch
   rm BUNDLED_NODE_VERSION script/*
+
+  # GYP needs Python2
+  patch -Np1 -i "${srcdir}"/python2.patch
 }
 
 build() {

Added: python2.patch
===================================================================
--- python2.patch	                        (rev 0)
+++ python2.patch	2017-03-05 09:47:25 UTC (rev 214943)
@@ -0,0 +1,14 @@
+--- 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