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

Nicola Squartini tensor5 at archlinux.org
Fri Sep 15 17:08:49 UTC 2017


    Date: Friday, September 15, 2017 @ 17:08:48
  Author: tensor5
Revision: 257701

upgpkg: atom 1.20.0-1

Modified:
  atom/trunk/PKGBUILD
  atom/trunk/dugite-use-system-git.patch
  atom/trunk/fix-atom-sh.patch
  atom/trunk/fix-license-path.patch
  atom/trunk/fix-restart.patch
  atom/trunk/symbols-view-use-system-ctags.patch
  atom/trunk/use-system-electron.patch

-------------------------------------+
 PKGBUILD                            |   18 ++++++------
 dugite-use-system-git.patch         |   50 ++++++++++++----------------------
 fix-atom-sh.patch                   |    4 +-
 fix-license-path.patch              |    4 +-
 fix-restart.patch                   |    2 -
 symbols-view-use-system-ctags.patch |    2 -
 use-system-electron.patch           |   30 ++++++++++----------
 7 files changed, 49 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-15 17:05:27 UTC (rev 257700)
+++ PKGBUILD	2017-09-15 17:08:48 UTC (rev 257701)
@@ -2,7 +2,7 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.19.7
+pkgver=1.20.0
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('i686' 'x86_64')
@@ -22,14 +22,14 @@
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('0d0ee1c84f678be3f0a728578d1b0ef3a40ca621d3e682081c8496f35a22d958'
-            '8a6424cf5635634eccbf10473a30a3a3fb2bd11aa73a7274744134115d681ba9'
-            '2148436adf17ec1970adc344fccf3782645375cd93e62a696a55f5b11fe98032'
-            '7a76fe1e7258357b51b7ac427b44759c71c675b0be04dfc547e18dc04979f3fb'
-            '0df623c62de4c2dc78c4a0f5ab5bd018183e287629102a08e85dea92cc076174'
-            '32fb830b89bd6079120bf7380a69f94c02aa366608b0d0b6c7123e06b878400c'
+sha256sums=('a50467f3c000bf3e78d2eb85c7b98a6ddf4f71d1b6b09ccfec3e1d96db2e9d33'
+            'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba'
+            '7f4f86387d226fcd452f0b97579dadc3eac217a77485228dbf4facf3391b6198'
+            '951bbc248c9ae4ef3ef712e0caeb728a8577b12e4593870569de15e570a71c4c'
+            '646f81b0621a86eff3bb1f229eeb92b2f33bac41b3324424a6de06a780a8a22d'
+            '9bed08e8bbb96ecb0063a4603478f5f4ea8409a45dc565b2df00839fd3cd2c85'
             'bb1469f02cef5c1363d9add8eb7af6eab503023d5a56f76dc868b70be1b77e01'
-            'ee5ee7d8ead75dac34ed76267637acfae7f582fb88a96c92c92789a201db6c5f')
+            'f5aa3efafe796bd07b8221746a4fe693dcefbe5861a4e4cf49f7679516422123')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -56,7 +56,7 @@
   rm -r vendor
   cd ../..
 
-  # Use system git
+  # Use system git (TODO: set LOCAL_GIT_DIRECTORY=/usr)
   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	2017-09-15 17:05:27 UTC (rev 257700)
+++ dugite-use-system-git.patch	2017-09-15 17:08:48 UTC (rev 257701)
@@ -1,38 +1,24 @@
 --- a/build/lib/git-environment.js
 +++ b/build/lib/git-environment.js
