Date: Friday, June 16, 2017 @ 05:34:13 Author: tensor5 Revision: 237477
upgpkg: atom 1.18.0-1 Added: atom/trunk/dugite-use-system-git.patch Modified: atom/trunk/PKGBUILD atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-apm.patch atom/trunk/use-system-electron.patch -----------------------------+ PKGBUILD | 20 ++++++++++++++------ dugite-use-system-git.patch | 38 ++++++++++++++++++++++++++++++++++++++ fix-license-path.patch | 4 ++-- fix-restart.patch | 2 +- use-system-apm.patch | 17 ++++++++++++++++- use-system-electron.patch | 21 +++++++++++++-------- 6 files changed, 84 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-16 05:30:10 UTC (rev 237476) +++ PKGBUILD 2017-06-16 05:34:13 UTC (rev 237477) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini <tens...@gmail.com> pkgname=atom -pkgver=1.17.2 +pkgver=1.18.0 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('i686' 'x86_64') @@ -14,6 +14,7 @@ replaces=('atom-editor') options=(!emptydirs) 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' @@ -21,14 +22,15 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('bdde2b60e93f818976c28a0b6259d4636a695a2db9c832eeb186082744cd8f6b' +sha256sums=('bd2dd1423ac204b1d6b117dcbab405095a7f663b97d07519b0de4300158645b1' + '465c90539cf4160cf05af36c8a3a88c16ae4e045c4d88ee56930a675d1074a2c' '2148436adf17ec1970adc344fccf3782645375cd93e62a696a55f5b11fe98032' 'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2' - 'a81012ab62df63390e35478399e16b0d2ff5a42c2527d43865df441e025bdf36' - 'ed1dce5009f1ae775e678d9e48fa2c655e64764465df0c43b8631c4f337ae1a9' + '0d1e2d6be438bc7cb7633b6b462d1011a587d6f764d0abf7805895f3d8900228' + 'c55d0837aef4aaeb2a4a317e9916e76bac34be19a5371b538843046d9ad85826' '32fb830b89bd6079120bf7380a69f94c02aa366608b0d0b6c7123e06b878400c' - '13bf5f35b0cf92f4420bd1e21587f8804b851290725a9d5e751b720711bc1224' - '51d961bfa9447c6f3e04adbeeec2e59f8c5403b975f9408d44db994b3d0246e3') + '310cfa5088908312abded7a2a28b8c53a4d7d38ec05c9623be3fa89d311b0a09' + '5b39644daff87980899908c0c2c10b97319291c89f332dea15f9b259f42a8b17') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -58,6 +60,12 @@ rm -r vendor cd ../.. + # Use system git + cd node_modules/dugite + patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch + rm -r git + cd ../.. + cd script npm install ./build Added: dugite-use-system-git.patch =================================================================== --- dugite-use-system-git.patch (rev 0) +++ dugite-use-system-git.patch 2017-06-16 05:34:13 UTC (rev 237477) @@ -0,0 +1,38 @@ +--- a/build/lib/git-environment.js ++++ b/build/lib/git-environment.js +@@ -5,14 +5,7 @@ + * Find the path to the embedded Git environment + */ + function resolveGitDir() { +- if (process.env.LOCAL_GIT_DIRECTORY) { +- return path.resolve(process.env.LOCAL_GIT_DIRECTORY); +- } +- else { +- const s = path.sep; +- return path.resolve(__dirname, '..', '..', 'git') +- .replace(/[\\\/]app.asar[\\\/]/, `${s}app.asar.unpacked${s}`); +- } ++ return '/usr'; + } + /** + * Find the path to the embedded Git binary +@@ -33,7 +26,7 @@ + function resolveGitExecPath() { + const gitDir = resolveGitDir(); + if (process.platform === 'darwin' || process.platform === 'linux') { +- return path.join(gitDir, 'libexec', 'git-core'); ++ return path.join(gitDir, 'lib', 'git-core'); + } + else if (process.platform === 'win32') { + return path.join(gitDir, 'mingw64', 'libexec', 'git-core'); +@@ -80,10 +73,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 +- const sslCABundle = `${gitDir}/ssl/cacert.pem`; +- env.GIT_SSL_CAINFO = sslCABundle; + } + return { env, gitLocation }; + } Modified: fix-license-path.patch =================================================================== --- fix-license-path.patch 2017-06-16 05:30:10 UTC (rev 237476) +++ fix-license-path.patch 2017-06-16 05:34:13 UTC (rev 237477) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.coffee +++ b/src/main-process/atom-application.coffee -@@ -262,7 +262,7 @@ +@@ -264,7 +264,7 @@ @openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap') @openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets') @openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet') @@ -11,7 +11,7 @@ unless @quitting --- a/src/workspace.js +++ b/src/workspace.js -@@ -1046,7 +1046,7 @@ +@@ -1091,7 +1091,7 @@ // Open Atom's license in the active pane. openLicense () { Modified: fix-restart.patch =================================================================== --- fix-restart.patch 2017-06-16 05:30:10 UTC (rev 237476) +++ fix-restart.patch 2017-06-16 05:34:13 UTC (rev 237477) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.coffee +++ b/src/main-process/atom-application.coffee -@@ -821,7 +821,7 @@ +@@ -823,7 +823,7 @@ @restart() restart: -> Modified: use-system-apm.patch =================================================================== --- use-system-apm.patch 2017-06-16 05:30:10 UTC (rev 237476) +++ use-system-apm.patch 2017-06-16 05:34:13 UTC (rev 237477) @@ -1,6 +1,21 @@ +--- a/script/lib/run-apm-install.js ++++ b/script/lib/run-apm-install.js +@@ -9,11 +9,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; + childProcess.execFileSync( +- CONFIG.getApmBinPath(), ++ 'apm', + ['--loglevel=error', 'install'], + {env: installEnv, cwd: packagePath, stdio: 'inherit'} + ) --- a/src/package-manager.coffee +++ b/src/package-manager.coffee -@@ -145,12 +145,7 @@ +@@ -147,12 +147,7 @@ return configPath if configPath return @apmPath if @apmPath? Modified: use-system-electron.patch =================================================================== --- use-system-electron.patch 2017-06-16 05:30:10 UTC (rev 237476) +++ use-system-electron.patch 2017-06-16 05:34:13 UTC (rev 237477) @@ -7,7 +7,7 @@ - "electronVersion": "1.3.15", "dependencies": { "async": "0.2.6", - "atom-keymap": "8.1.1", + "atom-keymap": "8.1.2", --- a/script/build +++ b/script/build @@ -2,10 +2,6 @@ @@ -28,8 +28,8 @@ -const checkChromedriverVersion = require('./lib/check-chromedriver-version') const cleanOutputDirectory = require('./lib/clean-output-directory') const codeSignOnMac = require('./lib/code-sign-on-mac') - const compressArtifacts = require('./lib/compress-artifacts') -@@ -36,7 +31,6 @@ + const codeSignOnWindows = require('./lib/code-sign-on-windows') +@@ -37,7 +32,6 @@ const generateAPIDocs = require('./lib/generate-api-docs') const generateMetadata = require('./lib/generate-metadata') const generateModuleCache = require('./lib/generate-module-cache') @@ -37,7 +37,7 @@ const installApplication = require('./lib/install-application') const packageApplication = require('./lib/package-application') const prebuildLessCache = require('./lib/prebuild-less-cache') -@@ -51,7 +45,6 @@ +@@ -52,7 +46,6 @@ process.exit(1) }) @@ -45,7 +45,7 @@ cleanOutputDirectory() copyAssets() transpilePackagesWithCustomTranspilerPaths() -@@ -64,47 +57,3 @@ +@@ -65,52 +58,3 @@ generateMetadata() generateAPIDocs() dumpSymbols() @@ -63,7 +63,12 @@ - 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. Code-signing was skipped too.'.gray) +- console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray) +- if (argv.codeSign) { +- codeSignOnWindows(packagedAppPath) +- } else { +- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) +- } - } - } else if (process.platform === 'linux') { - if (argv.createDebianPackage) { @@ -100,7 +105,7 @@ "csslint": "1.0.2", "donna": "1.0.13", - "electron-chromedriver": "~1.3", -- "electron-link": "0.0.22", +- "electron-link": "0.1.0", - "electron-mksnapshot": "~1.3", "electron-packager": "7.3.0", "electron-winstaller": "2.5.1", @@ -118,7 +123,7 @@ cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath) --- a/src/package-manager.coffee +++ b/src/package-manager.coffee -@@ -608,7 +608,7 @@ +@@ -610,7 +610,7 @@ isBundledPackagePath: (packagePath) -> if @devMode