Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=62863123b97d9c97ec9473ff188daf9d94c5d307
commit 62863123b97d9c97ec9473ff188daf9d94c5d307
Author: DeX77 <de...@frugalware.org>
Date: Wed Aug 16 13:20:52 2017 +0200
atom-1.19.1-1-x86_64
* version bump
* use more system tools
* fix broken git integration
diff --git a/source/xapps-extra/atom/FrugalBuild
b/source/xapps-extra/atom/FrugalBuild
index aa9301a..d507edf 100644
--- a/source/xapps-extra/atom/FrugalBuild
+++ b/source/xapps-extra/atom/FrugalBuild
@@ -3,21 +3,23 @@
# Contributor: darknekros <darknek...@gmail.com>
pkgname=atom
-pkgver=1.19.0
+pkgver=1.19.1
pkgrel=1
pkgdesc="Atom is a hackable text editor for the 21st century from GitHub."
depends=('libgnome-keyring' 'nodejs>=6.3.1-2' 'gconf' 'python' 'git' 'alsa-lib'
'libcups' \
- 'libnotify' 'libxtst' 'nss' 'gtk+2-libs' 'libsecret')
+ 'libnotify' 'libxtst' 'nss' 'gtk+2-libs' 'libsecret' 'ctags' 'apm')
makedepends=('ca-certificates' 'gtk+2' 'cups' 'x11-protos' 'libxkbfile')
groups=('xapps-extra')
archs=('x86_64')
_F_github_tag_v=$pkgver
Finclude github
-sha1sums=('0d933b5f7c3a47b96723823e7a7d905aadf76cf5')
+source+=(dugite-use-system-git.patch symbols-view-use-system-ctags.patch)
+sha1sums=('7a507d75224c8c1ac20fb37de4963b7f417d5056' \
+ '6308610ea0214e790a4f3d8360e8f4eaaa5a231c' \
+ '46e2d16197f14de0bcef451b8b4aef40d9642180')
build() {
export CC=gcc CXX=g++ || Fdie
Fcd
- Fpatchall
## fix desktop file here since they change stuff on each release and the install
## paths point to chroot !?! WTH this..
@@ -27,8 +29,23 @@ build() {
Fsed "path.join('/usr', 'local')" "\"$Fdestdir/usr\""
script/lib/install-application.js
- Fexec ./script/build --build-dir "$Fsrcdir/atom-build" --install|| Fdie
+ export ATOM_RESOURCE_PATH="$Fsrcdir/$_F_cd_path"
+ Fexec apm clean || Fdie
+ Fexec apm install || Fdie
+
+ # Use system ctags
+ Fexec cd node_modules/symbols-view || Fdie
+ Fpatch symbols-view-use-system-ctags.patch
+ Fexec rm -r vendor || Fdie
+ Fexec cd ../.. || Fdie
+ # Use system git
+ Fexec cd node_modules/dugite || Fdie
+ Fpatch dugite-use-system-git.patch
+ Fexec rm -r git || Fdie
+ Fexec cd ../.. || Fdie
+
+ Fexec ./script/build --build-dir "$Fsrcdir/atom-build" --install|| Fdie
## hmm ? -- ok but we need this in hicolor too so themes work -- crazy --
@@ -40,6 +57,10 @@ build() {
Finstallrel 644 "resources/app-icons/stable/png/${i}.png"
"usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
done
+ # Fix apm conflicts
+ Frm usr/bin/apm
+ Frm usr/share/atom/resources/app/apm/
+
}
# optimization OK
diff --git a/source/xapps-extra/atom/dugite-use-system-git.patch
b/source/xapps-extra/atom/dugite-use-system-git.patch
new file mode 100644
index 0000000..696186c
--- /dev/null
+++ b/source/xapps-extra/atom/dugite-use-system-git.patch
@@ -0,0 +1,38 @@
+--- a/build/lib/git-environment.js
++++ b/build/lib/git-environment.js
+@@ -5,14 +5,7 @@
+ * Find the path to the embedded Git environment
+ */
+ function resolveGitDir() {
+- if (process.env.LOCAL_GIT_DIRECTORY) {
+- return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
+- }
+- else {
+- const s = path.sep;
+- return path.resolve(__dirname, '..', '..', 'git')
+- .replace(/[\\\/]app.asar[\\\/]/, `${s}app.asar.unpacked${s}`);
+- }
++ return '/usr';
+ }
+ /**
+ * Find the path to the embedded Git binary
+@@ -33,7 +26,7 @@
+ function resolveGitExecPath() {
+ const gitDir = resolveGitDir();
+ if (process.platform === 'darwin' || process.platform === 'linux') {
+- 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');
+@@ -80,10 +73,6 @@
+ // an arbitrary location, you should set PREFIX for the
+ // process to ensure that it knows how to resolve things
+ env.PREFIX = gitDir;
+- // bypass whatever certificates might be set and use
+- // the bundle included in the distibution
+- const sslCABundle = `${gitDir}/ssl/cacert.pem`;
+- env.GIT_SSL_CAINFO = sslCABundle;
+ }
+ return { env, gitLocation };
+ }
diff --git
a/source/xapps-extra/atom/remove-nodejs-7.x-restriction-since-works-fine-here.patch
b/source/xapps-extra/atom/remove-nodejs-7.x-restriction-since-works-fine-here.patch
deleted file mode 100644
index c5cfb6e..0000000
---
a/source/xapps-extra/atom/remove-nodejs-7.x-restriction-since-works-fine-here.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur atom-1.14.3/script/lib/verify-machine-requirements.js
atom-1.14.3-p/script/lib/verify-machine-requirements.js
---- atom-1.14.3/script/lib/verify-machine-requirements.js 2017-02-17
17:53:06.000000000 +0100
-+++ atom-1.14.3-p/script/lib/verify-machine-requirements.js 2017-02-22
00:26:38.032795147 +0100
-@@ -17,10 +17,8 @@
- function verifyNode () {
- const fullVersion = process.versions.node
- const majorVersion = fullVersion.split('.')[0]
-- if (majorVersion >= 4 && majorVersion < 7) {
-+ if (majorVersion >= 4) {
- console.log(`Node:\tv${fullVersion}`)
-- } else if (majorVersion >= 7) {
-- throw new Error(`Atom does not build properly on node v7+. node
v${fullVersion} is installed.`)
- } else {
- throw new Error(`node v4+ is required to build Atom. node v${fullVersion}
is installed.`)
- }
diff --git a/source/xapps-extra/atom/symbols-view-use-system-ctags.patch
b/source/xapps-extra/atom/symbols-view-use-system-ctags.patch
new file mode 100644
index 0000000..31bff22
--- /dev/null
+++ b/source/xapps-extra/atom/symbols-view-use-system-ctags.patch
@@ -0,0 +1,11 @@
+--- a/lib/tag-generator.js
++++ b/lib/tag-generator.js
+@@ -78,7 +78,7 @@ export default class TagGenerator {
+ generate() {
+ let tags = {};
+ const packageRoot = this.getPackageRoot();
+- const command = path.join(packageRoot, 'vendor',
`ctags-${process.platform}`);
++ const command = 'ctags';
+ const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config');
+ const args = [`--options=${defaultCtagsFile}`, '--fields=+KS'];
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