-@@ -8,14 +8,7 @@
-  *  returns with it after resolving it as a path.
-  */
- 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';
+@@ -18,7 +18,7 @@
+         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
+     }
+     else {
+-        return resolveEmbeddedGitDir();
++        return '/usr';
+     }
  }
  /**
-  *  Find the path to the embedded Git binary.
-@@ -42,7 +35,7 @@
+@@ -96,9 +96,9 @@
+         if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
+             // use the SSL certificate bundle included in the distribution only
+             // when using embedded Git and not providing your own bundle
+-            const distDir = resolveEmbeddedGitDir();
+-            const sslCABundle = `${distDir}/ssl/cacert.pem`;
+-            env.GIT_SSL_CAINFO = sslCABundle;
++            // const distDir = resolveEmbeddedGitDir();
++            // const sslCABundle = `${distDir}/ssl/cacert.pem`;
++            // env.GIT_SSL_CAINFO = sslCABundle;
+         }
      }
-     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');
-@@ -89,10 +82,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 distribution
--        const sslCABundle = `${gitDir}/ssl/cacert.pem`;
--        env.GIT_SSL_CAINFO = sslCABundle;
-     }
      return { env, gitLocation };
- }

Modified: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch	2017-09-15 17:05:27 UTC (rev 257700)
+++ fix-atom-sh.patch	2017-09-15 17:08:48 UTC (rev 257701)
@@ -21,8 +21,8 @@
  export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
  
  while getopts ":wtfvh-:" opt; do
-@@ -54,79 +39,22 @@
-   export ELECTRON_ENABLE_LOGGING=1
+@@ -53,79 +38,22 @@
+   exec 2> /dev/null
  fi
  
 -if [ $OS == 'Mac' ]; then

Modified: fix-license-path.patch
===================================================================
--- fix-license-path.patch	2017-09-15 17:05:27 UTC (rev 257700)
+++ fix-license-path.patch	2017-09-15 17:08:48 UTC (rev 257701)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.coffee
 +++ b/src/main-process/atom-application.coffee
-@@ -264,7 +264,7 @@
+@@ -266,7 +266,7 @@
      @openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
      @openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
      @openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
@@ -11,7 +11,7 @@
        resolveBeforeQuitPromise = null
 --- a/src/workspace.js
 +++ b/src/workspace.js
-@@ -1091,7 +1091,7 @@
+@@ -1101,7 +1101,7 @@
  
    // Open Atom's license in the active pane.
    openLicense () {

Modified: fix-restart.patch
===================================================================
--- fix-restart.patch	2017-09-15 17:05:27 UTC (rev 257700)
+++ fix-restart.patch	2017-09-15 17:08:48 UTC (rev 257701)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.coffee
 +++ b/src/main-process/atom-application.coffee
-@@ -827,7 +827,7 @@
+@@ -829,7 +829,7 @@
        @restart()
  
    restart: ->

Modified: symbols-view-use-system-ctags.patch
===================================================================
--- symbols-view-use-system-ctags.patch	2017-09-15 17:05:27 UTC (rev 257700)
+++ symbols-view-use-system-ctags.patch	2017-09-15 17:08:48 UTC (rev 257701)
@@ -1,6 +1,6 @@
 --- a/lib/tag-generator.js
 +++ b/lib/tag-generator.js
-@@ -78,7 +78,7 @@ export default class TagGenerator {
+@@ -81,7 +81,7 @@ export default class TagGenerator {
    generate() {
      let tags = {};
      const packageRoot = this.getPackageRoot();

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2017-09-15 17:05:27 UTC (rev 257700)
+++ use-system-electron.patch	2017-09-15 17:08:48 UTC (rev 257701)
@@ -6,8 +6,8 @@
    "license": "MIT",
 -  "electronVersion": "1.6.9",
    "dependencies": {
+     "@atom/source-map-support": "^0.3.4",
      "async": "0.2.6",
-     "atom-keymap": "8.1.2",
 --- a/script/build
 +++ b/script/build
 @@ -2,10 +2,6 @@
@@ -21,7 +21,7 @@
  // Needed so we can require src/module-cache.coffee during generateModuleCache
  require('coffee-script/register')
  require('colors')
-@@ -25,7 +21,6 @@
+@@ -26,7 +22,6 @@
    .wrap(yargs.terminalWidth())
    .argv
  
@@ -29,7 +29,7 @@
  const cleanOutputDirectory = require('./lib/clean-output-directory')
  const codeSignOnMac = require('./lib/code-sign-on-mac')
  const codeSignOnWindows = require('./lib/code-sign-on-windows')
-@@ -38,7 +33,6 @@
+@@ -39,7 +34,6 @@
  const generateAPIDocs = require('./lib/generate-api-docs')
  const generateMetadata = require('./lib/generate-metadata')
  const generateModuleCache = require('./lib/generate-module-cache')
@@ -37,18 +37,20 @@
  const installApplication = require('./lib/install-application')
  const packageApplication = require('./lib/package-application')
  const prebuildLessCache = require('./lib/prebuild-less-cache')
-@@ -55,7 +49,6 @@
+@@ -58,7 +52,6 @@
+ let binariesPromise = Promise.resolve()
  
- const CONFIG = require('./config')
- 
--checkChromedriverVersion()
- cleanOutputDirectory()
- copyAssets()
- transpilePackagesWithCustomTranspilerPaths()
-@@ -68,61 +61,3 @@
- generateMetadata()
- generateAPIDocs()
- dumpSymbols()
+ if (!argv.existingBinaries) {
+-  checkChromedriverVersion()
+   cleanOutputDirectory()
+   copyAssets()
+   transpilePackagesWithCustomTranspilerPaths()
+@@ -72,63 +65,3 @@
+   generateAPIDocs()
+   binariesPromise = dumpSymbols()
+ }
+-
+-binariesPromise
 -  .then(packageApplication)
 -  .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath))
 -  .then(packagedAppPath => {



More information about the arch-commits mailing list