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

Nicola Squartini tensor5 at archlinux.org
Thu May 17 13:33:45 UTC 2018


    Date: Thursday, May 17, 2018 @ 13:33:31
  Author: tensor5
Revision: 323784

upgpkg: atom 1.27.0-1

Modified:
  atom/trunk/PKGBUILD
  atom/trunk/dugite-use-system-git.patch
  atom/trunk/fix-license-path.patch
  atom/trunk/fix-restart.patch

-----------------------------+
 PKGBUILD                    |   23 ++++++++++++++++++-----
 dugite-use-system-git.patch |    2 +-
 fix-license-path.patch      |    4 ++--
 fix-restart.patch           |    2 +-
 4 files changed, 22 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-17 13:32:48 UTC (rev 323783)
+++ PKGBUILD	2018-05-17 13:33:31 UTC (rev 323784)
@@ -2,7 +2,7 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.26.1
+pkgver=1.27.0
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
@@ -24,13 +24,13 @@
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('d5c2fab3f671b4162992d0baffb2393bc58e6b361aa37214dcc5c9be1e03c65f'
+sha256sums=('5ce50d67dab8c1cd41579a89890f999dfc0398edd2c341b695e24b50ddc5f742'
             'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
-            'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba'
+            '3fadee5a2d8c1ff35e085f9b9f3cf2eb71627bda9e8b10c2a0bd85b268591bf6'
             'd8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442'
-            'b8377e0132693d5130ccc42d15dce57cef9ad9f3f97aabe421f547977030cbc4'
+            '7f0142c91e24236a3a6dcc70af9d4217f65c5a764091876a916e3bbafa4ed0fa'
             'eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86'
-            'a3b2cb62521600dde5964076d5b0228abd593cdb1f25cd491748b34f99e27107'
+            'f81a8dd53403fe76d80716b65d69bec141fae0b1a9a6ef56314f9e815e48f132'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
             '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b'
             '7719b9c21fa5dad2b4e02ca05592561de8e2046283f421f2dbc9baaa7016d843')
@@ -44,6 +44,19 @@
   patch -Np1 -i "${srcdir}"/fix-license-path.patch
   patch -Np1 -i "${srcdir}"/fix-node8.patch
   patch -Np1 -i "${srcdir}"/fix-restart.patch
+
+  # Workaround for Node 10
+  sed -e 's|"electron-link": "0.2.0"|"electron-link": "../../electron-link"|' \
+      -i script/package.json
+  cd ..
+  git clone https://github.com/atom/electron-link.git
+  cd electron-link
+  git checkout v0.2.0
+  sed -e 's/"leveldown": "^1.6.0"/"leveldown": "^2.0.1"/' -i package.json
+  npm install
+  npx babel src -d lib
+  cd node_modules/levelup
+  sed -e 's/"leveldown": "^1.1.0"/"leveldown": "^2.0.1"/' -i package.json
 }
 
 build() {

Modified: dugite-use-system-git.patch
===================================================================
--- dugite-use-system-git.patch	2018-05-17 13:32:48 UTC (rev 323783)
+++ dugite-use-system-git.patch	2018-05-17 13:33:31 UTC (rev 323784)
@@ -9,7 +9,7 @@
      }
  }
  /**
-@@ -96,9 +96,9 @@
+@@ -100,9 +100,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

Modified: fix-license-path.patch
===================================================================
--- fix-license-path.patch	2018-05-17 13:32:48 UTC (rev 323783)
+++ fix-license-path.patch	2018-05-17 13:33:31 UTC (rev 323784)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -412,7 +412,7 @@
+@@ -414,7 +414,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
-@@ -1105,7 +1105,7 @@
+@@ -1124,7 +1124,7 @@
  
    // Open Atom's license in the active pane.
    openLicense () {

Modified: fix-restart.patch
===================================================================
--- fix-restart.patch	2018-05-17 13:32:48 UTC (rev 323783)
+++ fix-restart.patch	2018-05-17 13:33:31 UTC (rev 323784)
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -1345,7 +1345,7 @@
+@@ -1347,7 +1347,7 @@
    }
  
    restart () {



More information about the arch-commits mailing list