[arch-commits] Commit in atom/trunk (PKGBUILD)

[Nicola Squartini]

    Date: Tuesday, December 17, 2019 @ 01:47:16
  Author: tensor5
Revision: 537899

upgpkg: atom 1.42.0-1

Modified:
  atom/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-16 23:58:15 UTC (rev 537898)
+++ PKGBUILD	2019-12-17 01:47:16 UTC (rev 537899)
@@ -1,19 +1,20 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.41.0
+pkgver=1.42.0
+_commit=db0fa4836faef921f73cbb0b4b7ffc7e32063118
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
 license=('MIT' 'custom')
-depends=('apm' 'electron4' 'libxkbfile')
+depends=('apm' 'electron4' 'libxkbfile' 'ripgrep')
 makedepends=('git' 'npm')
 optdepends=('ctags: symbol indexing support'
             'git: Git and GitHub integration')
 replaces=('atom-editor')
 options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
+source=("git+https://github.com/atom/atom.git#commit=${_commit}"
         'atom.js'
         'dugite-use-system-git.patch'
         'fix-atom-sh.patch'
@@ -25,7 +26,7 @@
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('4a440909462c461cbec9b82b5f97bd21719a34f0ab59f2d859df85a40246c949'
+sha256sums=('SKIP'
             'd286e0766e47cfea73cd207abb9d6f7375846688823e72732c871a852b4b261d'
             '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
             'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
@@ -39,19 +40,19 @@
             'd52a6d8a16db56d863061f66b1aeb5adefd8d8d6681e0e5ea53e3e397550fb70')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}
 
-  patch -Np1 -i "${srcdir}"/fix-atom-sh.patch
-  patch -Np1 -i "${srcdir}"/use-system-electron.patch
-  patch -Np1 -i "${srcdir}"/use-system-apm.patch
-  patch -Np1 -i "${srcdir}"/fix-license-path.patch
-  patch -Np1 -i "${srcdir}"/fix-restart.patch
-  patch -Np1 -i "${srcdir}"/node-env-production.patch
-  patch -Np1 -i "${srcdir}"/no-unsafe-eval-warning.patch
+  patch -Np1 -i ../fix-atom-sh.patch
+  patch -Np1 -i ../use-system-electron.patch
+  patch -Np1 -i ../use-system-apm.patch
+  patch -Np1 -i ../fix-license-path.patch
+  patch -Np1 -i ../fix-restart.patch
+  patch -Np1 -i ../node-env-production.patch
+  patch -Np1 -i ../no-unsafe-eval-warning.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}
 
   ATOM_RESOURCE_PATH="${PWD}" \
   npm_config_build_from_source=true \
@@ -97,7 +98,7 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}
 
   install -d -m 755 "${pkgdir}"/usr/lib
   cp -r out/app "${pkgdir}"/usr/lib/atom
@@ -104,6 +105,8 @@
   install -m 644 out/startup.js "${pkgdir}"/usr/lib/atom
   install -m 755 "${srcdir}/atom.js" "${pkgdir}"/usr/lib/atom/atom
 
+  ln -sf /usr/bin/rg "${pkgdir}/usr/lib/atom/node_modules/vscode-ripgrep/bin/rg"
+
   install -d -m 755 "${pkgdir}/usr/share/applications"
   sed -e "s|<%= appName %>|Atom|" \
       -e "s/<%= description %>/${pkgdesc}/" \