[arch-commits] Commit in atom/trunk (5 files)
Nicola Squartini
tensor5 at archlinux.org
Sat Sep 28 10:42:54 UTC 2019
Date: Saturday, September 28, 2019 @ 10:42:53
Author: tensor5
Revision: 511962
upgpkg: atom 1.40.1-1
Added:
atom/trunk/git-utils.patch
Modified:
atom/trunk/PKGBUILD
atom/trunk/no-unsafe-eval-warning.patch
atom/trunk/node-env-production.patch
atom/trunk/use-system-electron.patch
------------------------------+
PKGBUILD | 36 +++++++++++++++++++++++++++++-------
git-utils.patch | 11 +++++++++++
no-unsafe-eval-warning.patch | 2 +-
node-env-production.patch | 2 +-
use-system-electron.patch | 25 ++++++++++++++-----------
5 files changed, 56 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-28 08:07:47 UTC (rev 511961)
+++ PKGBUILD 2019-09-28 10:42:53 UTC (rev 511962)
@@ -1,7 +1,7 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
pkgname=atom
-pkgver=1.39.1
+pkgver=1.40.1
pkgrel=1
pkgdesc='A hackable text editor for the 21st Century'
arch=('x86_64')
@@ -19,22 +19,24 @@
'fix-atom-sh.patch'
'fix-license-path.patch'
'fix-restart.patch'
+ 'git-utils.patch'
'no-unsafe-eval-warning.patch'
'node-env-production.patch'
'symbols-view-use-system-ctags.patch'
'use-system-apm.patch'
'use-system-electron.patch')
-sha256sums=('5ed505b8d917d639c67b35d232867f456f7734a19a52867d3b8ddcb9ab89331d'
+sha256sums=('7ec4b3fd35d3dcb4df90911726144ca5d05335ee9c0f093f2c29fa22fbe3527a'
'd286e0766e47cfea73cd207abb9d6f7375846688823e72732c871a852b4b261d'
'530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
'2894cce31935d45291c5fe4c625473bb83fc51e1b899f162aa6b419491c7ace1'
'e3c30c03006d23a72f07fa77f4309b16a6059af1179343033a87f74f50124076'
- '7015f16485bb63b53b306357faa39fc2d8b9c9920ce631e15cc559475ea8572b'
- '27aa7e032e45728d4012a1c8de05a1f7146882bdd28cae4bcbe096fc38ba5255'
+ 'e321fdfe880cd465918dd1dbb90e4c7d46fc5310f20666eddf0a41cbca4f8ac8'
+ '40d783794d62f12f3c429c624a84265871c7ed95f4120c9db800348896dd5437'
+ 'a09439c2a908ca174ff3be1f0d85071d12c792ae19748e36fe601e372d6d925b'
'3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
'8d48dca4571136375b325f4bf94ccfb996e90e57b7fdf83d53c1eb2e69b3b0d4'
- 'ccfb472a8b09d6c3297f3c5755906c1498b6a88da88d1d356e5ff8f54dbe5355')
+ '79c01868ec489a43125047c86f3d5fae6d102f9d8338479590107116cf15b578')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -68,10 +70,30 @@
rm -r git
cd ../..
+ # Fix issue with:
+ # build/Release/git.node: undefined symbol: git_net_url_is_default_port
+ cd node_modules/git-utils
+ patch -Np1 -i "${srcdir}"/git-utils.patch
+ env \
+ npm_config_disturl=https://electronjs.org/headers \
+ npm_config_runtime=electron \
+ npm_config_target=$(< /usr/lib/electron4/version) \
+ node-gyp rebuild
+ cd ../..
+
cd script
- npm install
+ # Hack to avoid using Node 12
+ env \
+ npm_config_disturl=https://electronjs.org/headers \
+ npm_config_runtime=electron \
+ npm_config_target=$(< /usr/lib/electron4/version) \
+ npm install
# Set ELECTRON_VERSION (see use-system-electron.patch)
- env ELECTRON_VERSION=$(< /usr/lib/electron4/version) ./build --no-bootstrap
+ env \
+ ELECTRON_RUN_AS_NODE=1 \
+ ELECTRON_VERSION=$(< /usr/lib/electron4/version) \
+ electron4 \
+ build --no-bootstrap
}
package() {
Added: git-utils.patch
===================================================================
--- git-utils.patch (rev 0)
+++ git-utils.patch 2019-09-28 10:42:53 UTC (rev 511962)
@@ -0,0 +1,11 @@
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -162,6 +162,8 @@
+ 'deps/libgit2/src/message.h',
+ 'deps/libgit2/src/mwindow.c',
+ 'deps/libgit2/src/mwindow.h',
++ 'deps/libgit2/src/net.c',
++ 'deps/libgit2/src/net.h',
+ 'deps/libgit2/src/netops.c',
+ 'deps/libgit2/src/netops.h',
+ 'deps/libgit2/src/notes.c',
Modified: no-unsafe-eval-warning.patch
===================================================================
--- no-unsafe-eval-warning.patch 2019-09-28 08:07:47 UTC (rev 511961)
+++ no-unsafe-eval-warning.patch 2019-09-28 10:42:53 UTC (rev 511962)
@@ -1,6 +1,6 @@
--- a/static/index.js
+++ b/static/index.js
-@@ -12,6 +12,8 @@
+@@ -13,6 +13,8 @@
let blobStore = null;
let useSnapshot = false;
Modified: node-env-production.patch
===================================================================
--- node-env-production.patch 2019-09-28 08:07:47 UTC (rev 511961)
+++ node-env-production.patch 2019-09-28 10:42:53 UTC (rev 511962)
@@ -1,6 +1,6 @@
--- a/static/index.js
+++ b/static/index.js
-@@ -84,6 +84,10 @@
+@@ -85,6 +85,10 @@
);
}
Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch 2019-09-28 08:07:47 UTC (rev 511961)
+++ use-system-electron.patch 2019-09-28 10:42:53 UTC (rev 511962)
@@ -58,9 +58,9 @@
- }
-
- if (argv.codeSign) {
-- const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ]
+- const executablesToSign = [ path.join(packagedAppPath, CONFIG.executableName) ]
- if (argv.createWindowsInstaller) {
-- executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe'))
+- executablesToSign.push(path.join(__dirname, 'node_modules', '@atom', 'electron-winstaller', 'vendor', 'Squirrel.exe'))
- }
- codeSignOnWindows(executablesToSign)
- } else {
@@ -110,11 +110,14 @@
}
--- a/script/lib/generate-startup-snapshot.js
+++ b/script/lib/generate-startup-snapshot.js
-@@ -268,14 +268,14 @@
- } else if (process.platform === 'win32') {
- nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe');
+@@ -265,17 +265,14 @@
+ CONFIG.executableName
+ );
} else {
-- nodeBundledInElectronPath = path.join(packagedAppPath, 'atom');
+- nodeBundledInElectronPath = path.join(
+- packagedAppPath,
+- CONFIG.executableName
+- );
+ nodeBundledInElectronPath = 'electron4';
}
childProcess.execFileSync(
@@ -127,7 +130,7 @@
console.log('Generating startup blob with mksnapshot');
childProcess.spawnSync(process.execPath, [
path.join(
-@@ -317,5 +317,6 @@
+@@ -317,5 +314,6 @@
destinationPath
);
}
@@ -144,7 +147,7 @@
"electron-link": "0.4.0",
- "electron-mksnapshot": "^3.1.10",
"electron-packager": "12.2.0",
- "electron-winstaller": "2.6.4",
+ "@atom/electron-winstaller": "0.0.1",
"eslint": "^5.16.0",
--- a/src/compile-cache.js
+++ b/src/compile-cache.js
@@ -159,7 +162,7 @@
}
--- a/src/main-process/atom-window.js
+++ b/src/main-process/atom-window.js
-@@ -46,7 +46,8 @@
+@@ -47,7 +47,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)
@@ -204,7 +207,7 @@
global.attachEvent = function() {};
--- a/static/index.js
+++ b/static/index.js
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
const devMode =
getWindowLoadSettings().devMode ||
!getWindowLoadSettings().resourcePath.startsWith(
@@ -213,7 +216,7 @@
);
useSnapshot = !devMode && typeof snapshotResult !== 'undefined';
-@@ -133,7 +133,7 @@
+@@ -134,7 +134,7 @@
? snapshotResult.customRequire('../src/compile-cache.js')
: require('../src/compile-cache');
CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME);
More information about the arch-commits
mailing list