Date: Tuesday, October 6, 2020 @ 02:25:32 Author: tensor5 Revision: 719226
upgpkg: atom 1.51.0-2 Ignore symbols-view's default Ctags options (see FS#67651). Modified: atom/trunk/PKGBUILD atom/trunk/symbols-view-use-system-ctags.patch -------------------------------------+ PKGBUILD | 6 +++--- symbols-view-use-system-ctags.patch | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-05 23:54:50 UTC (rev 719225) +++ PKGBUILD 2020-10-06 02:25:32 UTC (rev 719226) @@ -3,7 +3,7 @@ pkgname=atom pkgver=1.51.0 _commit=6d6f204fd7235efc22f2e8dcbbc32dd7fc94a8d2 -pkgrel=1 +pkgrel=2 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') url='https://github.com/atom/atom' @@ -35,7 +35,7 @@ 'e321fdfe880cd465918dd1dbb90e4c7d46fc5310f20666eddf0a41cbca4f8ac8' '40d783794d62f12f3c429c624a84265871c7ed95f4120c9db800348896dd5437' 'a09439c2a908ca174ff3be1f0d85071d12c792ae19748e36fe601e372d6d925b' - '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' + 'c93cc88dd704388d4b26a0de0a5938df7ff90cedf8eed0b3b8a675f9cc7d487c' '8d48dca4571136375b325f4bf94ccfb996e90e57b7fdf83d53c1eb2e69b3b0d4' '8ae032ebbec7b81e7f82c09aaf3fa0ed31a70b7d1265a2b9dec1fd61b05fca1e') @@ -62,7 +62,7 @@ # Use system ctags cd node_modules/symbols-view patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch - rm -r vendor + rm -r lib/ctags-config vendor cd ../.. # Use system git Modified: symbols-view-use-system-ctags.patch =================================================================== --- symbols-view-use-system-ctags.patch 2020-10-05 23:54:50 UTC (rev 719225) +++ symbols-view-use-system-ctags.patch 2020-10-06 02:25:32 UTC (rev 719226) @@ -1,11 +1,14 @@ --- a/lib/tag-generator.js +++ b/lib/tag-generator.js -@@ -79,7 +79,7 @@ export default class TagGenerator { +@@ -79,9 +79,8 @@ generate() { let tags = {}; const packageRoot = this.getPackageRoot(); - const command = path.join(packageRoot, 'vendor', `ctags-${process.platform}`); +- const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config'); +- const args = [`--options=${defaultCtagsFile}`, '--fields=+KS']; + const command = 'ctags'; - const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config'); - const args = [`--options=${defaultCtagsFile}`, '--fields=+KS']; ++ const args = ['--fields=+KS']; + if (atom.config.get('symbols-view.useEditorGrammarAsCtagsLanguage')) { + const language = this.getLanguage();