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

Nicola Squartini tensor5 at archlinux.org
Sat Jun 15 04:17:39 UTC 2019


    Date: Saturday, June 15, 2019 @ 04:17:39
  Author: tensor5
Revision: 481596

upgpkg: atom 1.38.1-1

Modified:
  atom/trunk/PKGBUILD
  atom/trunk/fix-atom-sh.patch
  atom/trunk/fix-license-path.patch
  atom/trunk/fix-restart.patch
  atom/trunk/no-unsafe-eval-warning.patch
  atom/trunk/node-env-production.patch
  atom/trunk/use-system-electron.patch
Deleted:
  atom/trunk/buffer.patch
  atom/trunk/fix-fuzzy-native-path.patch

------------------------------+
 PKGBUILD                     |   31 ++++++++++---------------------
 buffer.patch                 |   22 ----------------------
 fix-atom-sh.patch            |    8 ++++----
 fix-fuzzy-native-path.patch  |   20 --------------------
 fix-license-path.patch       |    4 ++--
 fix-restart.patch            |    2 +-
 no-unsafe-eval-warning.patch |    8 ++++----
 node-env-production.patch    |    2 +-
 use-system-electron.patch    |   18 +++++++++---------
 9 files changed, 31 insertions(+), 84 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-15 02:22:58 UTC (rev 481595)
+++ PKGBUILD	2019-06-15 04:17:39 UTC (rev 481596)
@@ -1,8 +1,8 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.37.0
-pkgrel=3
+pkgver=1.38.1
+pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
@@ -15,39 +15,33 @@
 options=(!emptydirs)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
         'atom.js'
-        'buffer.patch'
         'dugite-use-system-git.patch'
         'electron-3.patch'
         'fix-atom-sh.patch'
-        'fix-fuzzy-native-path.patch'
         'fix-license-path.patch'
         'fix-restart.patch'
+        'no-unsafe-eval-warning.patch'
         'node-env-production.patch'
-        'no-unsafe-eval-warning.patch'
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('52b498d3a0e2d524d6b74738a21e7ab2f5ef899e4fcc251a8ccbd4796a3d6c21'
+sha256sums=('474932b9915308ed4b024e2d1cf061ffb0c0740702915771d192a9b3544eb397'
             'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
-            '971e4575884a0d1bf4683b5c6402a3d6059e41345cc09db83df5a0a30ad41bb6'
             '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
             '75a672adc0237ea8c93ff67d8296eb73b87792b7b58cdaef7bf596fb6edd073f'
-            '3ce4f665a1e3484bb408a665500a8f99d8afb5e3cd9d70374c5f9f4a37176e42'
-            'c8257e5330047348f81412067af8ff745ba9477a1189a095f7c633632c2875d6'
-            'a83101948752153d0f357798b9651a5262232ec3dce5f4eb5cc136a5e0b6f929'
-            '2219fed30a0aca7dbed3b5f4781be23aecf965c42e5fcec0b34c9611bad11ae0'
-            '9073d3947f11e21788f0931021e4f41d01e3651cc99f2b3320626f478e26c491'
-            '78941a3415c18e1b8cb6ea5f20f5afe9b35e09ad155ecda02beb114b979b14b4'
+            'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
+            'f41cfc85b23fae85d5aef7bf2201b8c8d7d26b01ae825b0deaf6dbaf3e16b0f9'
+            '5a52859d5ceaa6f9d26fa657d6d728dee6e24684914cfc1d5736ccd9793fb86a'
+            'bb474831629575636b1129e9f5e64c72a62926757b4b85f0c51b47b91fffd6ae'
+            '85612ba035047b8599692ce458b903ef2204995e102b3ff47dc05923d6c2e7d8'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
             '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806'
-            '0d6c12bdbe1cfae67df0b4c8948068277aa68b1c490f39d9a03fde53fd6ecd3f')
+            '4ff7d60aacad1618015532ba2fec60d519213a8c6acaa370e0ccbc02718362b3')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}"/buffer.patch
   patch -Np1 -i "${srcdir}"/fix-atom-sh.patch
