Date: Tuesday, September 11, 2018 @ 00:53:35 Author: bgyorgy Revision: 379427
archrelease: copy trunk to community-testing-x86_64 Added: code/repos/community-testing-x86_64/PKGBUILD (from rev 379426, code/trunk/PKGBUILD) code/repos/community-testing-x86_64/code-liveshare.patch (from rev 379426, code/trunk/code-liveshare.patch) code/repos/community-testing-x86_64/code.sh (from rev 379426, code/trunk/code.sh) code/repos/community-testing-x86_64/product_json.patch (from rev 379426, code/trunk/product_json.patch) Deleted: code/repos/community-testing-x86_64/PKGBUILD code/repos/community-testing-x86_64/code-liveshare.patch code/repos/community-testing-x86_64/code.sh code/repos/community-testing-x86_64/product_json.patch ----------------------+ PKGBUILD | 222 +++++++++++++++++++++++-------------------------- code-liveshare.patch | 22 ++-- code.sh | 6 - product_json.patch | 42 ++++----- 4 files changed, 143 insertions(+), 149 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-09-11 00:52:41 UTC (rev 379426) +++ PKGBUILD 2018-09-11 00:53:35 UTC (rev 379427) @@ -1,114 +0,0 @@ -# $Id$ -# 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.1 -pkgrel=2 -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#tag=$_pkgver" - 'code.sh' - 'product_json.patch' - 'code-liveshare.patch') -sha512sums=('SKIP' - 'dfca36cf30eeab786c38feb320dcec09764dcaa912d9587a959ce5a4273f6a4af7de3a01b963beedc1ec64782b459aa8491d9b808b9c6ce98f847e80d618d272' - 'dcf52fa373a787cd94ce7ad216a269de3ca90b3f02cea1d635016d980e765a9cc040776ce4b4ef83721ab6f0d74efb7a3a9ca02fbdf3daa06653c766d36cde08' - '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 -p1 < ../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() { - cd $pkgname - - yarn install --arch=$_vscode_arch - - # Rebuild native npm modules for system electron - # See https://electronjs.org/docs/tutorial/using-native-node-modules for details - sed -i '/postinstall/d' node_modules/vscode-ripgrep/package.json - npm rebuild \ - --arch=$_vscode_arch \ - --runtime=electron \ - --target=$(</usr/lib/electron/version) \ - --disturl=https://atom.io/download/electron \ - --build-from-source - - # The default memory limit may be too low for current versions of node - # to successfully build vscode. Uncomment this to set it to 2GB, or - # change it if this number still doesn't work for your system. - mem_limit="--max_old_space_size=2048" - - 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/* "$pkgdir"/usr/lib/$pkgname/ - - # Install binary - install -Dm 755 code.sh "$pkgdir"/usr/bin/code - - # Install 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/g - s/@@ICON@@/code/g - s/@@LICENSE@@/MIT/g' code/resources/linux/code.{appdata.xml,desktop} - - install -Dm 644 code/resources/linux/code.appdata.xml "$pkgdir"/usr/share/metainfo/code.appdata.xml - install -Dm 644 code/resources/linux/code.desktop "$pkgdir"/usr/share/applications/code.desktop - install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png "$pkgdir"/usr/share/pixmaps/code.png - - # Install license files - install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt - install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/ThirdPartyNotices.txt "$pkgdir"/usr/share/licenses/$pkgname/ThirdPartyNotices.txt -} - Copied: code/repos/community-testing-x86_64/PKGBUILD (from rev 379426, code/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-09-11 00:53:35 UTC (rev 379427) @@ -0,0 +1,108 @@ +# $Id$ +# 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.1 +pkgrel=3 +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#tag=$_pkgver" + 'code.sh' + 'product_json.patch' + 'code-liveshare.patch') +sha512sums=('SKIP' + 'dfca36cf30eeab786c38feb320dcec09764dcaa912d9587a959ce5a4273f6a4af7de3a01b963beedc1ec64782b459aa8491d9b808b9c6ce98f847e80d618d272' + 'dcf52fa373a787cd94ce7ad216a269de3ca90b3f02cea1d635016d980e765a9cc040776ce4b4ef83721ab6f0d74efb7a3a9ca02fbdf3daa06653c766d36cde08' + '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 -p1 < ../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 +} + +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/* "$pkgdir"/usr/lib/$pkgname/ + + # Install binary + install -Dm 755 code.sh "$pkgdir"/usr/bin/code + + # Install 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/g + s/@@ICON@@/code/g + s/@@LICENSE@@/MIT/g' code/resources/linux/code.{appdata.xml,desktop} + + install -Dm 644 code/resources/linux/code.appdata.xml "$pkgdir"/usr/share/metainfo/code.appdata.xml + install -Dm 644 code/resources/linux/code.desktop "$pkgdir"/usr/share/applications/code.desktop + install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png "$pkgdir"/usr/share/pixmaps/code.png + + # Install license files + install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt + install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/ThirdPartyNotices.txt "$pkgdir"/usr/share/licenses/$pkgname/ThirdPartyNotices.txt +} + Deleted: code-liveshare.patch =================================================================== --- code-liveshare.patch 2018-09-11 00:52:41 UTC (rev 379426) +++ code-liveshare.patch 2018-09-11 00:53:35 UTC (rev 379427) @@ -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" - ], Copied: code/repos/community-testing-x86_64/code-liveshare.patch (from rev 379426, code/trunk/code-liveshare.patch) =================================================================== --- code-liveshare.patch (rev 0) +++ code-liveshare.patch 2018-09-11 00:53:35 UTC (rev 379427) @@ -0,0 +1,11 @@ +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.sh =================================================================== --- code.sh 2018-09-11 00:52:41 UTC (rev 379426) +++ code.sh 2018-09-11 00:53:35 UTC (rev 379427) @@ -1,3 +0,0 @@ -#!/bin/bash - -electron /usr/lib/code/app/ "$@" Copied: code/repos/community-testing-x86_64/code.sh (from rev 379426, code/trunk/code.sh) =================================================================== --- code.sh (rev 0) +++ code.sh 2018-09-11 00:53:35 UTC (rev 379427) @@ -0,0 +1,3 @@ +#!/bin/bash + +electron /usr/lib/code/app/ "$@" Deleted: product_json.patch =================================================================== --- product_json.patch 2018-09-11 00:52:41 UTC (rev 379426) +++ product_json.patch 2018-09-11 00:53:35 UTC (rev 379427) @@ -1,21 +0,0 @@ -diff --git a/product.json b/product.json -index ed3ced1c1b..df707206d5 100644 ---- a/product.json -+++ b/product.json -@@ -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@" - } Copied: code/repos/community-testing-x86_64/product_json.patch (from rev 379426, code/trunk/product_json.patch) =================================================================== --- product_json.patch (rev 0) +++ product_json.patch 2018-09-11 00:53:35 UTC (rev 379427) @@ -0,0 +1,21 @@ +diff --git a/product.json b/product.json +index ed3ced1c1b..df707206d5 100644 +--- a/product.json ++++ b/product.json +@@ -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@" + }