Date: Thursday, November 29, 2018 @ 01:33:23
Author: eschwartz
Revision: 410495
archrelease: copy trunk to community-x86_64
Added:
code/repos/community-x86_64/PKGBUILD
(from rev 410494, code/trunk/PKGBUILD)
code/repos/community-x86_64/code-liveshare.diff
(from rev 410494, code/trunk/code-liveshare.diff)
code/repos/community-x86_64/code.js
(from rev 410494, code/trunk/code.js)
code/repos/community-x86_64/code.sh
(from rev 410494, code/trunk/code.sh)
code/repos/community-x86_64/product_json.diff
(from rev 410494, code/trunk/product_json.diff)
Deleted:
code/repos/community-x86_64/PKGBUILD
code/repos/community-x86_64/code-liveshare.patch
code/repos/community-x86_64/code.js
code/repos/community-x86_64/code.sh
code/repos/community-x86_64/product_json.patch
----------------------+
PKGBUILD | 232 +++++++++++++++++++++++++------------------------
code-liveshare.diff | 12 ++
code-liveshare.patch | 11 --
code.js | 52 ++++++----
code.sh | 6 -
product_json.diff | 21 ++++
product_json.patch | 19 ----
7 files changed, 184 insertions(+), 169 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-29 01:32:16 UTC (rev 410494)
+++ PKGBUILD 2018-11-29 01:33:23 UTC (rev 410495)
@@ -1,113 +0,0 @@
-# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org>
-# Contributor: Michael Hansen <zrax0111 gmail com>
-# Contributor: Francisco Magalhães <franmagneto gmail com>
-
-pkgname=code
-pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
-pkgver=1.27.2
-pkgrel=1
-arch=('x86_64')
-url='https://github.com/Microsoft/vscode'
-license=('MIT')
-depends=('electron' 'libsecret' 'libxkbfile')
-makedepends=('git' 'gulp' 'npm' 'python2' 'yarn')
-source=("$pkgname::git+https://github.com/Microsoft/vscode.git#tag=$pkgver";
- 'code.js'
- 'code.sh'
- 'product_json.patch'
- 'code-liveshare.patch')
-sha512sums=('SKIP'
-
'd6d76d745372466936e516af7cacd146e7c90def5bba2eb03223b740675b810de00fff79a3f1cc8d29277f1d215ead5096aebb5ebeb52d25d8055e9c0d802bb9'
-
'a857b52b5075bed2df9860da4a9a7772351a1f4226e1bcac4578c31801caec61c785d30f49785c8816709a8d0b11c12696a49c4942c26d130a10618ce2c73d6b'
-
'7f85387542987c45a6d0e23424eda9e702dc9c6a789cde96ed6e5d386bd294eae8a6c7b32c7ae18d8071063e83a1033c215d0f5f5e0b1040466ce4b7c3969f2c'
-
'6080b9d30b2c852a831d4fa98be94e42eb7d94dfd5813bbe28410d031191c20563e4288d6b0062c74b635a962c3eba3533fcebeff1f67b4a8005a167c2f7fbf2')
-
-# Even though we don't officially support other archs, let's
-# allow the user to use this PKGBUILD to compile the package
-# for his architecture
-case "$CARCH" in
- i686)
- _vscode_arch=ia32
- ;;
- x86_64)
- _vscode_arch=x64
- ;;
- armv7h)
- _vscode_arch=arm
- ;;
- *)
- # Needed for mksrcinfo
- _vscode_arch=DUMMY
- ;;
-esac
-
-prepare() {
- cd $pkgname
-
- # This patch no longer contains proprietary modifications.
- # See https://github.com/Microsoft/vscode/issues/31168 for details.
- patch -p0 < ../product_json.patch
-
- # Set the commit and build date
- local _commit=$(git rev-parse HEAD)
- local _datestamp=$(date -u -Is | sed 's/\+00:00/Z/')
- sed -e "s/@COMMIT@/$_commit/" -e "s/@DATE@/$_datestamp/" -i product.json
-
- # See https://github.com/MicrosoftDocs/live-share/issues/262 for details
- patch -p1 < ../code-liveshare.patch
-
- # Build native modules for system electron
- local _target=$(</usr/lib/electron/version)
- sed -i "s/^target .*/target \"${_target//v/}\"/" .yarnrc
-
- # Patch appdata and desktop file
- sed -i 's|/usr/share/@@NAME@@/@@NAME@@|@@NAME@@|g
- s|@@NAME_SHORT@@|Code - OSS|g
- s|@@NAME_LONG@@|Code|g
- s|@@NAME@@|code-oss|g
- s|@@ICON@@|code-oss|g
- s|@@LICENSE@@|MIT|g
- s|inode/directory;||' resources/linux/code.{appdata.xml,desktop}
-}
-
-build() {
- cd $pkgname
-
- yarn install --arch=$_vscode_arch
-
- # The default memory limit may be too low for current versions of node
- # to successfully build vscode. Change it if this number still doesn't
- # work for your system.
- mem_limit="--max_old_space_size=4096"
-
- if ! /usr/bin/node $mem_limit /usr/bin/gulp vscode-linux-$_vscode_arch-min
- then
- echo
- echo "*** NOTE: If the build failed due to running out of file handles
(EMFILE),"
- echo "*** you will need to raise your max open file limit."
- echo "*** You can check this for more information on how to increase
this limit:"
- echo "***
https://ro-che.info/articles/2017-03-26-increase-open-files-limit";
- exit 1
- fi
-}
-
-package() {
- # Install resource files
- install -dm 755 "$pkgdir"/usr/lib/$pkgname
- cp -r --no-preserve=ownership --preserve=mode
VSCode-linux-$_vscode_arch/resources/app/* "$pkgdir"/usr/lib/$pkgname/
-
- # Install binary
- install -Dm 755 code.sh "$pkgdir"/usr/bin/code-oss
- install -Dm 755 code.js "$pkgdir"/usr/lib/$pkgname/code.js
- ln -sf /usr/bin/code-oss "$pkgdir"/usr/bin/code
-
- # Install appdata and desktop file
- install -Dm 644 code/resources/linux/code.appdata.xml
"$pkgdir"/usr/share/metainfo/code-oss.appdata.xml
- install -Dm 644 code/resources/linux/code.desktop
"$pkgdir"/usr/share/applications/code-oss.desktop
- install -Dm 644
VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png
"$pkgdir"/usr/share/pixmaps/code-oss.png
-
- # Install license files
- install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
- install -Dm 644
VSCode-linux-$_vscode_arch/resources/app/ThirdPartyNotices.txt
"$pkgdir"/usr/share/licenses/$pkgname/ThirdPartyNotices.txt
-}
-
Copied: code/repos/community-x86_64/PKGBUILD (from rev 410494,
code/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-29 01:33:23 UTC (rev 410495)
@@ -0,0 +1,119 @@
+# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org>
+# Contributor: Michael Hansen <zrax0111 gmail com>
+# Contributor: Francisco Magalhães <franmagneto gmail com>
+
+pkgname=code
+pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
+pkgver=1.29.1
+pkgrel=1
+arch=('x86_64')
+url='https://github.com/Microsoft/vscode'
+license=('MIT')
+depends=('electron' 'libsecret' 'libxkbfile')
+# doesn't build without old nodejs:
https://github.com/Microsoft/vscode/issues/49292
+makedepends=('git' 'gulp' 'npm' 'python2' 'yarn' 'nodejs-lts-carbon')
+source=("$pkgname::git+https://github.com/Microsoft/vscode.git#tag=$pkgver";
+ 'code.js'
+ 'code.sh'
+ 'product_json.diff'
+ 'code-liveshare.diff')
+sha512sums=('SKIP'
+
'814c9554427183cd893a33cd2cbe91f6e0ea71921ef0717c86217b1d3058d265f9ff7a9ace3e7b76f122e60b7686475cf4d999e581a1845face3033afb9f745f'
+
'0e75ee88274cbaf48c59ef6f363f6b8ac2ea83f8b17a61155008db773b709a1f0233754fa63a136ec0417313ba90a7eb17db000ec22a38ca8840d8ba6c47cab1'
+
'3c4bf0942ba9f1ba33937cc08e87caa8d6c030b862f99b2bac9ce6665739dd6a5f5a255b617c3f27ffd49df35563efa32f2c1a6240f9e19f16356bb12edac891'
+
'0bd10ca06dea22854e47fc45d833756ee8d7bf714c88f63feef44e0b0b5da052fba3c27d001865e3389f391cd7b888d92dc0ba44029fa5c736225da3cf2f9a46')
+
+# Even though we don't officially support other archs, let's
+# allow the user to use this PKGBUILD to compile the package
+# for his architecture
+case "$CARCH" in
+ i686)
+ _vscode_arch=ia32
+ ;;
+ x86_64)
+ _vscode_arch=x64
+ ;;
+ armv7h)
+ _vscode_arch=arm
+ ;;
+ *)
+ # Needed for mksrcinfo
+ _vscode_arch=DUMMY
+ ;;
+esac
+
+prepare() {
+ cd $pkgname
+
+ # This patch no longer contains proprietary modifications.
+ # See https://github.com/Microsoft/vscode/issues/31168 for details.
+ patch -p1 < ../product_json.diff
+
+ # Set the commit and build date
+ local _commit=$(git rev-parse HEAD)
+ local _datestamp=$(date -u -Is | sed 's/\+00:00/Z/')
+ sed -e "s/@COMMIT@/$_commit/" -e "s/@DATE@/$_datestamp/" -i product.json
+
+ # See https://github.com/MicrosoftDocs/live-share/issues/262 for details
+ patch -p1 < ../code-liveshare.diff
+
+ # Build native modules for system electron
+ local _target=$(</usr/lib/electron/version)
+ sed -i "s/^target .*/target \"${_target//v/}\"/" .yarnrc
+
+ # Patch appdata and desktop file
+ sed -i 's|/usr/share/@@NAME@@/@@NAME@@|@@NAME@@|g
+ s|@@NAME_SHORT@@|Code|g
+ s|@@NAME_LONG@@|Code - OSS|g
+ s|@@NAME@@|code-oss|g
+ s|@@ICON@@|code-oss|g
+ s|@@LICENSE@@|MIT|g
+ s|inode/directory;||' resources/linux/code.{appdata.xml,desktop}
+}
+
+build() {
+ # https://github.com/mapbox/node-sqlite3/issues/1044
+ mkdir -p path
+ ln -sf /usr/bin/python2 path/python
+ export PATH="$PWD/path:$PATH"
+
+ cd $pkgname
+
+ yarn install --arch=$_vscode_arch
+
+ # The default memory limit may be too low for current versions of node
+ # to successfully build vscode. Change it if this number still doesn't
+ # work for your system.
+ mem_limit="--max_old_space_size=4096"
+
+ if ! /usr/bin/node $mem_limit /usr/bin/gulp vscode-linux-$_vscode_arch-min
+ then
+ echo
+ echo "*** NOTE: If the build failed due to running out of file handles
(EMFILE),"
+ echo "*** you will need to raise your max open file limit."
+ echo "*** You can check this for more information on how to increase
this limit:"
+ echo "***
https://ro-che.info/articles/2017-03-26-increase-open-files-limit";
+ exit 1
+ fi
+}
+
+package() {
+ # Install resource files
+ install -dm 755 "$pkgdir"/usr/lib/$pkgname
+ cp -r --no-preserve=ownership --preserve=mode
VSCode-linux-$_vscode_arch/resources/app/* "$pkgdir"/usr/lib/$pkgname/
+
+ # Install binary
+ install -Dm 755 code.sh "$pkgdir"/usr/bin/code-oss
+ install -Dm 755 code.js "$pkgdir"/usr/lib/$pkgname/code.js
+ ln -sf /usr/bin/code-oss "$pkgdir"/usr/bin/code
+
+ # Install appdata and desktop file
+ install -Dm 644 code/resources/linux/code.appdata.xml
"$pkgdir"/usr/share/metainfo/code-oss.appdata.xml
+ install -Dm 644 code/resources/linux/code.desktop
"$pkgdir"/usr/share/applications/code-oss.desktop
+ install -Dm 644
VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png
"$pkgdir"/usr/share/pixmaps/code-oss.png
+
+ # Install license files
+ install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ install -Dm 644
VSCode-linux-$_vscode_arch/resources/app/ThirdPartyNotices.txt
"$pkgdir"/usr/share/licenses/$pkgname/ThirdPartyNotices.txt
+}
+
Copied: code/repos/community-x86_64/code-liveshare.diff (from rev 410494,
code/trunk/code-liveshare.diff)
===================================================================
--- code-liveshare.diff (rev 0)
+++ code-liveshare.diff 2018-11-29 01:33:23 UTC (rev 410495)
@@ -0,0 +1,12 @@
+diff --git a/product.json b/product.json
+index b250c66fc4..8a9befcfbb 100644
+--- a/product.json
++++ b/product.json
+@@ -19,6 +19,7 @@
+ "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new";,
+ "urlProtocol": "code-oss",
+ "extensionAllowedProposedApi": [
++ "ms-vsliveshare.vsliveshare",
+ "ms-vscode.references-view"
+ ],
+ "quality": "stable",
Deleted: code-liveshare.patch
===================================================================
--- code-liveshare.patch 2018-11-29 01:32:16 UTC (rev 410494)
+++ code-liveshare.patch 2018-11-29 01:33:23 UTC (rev 410495)
@@ -1,11 +0,0 @@
-diff -rupN a/product.json b/product.json
---- a/product.json 2018-05-08 09:26:25.618099994 -0700
-+++ b/product.json 2018-05-08 09:26:47.388338276 -0700
-@@ -17,6 +17,7 @@
- "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new";,
- "urlProtocol": "code-oss",
- "extensionAllowedProposedApi": [
-+ "ms-vsliveshare.vsliveshare",
- "ms-vscode.node-debug",
- "ms-vscode.node-debug2"
- ],
Deleted: code.js
===================================================================
--- code.js 2018-11-29 01:32:16 UTC (rev 410494)
+++ code.js 2018-11-29 01:33:23 UTC (rev 410495)
@@ -1,23 +0,0 @@
-#!/usr/bin/electron
-
-const name = 'code';
-
-const app = require('electron').app;
-const path = require('path');
-
-// Remove first command line argument (/usr/lib/code/code.js). - We call the
CLI file first
-process.argv.splice(0, 1);
-
-// Set application paths.
-const appPath = __dirname;
-const packageJson = require(path.join(appPath, 'package.json'));
-app.setAppPath(appPath);
-app.setDesktopName(name + '.desktop');
-app.setName(name);
-app.setPath('userCache', path.join(app.getPath('cache'), name));
-app.setPath('userData', path.join(app.getPath('appData'), name));
-app.setVersion(packageJson.version);
-
-// Run the application.
-require('module')._load(appPath, module, true);
-
Copied: code/repos/community-x86_64/code.js (from rev 410494,
code/trunk/code.js)
===================================================================
--- code.js (rev 0)
+++ code.js 2018-11-29 01:33:23 UTC (rev 410495)
@@ -0,0 +1,29 @@
+#!/usr/bin/electron
+
+const name = 'code-oss';
+
+const app = require('electron').app;
+const path = require('path');
+const fs = require("fs");
+
+// Change command name.
+const fd = fs.openSync("/proc/self/comm", fs.constants.O_WRONLY);
+fs.writeSync(fd, name);
+fs.closeSync(fd);
+
+// Remove first command line argument (/usr/lib/code/code.js). - We call the
CLI file first
+process.argv.splice(0, 1);
+
+// Set application paths.
+const appPath = __dirname;
+const packageJson = require(path.join(appPath, 'package.json'));
+app.setAppPath(appPath);
+app.setDesktopName(name + '.desktop');
+app.setName(name);
+app.setPath('userCache', path.join(app.getPath('cache'), name));
+app.setPath('userData', path.join(app.getPath('appData'), name));
+app.setVersion(packageJson.version);
+
+// Run the application.
+require('module')._load(appPath, module, true);
+
Deleted: code.sh
===================================================================
--- code.sh 2018-11-29 01:32:16 UTC (rev 410494)
+++ code.sh 2018-11-29 01:33:23 UTC (rev 410495)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec electron /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"
Copied: code/repos/community-x86_64/code.sh (from rev 410494,
code/trunk/code.sh)
===================================================================
--- code.sh (rev 0)
+++ code.sh 2018-11-29 01:33:23 UTC (rev 410495)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ELECTRON_RUN_AS_NODE=1 exec electron /usr/lib/code/out/cli.js
/usr/lib/code/code.js "$@"
Copied: code/repos/community-x86_64/product_json.diff (from rev 410494,
code/trunk/product_json.diff)
===================================================================
--- product_json.diff (rev 0)
+++ product_json.diff 2018-11-29 01:33:23 UTC (rev 410495)
@@ -0,0 +1,21 @@
+diff --git a/product.json b/product.json
+index eb6526c2d8..7753d2c5eb 100644
+--- a/product.json
++++ b/product.json
+@@ -20,5 +20,15 @@
+ "urlProtocol": "code-oss",
+ "extensionAllowedProposedApi": [
+ "ms-vscode.references-view"
+- ]
++ ],
++ "quality": "stable",
++ "extensionsGallery": {
++ "serviceUrl":
"https://marketplace.visualstudio.com/_apis/public/gallery";,
++ "cacheUrl":
"https://vscode.blob.core.windows.net/gallery/index";,
++ "itemUrl": "https://marketplace.visualstudio.com/items";
++ },
++ "documentationUrl": "https://github.com/microsoft/vscode-docs";,
++ "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues";,
++ "commit": "@COMMIT@",
++ "date": "@DATE@"
+ }
Deleted: product_json.patch
===================================================================
--- product_json.patch 2018-11-29 01:32:16 UTC (rev 410494)
+++ product_json.patch 2018-11-29 01:33:23 UTC (rev 410495)
@@ -1,19 +0,0 @@
---- product.json 2018-09-13 23:01:59.345056949 +0100
-+++ product.json 2018-09-13 23:02:50.748800382 +0100
-@@ -21,5 +21,15 @@
- "extensionAllowedProposedApi": [
- "ms-vscode.node-debug",
- "ms-vscode.node-debug2"
-- ]
-+ ],
-+ "quality": "stable",
-+ "extensionsGallery": {
-+ "serviceUrl":
"https://marketplace.visualstudio.com/_apis/public/gallery";,
-+ "cacheUrl":
"https://vscode.blob.core.windows.net/gallery/index";,
-+ "itemUrl": "https://marketplace.visualstudio.com/items";
-+ },
-+ "documentationUrl": "https://github.com/microsoft/vscode-docs";,
-+ "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues";,
-+ "commit": "@COMMIT@",
-+ "date": "@DATE@"
- }
