jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

atom: fix Fuzzy finder (git-utils)

Browse source 
With 1.41 release Atom has been switched to version 5.6 of git-utils
package. This version has a bug with symbol resolving as it does not
include new required C source files from libgit2 when building Node
native module.

This can be fixed by adding them to the gyp bindings of git-utils.
As most of Atom packages are downloaded during building, the easiest
way to modify them is to download them separately and ship as local
packages.

Signed-off-by: Alexander Lobakin <bloodyreaper@yandex.ru>
This commit is contained in:
Alexander Lobakin 2019-12-19 18:10:08 +03:00 committed by Juan RP
parent f011eed39d
commit c24c7a428a
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
srcpkgs/atom/patches/git-utils.patch Normal file
View file

@ -0,0 +1,23 @@
diff -Naurp0 a/package.json b/package.json
--- a/package.json 2019-12-13 22:07:42.000000000 +0300
+++ b/package.json 2019-12-19 13:26:20.083698872 +0300
@@ -67 +67 @@
- "git-utils": "5.6.1",
+ "git-utils": "file:packages/git-utils",
diff -Naurp0 a/package-lock.json b/package-lock.json
--- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
+++ b/package-lock.json 2019-12-19 16:45:30.215685265 +0300
@@ -3187,3 +3187 @@
- "version": "5.6.1",
- "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.1.tgz",
- "integrity": "sha512-wDF7vSbH940NupuMFC87As0x/VSke51P7xTnkdSlk96YN3tzOagXzBUNq5Nq16KOVuMSxcGj1l3qHF5VXl39Ng==",
+ "version": "file:packages/git-utils",
@@ -5761 +5759 @@
- "git-utils": "^5.6.0",
+ "git-utils": "file:packages/git-utils",
diff -Naurp0 a/packages/git-utils/binding.gyp b/packages/git-utils/binding.gyp
--- a/packages/git-utils/binding.gyp 2019-06-20 18:40:36.000000000 +0300
+++ b/packages/git-utils/binding.gyp 2019-12-19 13:28:15.623981924 +0300
@@ -164,0 +165,2 @@
+ 'deps/libgit2/src/net.c',
+ 'deps/libgit2/src/net.h',

18
srcpkgs/atom/template
View file

@ -1,7 +1,8 @@
# Template file for 'atom'
_git_utils_ver=5.6.2
pkgname=atom
version=1.41.0
revision=1
revision=2
archs="x86_64"
hostmakedepends="git pkg-config python-devel nodejs-lts-10 nodejs-lts-10-devel curl gtk+3
libXtst libXScrnSaver nss python alsa-lib"
@ -11,13 +12,24 @@ short_desc="Chrome-based text editor from Github"
maintainer="Wilson Birney <wpb@360scada.com>"
license="MIT"
homepage="https://atom.io"
distfiles="https://github.com/atom/atom/archive/v${version}.tar.gz"
checksum=4a440909462c461cbec9b82b5f97bd21719a34f0ab59f2d859df85a40246c949
distfiles="
https://github.com/atom/atom/archive/v${version}.tar.gz
https://registry.npmjs.org/git-utils/-/git-utils-${_git_utils_ver}.tgz"
checksum="
4a440909462c461cbec9b82b5f97bd21719a34f0ab59f2d859df85a40246c949
b430ee53a09317df5b6677e5625950baefe840258f2e9d55cf4fc448c9d8576e"
skip_extraction="git-utils-${_git_utils_ver}.tgz"
shlib_provides="libGLESv2.so"
patch_args="-Np1"
nocross=yes
nostrip=yes
post_extract() {
mkdir -p packages/git-utils
tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/git-utils-${_git_utils_ver}.tgz \
--strip-components=1 -C packages/git-utils
}
pre_build() {
npm install -g gyp
vmkdir /usr/share/icons/hicolor