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

Nicola Squartini tensor5 at archlinux.org
Fri Feb 10 11:19:53 UTC 2017


    Date: Friday, February 10, 2017 @ 11:19:52
  Author: tensor5
Revision: 211731

upgpkg: atom 1.14.1-1

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

-------------------------------------+
 PKGBUILD                            |   12 +++++-----
 fix-atom-sh.patch                   |   37 ++++++++++++++++++++-----------
 fix-restart.patch                   |    4 +--
 symbols-view-use-system-ctags.patch |   20 ++++++++---------
 use-system-electron.patch           |   40 +++++++++++++++++++++++-----------
 5 files changed, 70 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-10 10:59:15 UTC (rev 211730)
+++ PKGBUILD	2017-02-10 11:19:52 UTC (rev 211731)
@@ -2,7 +2,7 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.13.1
+pkgver=1.14.1
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('i686' 'x86_64')
@@ -21,14 +21,14 @@
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('4293bdde0ae4c6a78ebcbd46c797653db5b9e3075a82e3960ea9c7ed647e1233'
-            '73efe3485c9f009b788afdfa688a93a1db15ab0010203c833940406cb852240e'
+sha256sums=('1d4d180f31989473e4b408eaed115d420fa157c0c8c771ea943860be03afa671'
+            '2148436adf17ec1970adc344fccf3782645375cd93e62a696a55f5b11fe98032'
             'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2'
             '7f56269c3b0679dc6ec118e27348e238ce492d4c766cb3813708c981a0692fa1'
-            'e85051d4f435791c4bd898958304c3ee082d434228a68246a65d43479684c8cb'
-            'a5a2b1fefa29799b3225c4aa3fe0e5b057b2b320f98ad7bc28d3596923e52b41'
+            '99a4a93c42c357fa1a913bc8b2e5db0178e1a1030916ec768a3a37709ad81c97'
+            '6edb3c1ba5f32e9ec4b5743911e69212af498aa4e64d7be96579dcb40ebc6204'
             '822e1629ff754af3225bc3c1c9301b4459a67c79e016fd57cc122644d571e24b'
-            '68430695ef866e87d2ae469e0677d3cd5256fe2dba58f750046aa8ec674c67ab')
+            '76f3173142d69182de7251c8b2f503347489b9584abcd89d966b93fb0ebb0eb7')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch	2017-02-10 10:59:15 UTC (rev 211730)
+++ fix-atom-sh.patch	2017-02-10 11:19:52 UTC (rev 211731)
@@ -21,40 +21,48 @@
  export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
  
  while getopts ":wtfvh-:" opt; do
-@@ -54,68 +39,22 @@
+@@ -54,79 +39,22 @@
    export ELECTRON_ENABLE_LOGGING=1
  fi
  
 -if [ $OS == 'Mac' ]; then
+-  if [ -L "$0" ]; then
+-    SCRIPT="$(readlink "$0")"
+-  else
+-    SCRIPT="$0"
+-  fi
+-  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
+-  if [ "$ATOM_APP" == . ]; then
+-    unset ATOM_APP
+-  else
+-    ATOM_PATH="$(dirname "$ATOM_APP")"
+-    ATOM_APP_NAME="$(basename "$ATOM_APP")"
+-  fi
+-
 -  if [ -n "$BETA_VERSION" ]; then
--    ATOM_APP_NAME="Atom Beta.app"
 -    ATOM_EXECUTABLE_NAME="Atom Beta"
 -  else
--    ATOM_APP_NAME="Atom.app"
 -    ATOM_EXECUTABLE_NAME="Atom"
 -  fi
-+ATOM_PATH="electron --app=/usr/lib/atom"
- 
+-
 -  if [ -z "${ATOM_PATH}" ]; then
--    # If ATOM_PATH isnt set, check /Applications and then ~/Applications for Atom.app
+-    # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
 -    if [ -x "/Applications/$ATOM_APP_NAME" ]; then
 -      ATOM_PATH="/Applications"
 -    elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
 -      ATOM_PATH="$HOME/Applications"
 -    else
--      # We havent found an Atom.app, use spotlight to search for Atom
+-      # We haven't found an Atom.app, use spotlight to search for Atom
 -      ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
 -
 -      # Exit if Atom can't be found
 -      if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
--        echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app."
+-        echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
 -        exit 1
 -      fi
 -    fi
 -  fi
-+ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-+mkdir -p "$ATOM_HOME"
- 
+-
 -  if [ $EXPECT_OUTPUT ]; then
 -    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
 -    exit $?
@@ -75,9 +83,12 @@
 -  mkdir -p "$ATOM_HOME"
 -
 -  : ${TMPDIR:=/tmp}
