[arch-commits] Commit in atom/trunk (PKGBUILD dugite-use-system-git.patch)
Nicola Squartini
tensor5 at archlinux.org
Thu Jun 14 20:47:29 UTC 2018
Date: Thursday, June 14, 2018 @ 20:47:29
Author: tensor5
Revision: 343199
upgpkg: atom 1.27.2-2
Fix git exec path in dugite (see FS#58591).
Modified:
atom/trunk/PKGBUILD
atom/trunk/dugite-use-system-git.patch
-----------------------------+
PKGBUILD | 9 ++++++---
dugite-use-system-git.patch | 9 +++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-14 20:44:30 UTC (rev 343198)
+++ PKGBUILD 2018-06-14 20:47:29 UTC (rev 343199)
@@ -3,7 +3,7 @@
pkgname=atom
pkgver=1.27.2
-pkgrel=1
+pkgrel=2
pkgdesc='A hackable text editor for the 21st Century'
arch=('x86_64')
url='https://github.com/atom/atom'
@@ -26,7 +26,7 @@
'use-system-electron.patch')
sha256sums=('e99c96326682cd674d3d225c01b706ddd7e5a6b3f4e7cbfcbef1a74d3b977223'
'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
- '3fadee5a2d8c1ff35e085f9b9f3cf2eb71627bda9e8b10c2a0bd85b268591bf6'
+ '866f19de9184287da459b0f9e8b79d0eeb72ba4e6c2a803ba29f74a33976deda'
'd8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442'
'7f0142c91e24236a3a6dcc70af9d4217f65c5a764091876a916e3bbafa4ed0fa'
'eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86'
@@ -45,6 +45,9 @@
patch -Np1 -i "${srcdir}"/fix-node8.patch
patch -Np1 -i "${srcdir}"/fix-restart.patch
+ # Upstream ea1ff8d45448679390058be185ee0d36f823872e
+ sed -e 's/"archive-view": "0.64.3"/"archive-view": "0.64.6"/' -i package.json
+
# Workaround for Node 10
sed -e 's|"electron-link": "0.2.0"|"electron-link": "../../electron-link"|' \
-i script/package.json
@@ -74,7 +77,7 @@
rm -r vendor
cd ../..
- # Use system git (TODO: set LOCAL_GIT_DIRECTORY=/usr)
+ # Use system git
cd node_modules/dugite
patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
rm -r git
Modified: dugite-use-system-git.patch
===================================================================
--- dugite-use-system-git.patch 2018-06-14 20:44:30 UTC (rev 343198)
+++ dugite-use-system-git.patch 2018-06-14 20:47:29 UTC (rev 343199)
@@ -9,6 +9,15 @@
}
}
/**
+@@ -50,7 +50,7 @@
+ if (process.platform === 'darwin' ||
+ process.platform === 'linux' ||
+ process.platform === 'android') {
+- return path.join(gitDir, 'libexec', 'git-core');
++ return path.join(gitDir, 'lib', 'git-core');
+ }
+ else if (process.platform === 'win32') {
+ return path.join(gitDir, 'mingw64', 'libexec', 'git-core');
@@ -100,9 +100,9 @@
if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
// use the SSL certificate bundle included in the distribution only
More information about the arch-commits
mailing list