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

Nicola Squartini tensor5 at archlinux.org
Sat Jun 23 14:16:04 UTC 2018


    Date: Saturday, June 23, 2018 @ 14:16:04
  Author: tensor5
Revision: 344870

upgpkg: atom 1.28.0-1

Modified:
  atom/trunk/PKGBUILD
  atom/trunk/fix-license-path.patch
  atom/trunk/fix-restart.patch
  atom/trunk/use-system-electron.patch
Deleted:
  atom/trunk/fix-node8.patch

---------------------------+
 PKGBUILD                  |   18 ++++++------------
 fix-license-path.patch    |    2 +-
 fix-node8.patch           |   11 -----------
 fix-restart.patch         |    2 +-
 use-system-electron.patch |   10 ++++++----
 5 files changed, 14 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-23 12:58:50 UTC (rev 344869)
+++ PKGBUILD	2018-06-23 14:16:04 UTC (rev 344870)
@@ -2,8 +2,8 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.27.2
-pkgrel=2
+pkgver=1.28.0
+pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
@@ -19,21 +19,19 @@
         'dugite-use-system-git.patch'
         'fix-atom-sh.patch'
         'fix-license-path.patch'
-        'fix-node8.patch'
         'fix-restart.patch'
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('e99c96326682cd674d3d225c01b706ddd7e5a6b3f4e7cbfcbef1a74d3b977223'
+sha256sums=('8d31c74870b7c0813f14eeae55aa85e13bffdfb33a087ad08f1f5eec319331f4'
             'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
             '866f19de9184287da459b0f9e8b79d0eeb72ba4e6c2a803ba29f74a33976deda'
             'd8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442'
-            '7f0142c91e24236a3a6dcc70af9d4217f65c5a764091876a916e3bbafa4ed0fa'
-            'eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86'
-            'f81a8dd53403fe76d80716b65d69bec141fae0b1a9a6ef56314f9e815e48f132'
+            '0f3fc6c435be47c3de78033544cd23a07c6a059aad94921174f7be0796a8b663'
+            'b9533bd31e9329d63abc5ec87b237761c73d0586485288925ba723fb34b3b933'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
             '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b'
-            '1d0ff39e5bc5c0bfbb08a533bff9fb834a8dbc70d280bf93b5e2649fff181221')
+            '9be3fa4ba23dadefafd8b87f12c30957582e5428f74c623180369de9fb4924bd')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -42,12 +40,8 @@
   patch -Np1 -i "${srcdir}"/use-system-electron.patch
   patch -Np1 -i "${srcdir}"/use-system-apm.patch
   patch -Np1 -i "${srcdir}"/fix-license-path.patch
-  patch -Np1 -i "${srcdir}"/fix-node8.patch
   patch -Np1 -i "${srcdir}"/fix-restart.patch
 
-  # Upstream ea1ff8d45448679390058be185ee0d36f823872e
-  sed -e 's/"archive-view": "0.64.3"/"archive-view": "0.64.6"/' -i package.json
-
   # Workaround for Node 10
   sed -e 's|"electron-link": "0.2.0"|"electron-link": "../../electron-link"|' \
       -i script/package.json

Modified: fix-license-path.patch
===================================================================
--- fix-license-path.patch	2018-06-23 12:58:50 UTC (rev 344869)
+++ fix-license-path.patch	2018-06-23 14:16:04 UTC (rev 344870)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -414,7 +414,7 @@
+@@ -416,7 +416,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')

Deleted: fix-node8.patch
===================================================================
--- fix-node8.patch	2018-06-23 12:58:50 UTC (rev 344869)
+++ fix-node8.patch	2018-06-23 14:16:04 UTC (rev 344870)
@@ -1,11 +0,0 @@
---- a/src/module-cache.coffee
-+++ b/src/module-cache.coffee
-@@ -189,7 +189,7 @@ resolveModulePath = (relativePath, parentModule) ->
-   return unless candidates?
- 
-   for version, resolvedPath of candidates
--    if Module._cache.hasOwnProperty(resolvedPath) or isCorePath(resolvedPath)
-+    if Boolean(Module._cache[resolvedPath]) or isCorePath(resolvedPath)
-       return resolvedPath if satisfies(version, range)
- 
-   return

Modified: fix-restart.patch
===================================================================
--- fix-restart.patch	2018-06-23 12:58:50 UTC (rev 344869)
+++ fix-restart.patch	2018-06-23 14:16:04 UTC (rev 344870)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -1347,7 +1347,7 @@
+@@ -1349,7 +1349,7 @@
    }
  
    restart () {

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2018-06-23 12:58:50 UTC (rev 344869)
+++ use-system-electron.patch	2018-06-23 14:16:04 UTC (rev 344870)
@@ -4,7 +4,7 @@
      "url": "https://github.com/atom/atom/issues"
    },
    "license": "MIT",
--  "electronVersion": "1.7.15",
+-  "electronVersion": "2.0.3",
    "dependencies": {
      "@atom/nsfw": "^1.0.18",
      "@atom/watcher": "1.0.3",
@@ -131,9 +131,9 @@
      "coffeelint": "1.15.7",
      "colors": "1.1.2",
      "donna": "1.0.16",
--    "electron-chromedriver": "~1.7",
+-    "electron-chromedriver": "~2.0",
      "electron-link": "0.2.0",
--    "electron-mksnapshot": "~1.7",
+-    "electron-mksnapshot": "~2.0",
      "electron-packager": "7.3.0",
      "electron-winstaller": "2.6.4",
      "fs-admin": "^0.1.5",
@@ -150,7 +150,7 @@
      }
 --- a/src/main-process/start.js
 +++ b/src/main-process/start.js
-@@ -95,5 +95,5 @@ function handleStartupEventWithSquirrel () {
+@@ -104,7 +104,7 @@ function handleStartupEventWithSquirrel () {
  function setupCompileCache () {
    const CompileCache = require('../compile-cache')
    CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
@@ -157,6 +157,8 @@
 -  CompileCache.install(process.resourcesPath, require)
 +  CompileCache.install('/usr/lib/atom', require)
  }
+ 
+ function getConfig () {
 --- a/src/module-cache.coffee
 +++ b/src/module-cache.coffee
 @@ -195,7 +195,7 @@ resolveModulePath = (relativePath, parentModule) ->



More information about the arch-commits mailing list