Date: Thursday, August 31, 2017 @ 09:54:08 Author: tensor5 Revision: 255166
upgpkg: atom 1.19.4-1 Modified: atom/trunk/PKGBUILD atom/trunk/dugite-use-system-git.patch atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-apm.patch atom/trunk/use-system-electron.patch Deleted: atom/trunk/fix-ime-events-handler.patch ------------------------------+ PKGBUILD | 21 ++++------- dugite-use-system-git.patch | 14 +++---- fix-ime-events-handler.patch | 47 ------------------------- fix-license-path.patch | 2 - fix-restart.patch | 2 - use-system-apm.patch | 4 +- use-system-electron.patch | 75 ++++++++++++++++++++++------------------- 7 files changed, 61 insertions(+), 104 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-08-31 09:03:58 UTC (rev 255165) +++ PKGBUILD 2017-08-31 09:54:08 UTC (rev 255166) @@ -2,8 +2,8 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=atom -pkgver=1.18.0 -pkgrel=2 +pkgver=1.19.4 +pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('i686' 'x86_64') url='https://github.com/atom/atom' @@ -17,21 +17,19 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"; 'dugite-use-system-git.patch' 'fix-atom-sh.patch' - 'fix-ime-events-handler.patch' 'fix-license-path.patch' 'fix-restart.patch' 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('bd2dd1423ac204b1d6b117dcbab405095a7f663b97d07519b0de4300158645b1' - '465c90539cf4160cf05af36c8a3a88c16ae4e045c4d88ee56930a675d1074a2c' +sha256sums=('4be1f9095a237bfc81137002dd1a968e8484261c73845dab4e41e4f3e39f695d' + '8a6424cf5635634eccbf10473a30a3a3fb2bd11aa73a7274744134115d681ba9' '2148436adf17ec1970adc344fccf3782645375cd93e62a696a55f5b11fe98032' - 'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2' - '0d1e2d6be438bc7cb7633b6b462d1011a587d6f764d0abf7805895f3d8900228' - 'c55d0837aef4aaeb2a4a317e9916e76bac34be19a5371b538843046d9ad85826' + '7a76fe1e7258357b51b7ac427b44759c71c675b0be04dfc547e18dc04979f3fb' + '0df623c62de4c2dc78c4a0f5ab5bd018183e287629102a08e85dea92cc076174' '32fb830b89bd6079120bf7380a69f94c02aa366608b0d0b6c7123e06b878400c' - '310cfa5088908312abded7a2a28b8c53a4d7d38ec05c9623be3fa89d311b0a09' - '5b39644daff87980899908c0c2c10b97319291c89f332dea15f9b259f42a8b17') + 'bb1469f02cef5c1363d9add8eb7af6eab503023d5a56f76dc868b70be1b77e01' + 'ee5ee7d8ead75dac34ed76267637acfae7f582fb88a96c92c92789a201db6c5f') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -41,9 +39,6 @@ patch -Np1 -i "${srcdir}"/use-system-apm.patch patch -Np1 -i "${srcdir}"/fix-license-path.patch patch -Np1 -i "${srcdir}"/fix-restart.patch - - # Fix for Electron 1.4.0 - patch -Np1 -i "${srcdir}"/fix-ime-events-handler.patch } build() { Modified: dugite-use-system-git.patch =================================================================== --- dugite-use-system-git.patch 2017-08-31 09:03:58 UTC (rev 255165) +++ dugite-use-system-git.patch 2017-08-31 09:54:08 UTC (rev 255166) @@ -1,7 +1,7 @@ --- a/build/lib/git-environment.js +++ b/build/lib/git-environment.js -@@ -5,14 +5,7 @@ - * Find the path to the embedded Git environment +@@ -8,14 +8,7 @@ + * returns with it after resolving it as a path. */ function resolveGitDir() { - if (process.env.LOCAL_GIT_DIRECTORY) { @@ -15,9 +15,9 @@ + return '/usr'; } /** - * Find the path to the embedded Git binary -@@ -33,7 +26,7 @@ - function resolveGitExecPath() { + * Find the path to the embedded Git binary. +@@ -42,7 +35,7 @@ + } const gitDir = resolveGitDir(); if (process.platform === 'darwin' || process.platform === 'linux') { - return path.join(gitDir, 'libexec', 'git-core'); @@ -25,12 +25,12 @@ } else if (process.platform === 'win32') { return path.join(gitDir, 'mingw64', 'libexec', 'git-core'); -@@ -80,10 +73,6 @@ +@@ -89,10 +82,6 @@ // an arbitrary location, you should set PREFIX for the // process to ensure that it knows how to resolve things env.PREFIX = gitDir; - // bypass whatever certificates might be set and use -- // the bundle included in the distibution +- // the bundle included in the distribution - const sslCABundle = `${gitDir}/ssl/cacert.pem`; - env.GIT_SSL_CAINFO = sslCABundle; } Deleted: fix-ime-events-handler.patch =================================================================== --- fix-ime-events-handler.patch 2017-08-31 09:03:58 UTC (rev 255165) +++ fix-ime-events-handler.patch 2017-08-31 09:54:08 UTC (rev 255166) @@ -1,47 +0,0 @@ ---- a/src/text-editor-component.coffee -+++ b/src/text-editor-component.coffee -@@ -110,6 +110,7 @@ class TextEditorComponent - @updateSync() - @checkForVisibilityChange() - @initialized = true -+ @checkpointForIME = null - - destroy: -> - @mounted = false -@@ -305,19 +306,20 @@ class TextEditorComponent - # User escape to cancel - # 4. compositionend fired - # OR User chooses a completion -- # 4. compositionend fired -- # 5. textInput fired; event.data == the completion string -+ # 4. textInput fired; event.data == the completion string -+ # 5. compositionend fired - -- checkpoint = null - @domNode.addEventListener 'compositionstart', => - if @openedAccentedCharacterMenu - @editor.selectLeft() - @openedAccentedCharacterMenu = false -- checkpoint = @editor.createCheckpoint() -+ @checkpointForIME = @editor.createCheckpoint() - @domNode.addEventListener 'compositionupdate', (event) => - @editor.insertText(event.data, select: true) - @domNode.addEventListener 'compositionend', (event) => -- @editor.revertToCheckpoint(checkpoint) -+ if @checkpointForIME -+ @editor.revertToCheckpoint(@checkpointForIME) -+ @checkpointForIME = null - event.target.value = '' - - # Listen for selection changes and store the currently selected text -@@ -354,6 +356,10 @@ class TextEditorComponent - onTextInput: (event) => - event.stopPropagation() - -+ if @checkpointForIME -+ @editor.revertToCheckpoint(@checkpointForIME) -+ @checkpointForIME = null -+ - # WARNING: If we call preventDefault on the input of a space character, - # then the browser interprets the spacebar keypress as a page-down command, - # causing spaces to scroll elements containing editors. This is impossible Modified: fix-license-path.patch =================================================================== --- fix-license-path.patch 2017-08-31 09:03:58 UTC (rev 255165) +++ fix-license-path.patch 2017-08-31 09:54:08 UTC (rev 255166) @@ -8,7 +8,7 @@ + @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md') @disposable.add ipcHelpers.on app, 'before-quit', (event) => - unless @quitting + resolveBeforeQuitPromise = null --- a/src/workspace.js +++ b/src/workspace.js @@ -1091,7 +1091,7 @@ Modified: fix-restart.patch =================================================================== --- fix-restart.patch 2017-08-31 09:03:58 UTC (rev 255165) +++ fix-restart.patch 2017-08-31 09:54:08 UTC (rev 255166) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.coffee +++ b/src/main-process/atom-application.coffee -@@ -823,7 +823,7 @@ +@@ -827,7 +827,7 @@ @restart() restart: -> Modified: use-system-apm.patch =================================================================== --- use-system-apm.patch 2017-08-31 09:03:58 UTC (rev 255165) +++ use-system-apm.patch 2017-08-31 09:54:08 UTC (rev 255166) @@ -1,12 +1,12 @@ --- a/script/lib/run-apm-install.js +++ b/script/lib/run-apm-install.js -@@ -9,11 +9,8 @@ +@@ -8,11 +8,8 @@ const installEnv = Object.assign({}, process.env) // Set resource path so that apm can load metadata related to Atom. installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath - // Set our target (Electron) version so that node-pre-gyp can download the - // proper binaries. -- installEnv.npm_config_target = CONFIG.appMetadata.electronVersion; +- installEnv.npm_config_target = CONFIG.appMetadata.electronVersion childProcess.execFileSync( - CONFIG.getApmBinPath(), + 'apm', Modified: use-system-electron.patch =================================================================== --- use-system-electron.patch 2017-08-31 09:03:58 UTC (rev 255165) +++ use-system-electron.patch 2017-08-31 09:54:08 UTC (rev 255166) @@ -4,7 +4,7 @@ "url": "https://github.com/atom/atom/issues"; }, "license": "MIT", -- "electronVersion": "1.3.15", +- "electronVersion": "1.6.9", "dependencies": { "async": "0.2.6", "atom-keymap": "8.1.2", @@ -21,7 +21,7 @@ // Needed so we can require src/module-cache.coffee during generateModuleCache require('coffee-script/register') require('colors') -@@ -24,7 +20,6 @@ +@@ -25,7 +21,6 @@ .wrap(yargs.terminalWidth()) .argv @@ -29,7 +29,7 @@ const cleanOutputDirectory = require('./lib/clean-output-directory') const codeSignOnMac = require('./lib/code-sign-on-mac') const codeSignOnWindows = require('./lib/code-sign-on-windows') -@@ -37,7 +32,6 @@ +@@ -38,7 +33,6 @@ const generateAPIDocs = require('./lib/generate-api-docs') const generateMetadata = require('./lib/generate-metadata') const generateModuleCache = require('./lib/generate-module-cache') @@ -37,15 +37,15 @@ const installApplication = require('./lib/install-application') const packageApplication = require('./lib/package-application') const prebuildLessCache = require('./lib/prebuild-less-cache') -@@ -52,7 +46,6 @@ - process.exit(1) - }) +@@ -55,7 +49,6 @@ + const CONFIG = require('./config') + -checkChromedriverVersion() cleanOutputDirectory() copyAssets() transpilePackagesWithCustomTranspilerPaths() -@@ -65,52 +58,3 @@ +@@ -68,61 +61,3 @@ generateMetadata() generateAPIDocs() dumpSymbols() @@ -52,35 +52,44 @@ - .then(packageApplication) - .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath)) - .then(packagedAppPath => { -- if (process.platform === 'darwin') { -- if (argv.codeSign) { -- codeSignOnMac(packagedAppPath) -- } else { -- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) +- switch (process.platform) { +- case 'darwin': { +- if (argv.codeSign) { +- codeSignOnMac(packagedAppPath) +- } else { +- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) +- } - } -- } else if (process.platform === 'win32') { -- if (argv.createWindowsInstaller) { -- return createWindowsInstaller(packagedAppPath, argv.codeSign).then(() => packagedAppPath) -- } -- else { -- console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray) +- case 'win32': { - if (argv.codeSign) { -- codeSignOnWindows(packagedAppPath) +- const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ] +- if (argv.createWindowsInstaller) { +- executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe')) +- } +- codeSignOnWindows(executablesToSign) - } else { - console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) - } +- if (argv.createWindowsInstaller) { +- return createWindowsInstaller(packagedAppPath) +- .then(() => argv.codeSign && codeSignOnWindows([ path.join(CONFIG.buildOutputPath, 'AtomSetup.exe') ])) +- .then(() => packagedAppPath) +- } else { +- console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray) +- } - } -- } else if (process.platform === 'linux') { -- if (argv.createDebianPackage) { -- createDebianPackage(packagedAppPath) -- } else { -- console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray) -- } +- case 'linux': { +- if (argv.createDebianPackage) { +- createDebianPackage(packagedAppPath) +- } else { +- console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray) +- } - -- if (argv.createRpmPackage) { -- createRpmPackage(packagedAppPath) -- } else { -- console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray) +- if (argv.createRpmPackage) { +- createRpmPackage(packagedAppPath) +- } else { +- console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray) +- } - } - } - @@ -103,12 +112,12 @@ @@ -8,9 +8,6 @@ "colors": "1.1.2", "csslint": "1.0.2", - "donna": "1.0.13", -- "electron-chromedriver": "~1.3", + "donna": "1.0.16", +- "electron-chromedriver": "~1.6", - "electron-link": "0.1.0", -- "electron-mksnapshot": "~1.3", +- "electron-mksnapshot": "~1.6", "electron-packager": "7.3.0", - "electron-winstaller": "2.5.1", + "electron-winstaller": "2.6.2", "fs-extra": "0.30.0", --- a/src/module-cache.coffee +++ b/src/module-cache.coffee