-  patch -Np1 -i "${srcdir}"/fix-fuzzy-native-path.patch
   patch -Np1 -i "${srcdir}"/use-system-electron.patch
   patch -Np1 -i "${srcdir}"/use-system-apm.patch
   patch -Np1 -i "${srcdir}"/fix-license-path.patch
@@ -62,11 +56,6 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix for Electron 3
-  npm install --package-lock-only @atom/nsfw at 1.0.20 node-abi
-
-  rm package-lock.json
-
   ATOM_RESOURCE_PATH="${PWD}" \
   npm_config_build_from_source=true \
   npm_config_target=$(< /usr/lib/electron/version) \

Deleted: buffer.patch
===================================================================
--- buffer.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ buffer.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -1,22 +0,0 @@
---- a/src/file-system-blob-store.js
-+++ b/src/file-system-blob-store.js
-@@ -20,7 +20,7 @@
- 
-   reset () {
-     this.inMemoryBlobs = new Map()
--    this.storedBlob = new Buffer(0)
-+    this.storedBlob = Buffer.alloc(0)
-     this.storedBlobMap = {}
-     this.usedKeys = new Set()
-   }
---- a/src/compile-cache.js
-+++ b/src/compile-cache.js
-@@ -177,7 +177,7 @@
-       var rawData = sourceMappingURL.slice(sourceMappingURL.indexOf(',') + 1)
- 
-       try {
--        var sourceMap = JSON.parse(new Buffer(rawData, 'base64'))
-+        var sourceMap = JSON.parse(Buffer.from(rawData, 'base64'))
-       } catch (error) {
-         console.warn('Error parsing source map', error.stack)
-         return null

Modified: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ fix-atom-sh.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -27,10 +27,10 @@
 -    ;;
 -esac
 -
- export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
- 
- ATOM_ADD=false
-@@ -86,105 +62,24 @@
+ # Only set the ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT env var if it hasn't been set.
+ if [ -z "$ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT" ]
+ then
+@@ -90,105 +66,24 @@
  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
  mkdir -p "$ATOM_HOME"
  

Deleted: fix-fuzzy-native-path.patch
===================================================================
--- fix-fuzzy-native-path.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ fix-fuzzy-native-path.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -1,20 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -63,7 +63,7 @@
-     "fs-plus": "^3.0.1",
-     "fstream": "0.1.24",
-     "fuzzaldrin": "^2.1",
--    "fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.13.1/tarball",
-+    "fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.13.4/tarball",
-     "git-diff": "file:packages/git-diff",
-     "git-utils": "5.5.0",
-     "github": "https://www.atom.io/api/packages/github/versions/0.28.1/tarball",
-@@ -202,7 +202,7 @@
-     "encoding-selector": "0.23.9",
-     "exception-reporting": "file:./packages/exception-reporting",
-     "find-and-replace": "0.218.9",
--    "fuzzy-finder": "1.13.1",
-+    "fuzzy-finder": "1.13.4",
-     "github": "0.28.1",
-     "git-diff": "file:./packages/git-diff",
-     "go-to-line": "file:./packages/go-to-line",

Modified: fix-license-path.patch
===================================================================
--- fix-license-path.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ fix-license-path.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -572,7 +572,7 @@
+@@ -596,7 +596,7 @@
      this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
      this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
      this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
@@ -11,7 +11,7 @@
        for (let window of this.getAllWindows()) {
 --- a/src/workspace.js
 +++ b/src/workspace.js
-@@ -1132,7 +1132,7 @@
+@@ -1138,7 +1138,7 @@
  
    // Open Atom's license in the active pane.
    openLicense () {

Modified: fix-restart.patch
===================================================================
--- fix-restart.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ fix-restart.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -1625,7 +1625,7 @@
+@@ -1656,7 +1656,7 @@
    }
  
    restart () {

Modified: no-unsafe-eval-warning.patch
===================================================================
--- no-unsafe-eval-warning.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ no-unsafe-eval-warning.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -1,11 +1,11 @@
 --- a/static/index.js
 +++ b/static/index.js
-@@ -11,6 +11,8 @@
+@@ -16,6 +16,8 @@
    let blobStore = null
    let useSnapshot = false
  
 +  process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true
 +
-   window.onload = function () {
-     try {
-       const startTime = Date.now()
+   const startupMarkers = electron.remote.getCurrentWindow().startupMarkers
+ 
+   if (startupMarkers) {

Modified: node-env-production.patch
===================================================================
--- node-env-production.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ node-env-production.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -1,6 +1,6 @@
 --- a/static/index.js
 +++ b/static/index.js
-@@ -53,6 +55,10 @@
+@@ -66,6 +66,10 @@
          snapshotResult.setGlobals(global, process, window, document, console, require)
        }
  

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2019-06-15 02:22:58 UTC (rev 481595)
+++ use-system-electron.patch	2019-06-15 04:17:39 UTC (rev 481596)
@@ -6,7 +6,7 @@
    "license": "MIT",
 -  "electronVersion": "2.0.18",
    "dependencies": {
-     "@atom/nsfw": "1.0.18",
+     "@atom/nsfw": "1.0.22",
      "@atom/source-map-support": "^0.3.4",
 --- a/script/build
 +++ b/script/build
@@ -102,7 +102,7 @@
  }
 --- a/script/lib/generate-startup-snapshot.js
 +++ b/script/lib/generate-startup-snapshot.js
-@@ -90,7 +90,7 @@
+@@ -97,7 +97,7 @@
      } else if (process.platform === 'win32') {
        nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe')
      } else {
@@ -111,7 +111,7 @@
      }
      childProcess.execFileSync(
        nodeBundledInElectronPath,
-@@ -98,6 +98,7 @@
+@@ -105,6 +105,7 @@
        {env: Object.assign({}, process.env, {ELECTRON_RUN_AS_NODE: 1})}
      )
  
@@ -119,7 +119,7 @@
      const generatedStartupBlobPath = path.join(CONFIG.buildOutputPath, 'snapshot_blob.bin')
      console.log(`Generating startup blob at "${generatedStartupBlobPath}"`)
      childProcess.execFileSync(
-@@ -115,5 +116,6 @@
+@@ -122,5 +123,6 @@
      console.log(`Moving generated startup blob into "${startupBlobDestinationPath}"`)
      fs.unlinkSync(startupBlobDestinationPath)
      fs.renameSync(generatedStartupBlobPath, startupBlobDestinationPath)
@@ -133,11 +133,11 @@
      "colors": "1.1.2",
      "donna": "1.0.16",
 -    "electron-chromedriver": "~2.0",
-     "electron-link": "0.3.3",
+     "electron-link": "0.4.0",
 -    "electron-mksnapshot": "~2.0",
      "electron-packager": "7.3.0",
      "electron-winstaller": "2.6.4",
-     "fs-admin": "^0.1.5",
+     "eslint-config-standard": "^12.0.0",
 --- a/src/compile-cache.js
 +++ b/src/compile-cache.js
 @@ -122,7 +122,7 @@ exports.install = function (resourcesPath, nodeRequire) {
@@ -178,7 +178,7 @@
        }
 --- a/src/main-process/atom-window.js
 +++ b/src/main-process/atom-window.js
-@@ -40,7 +40,8 @@
+@@ -43,7 +43,8 @@
          // Disable the `auxclick` feature so that `click` events are triggered in
          // response to a middle-click.
          // (Ref: https://github.com/atom/atom/pull/12696#issuecomment-290496960)
@@ -223,7 +223,7 @@
    global.attachEvent = function () {}
 --- a/static/index.js
 +++ b/static/index.js
-@@ -23,7 +23,7 @@
+@@ -36,7 +36,7 @@
        process.resourcesPath = path.normalize(process.resourcesPath)
  
        setupAtomHome()
@@ -232,7 +232,7 @@
        useSnapshot = !devMode && typeof snapshotResult !== 'undefined'
  
        if (devMode) {
-@@ -90,7 +90,7 @@
+@@ -107,7 +107,7 @@
    function setupWindow () {
      const CompileCache = useSnapshot ? snapshotResult.customRequire('../src/compile-cache.js') : require('../src/compile-cache')
      CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)


More information about the arch-commits mailing list