--
++ATOM_PATH="electron --app=/usr/lib/atom"
+ 
 -  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
--
++ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
++mkdir -p "$ATOM_HOME"
+ 
 -  if [ $EXPECT_OUTPUT ]; then
 -    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
 +if [ $EXPECT_OUTPUT ]; then

Modified: fix-restart.patch
===================================================================
--- fix-restart.patch	2017-02-10 10:59:15 UTC (rev 211730)
+++ fix-restart.patch	2017-02-10 11:19:52 UTC (rev 211731)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.coffee
 +++ b/src/main-process/atom-application.coffee
-@@ -794,7 +794,7 @@
+@@ -797,7 +797,7 @@
        @restart()
  
    restart: ->
@@ -7,5 +7,5 @@
 -    args = []
 +    args = ["--app=/usr/lib/atom"]
      args.push("--safe") if @safeMode
-     args.push("--portable") if @setPortable
      args.push("--log-file=#{@logFile}") if @logFile?
+     args.push("--socket-path=#{@socketPath}") if @socketPath?

Modified: symbols-view-use-system-ctags.patch
===================================================================
--- symbols-view-use-system-ctags.patch	2017-02-10 10:59:15 UTC (rev 211730)
+++ symbols-view-use-system-ctags.patch	2017-02-10 11:19:52 UTC (rev 211731)
@@ -1,11 +1,11 @@
---- a/lib/tag-generator.coffee
-+++ b/lib/tag-generator.coffee
-@@ -56,7 +56,7 @@ class TagGenerator
-   generate: ->
-     tags = {}
-     packageRoot = @getPackageRoot()
--    command = path.join(packageRoot, 'vendor', "ctags-#{process.platform}")
-+    command = 'ctags'
-     defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config')
-     args = ["--options=#{defaultCtagsFile}", '--fields=+KS']
+--- a/lib/tag-generator.js
++++ b/lib/tag-generator.js
+@@ -72,7 +72,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'];
  

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2017-02-10 10:59:15 UTC (rev 211730)
+++ use-system-electron.patch	2017-02-10 11:19:52 UTC (rev 211731)
@@ -7,7 +7,7 @@
 -  "electronVersion": "1.3.13",
    "dependencies": {
      "async": "0.2.6",
-     "atom-keymap": "7.1.3-9",
+     "atom-keymap": "7.1.18",
 --- a/script/build
 +++ b/script/build
 @@ -2,10 +2,6 @@
@@ -21,19 +21,25 @@
  // Needed so we can require src/module-cache.coffee during generateModuleCache
  require('coffee-script/register')
  require('colors')
-@@ -30,7 +26,6 @@
- const createDebianPackage = require('./lib/create-debian-package')
- const createRpmPackage = require('./lib/create-rpm-package')
- const createWindowsInstaller = require('./lib/create-windows-installer')
--const downloadChromedriver = require('./lib/download-chromedriver')
- const dumpSymbols = require('./lib/dump-symbols')
- const generateAPIDocs = require('./lib/generate-api-docs')
- const generateMetadata = require('./lib/generate-metadata')
-@@ -58,48 +53,4 @@
- prebuildLessCache()
+@@ -23,7 +19,6 @@
+   .wrap(yargs.terminalWidth())
+   .argv
+ 
+-const checkChromedriverVersion = require('./lib/check-chromedriver-version')
+ const cleanOutputDirectory = require('./lib/clean-output-directory')
+ const codeSignOnMac = require('./lib/code-sign-on-mac')
+ const compressArtifacts = require('./lib/compress-artifacts')
+@@ -48,7 +43,6 @@
+   process.exit(1)
+ })
+ 
+-checkChromedriverVersion()
+ cleanOutputDirectory()
+ copyAssets()
+ transpileBabelPaths()
+@@ -60,46 +54,3 @@
  generateMetadata()
  generateAPIDocs()
--downloadChromedriver()
  dumpSymbols()
 -  .then(packageApplication)
 -  .then(packagedAppPath => {
@@ -78,6 +84,16 @@
 -      console.log('Skipping installation. Specify the --install option to install Atom'.gray)
 -    }
 -  })
+--- a/script/package.json
++++ b/script/package.json
+@@ -8,7 +8,6 @@
+     "colors": "1.1.2",
+     "csslint": "1.0.2",
+     "donna": "1.0.13",
+-    "electron-chromedriver": "~1.3",
+     "electron-packager": "7.3.0",
+     "electron-winstaller": "2.5.1",
+     "fs-extra": "0.30.0",
 --- a/src/module-cache.coffee
 +++ b/src/module-cache.coffee
 @@ -194,7 +194,7 @@



More information about the arch-commits mailing list