From 600fe22958bdfbf18e12f04fb75b68a5a6b69814 Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Sat, 6 Apr 2019 09:23:30 +0200 Subject: [PATCH 1/5] New package: vscodium-bin-1.33.0 Closes #10582 --- srcpkgs/vscodium-bin/REMOVE | 9 +++++ srcpkgs/vscodium-bin/files/vscodium.desktop | 18 ++++++++++ srcpkgs/vscodium-bin/template | 37 +++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 srcpkgs/vscodium-bin/REMOVE create mode 100644 srcpkgs/vscodium-bin/files/vscodium.desktop create mode 100644 srcpkgs/vscodium-bin/template diff --git a/srcpkgs/vscodium-bin/REMOVE b/srcpkgs/vscodium-bin/REMOVE new file mode 100644 index 00000000000..2ea0a945cc1 --- /dev/null +++ b/srcpkgs/vscodium-bin/REMOVE @@ -0,0 +1,9 @@ +if [ "$UPDATE" = "no" ]; then + case "$ACTION" in + post) + if [ -d usr/lib/vscodium ]; then + rm -rf usr/lib/vscodium + fi + ;; + esac +fi diff --git a/srcpkgs/vscodium-bin/files/vscodium.desktop b/srcpkgs/vscodium-bin/files/vscodium.desktop new file mode 100644 index 00000000000..c30625790c0 --- /dev/null +++ b/srcpkgs/vscodium-bin/files/vscodium.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Name=VSCodium +Comment=Code Editing. Redefined. +GenericName=Text Editor +Exec=/usr/lib/vscodium/vscodium --unity-launch %F +Icon=vscodium +Type=Application +StartupNotify=true +StartupWMClass=VSCodium +Categories=Utility;Development;IDE; +MimeType=text/plain;inode/directory; +Actions=new-empty-window; +Keywords=vscode; + +[Desktop Action new-empty-window] +Name=New Empty Window +Exec=/usr/lib/vscodium/vscodium --new-window %F +Icon=vscodium diff --git a/srcpkgs/vscodium-bin/template b/srcpkgs/vscodium-bin/template new file mode 100644 index 00000000000..dd4281f704b --- /dev/null +++ b/srcpkgs/vscodium-bin/template @@ -0,0 +1,37 @@ +# Template file for 'vscodium-bin' +pkgname=vscodium-bin +version=1.33.0 +revision=1 +archs="i686 x86_64" +create_wrksrc=yes +depends="GConf libXtst libxkbfile nss dejavu-fonts-ttf" +short_desc="Binary releases of VS Code without MS branding/telemetry/licensing" +maintainer="shizonic " +license="MIT" +homepage="https://github.com/VSCodium/vscodium" +nostrip_files="vscodium" + +if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then + _archive="VSCodium-linux-x64-${version}.tar.gz" + checksum=388506a0bee87a72102bf20d32efaf18d6f5d29286bdda3684f63d87e63c646f +else + _archive="VSCodium-linux-ia32-${version}.tar.gz" + checksum=cd2e8dddbb5858bc796279f2727c4ee6794653ddd0b6b4316d05334d4c7f2648 +fi +distfiles="https://github.com/VSCodium/vscodium/releases/download/${version}/${_archive}" + +do_install() { + vmkdir usr/lib/vscodium + vcopy * usr/lib/vscodium + + vmkdir usr/bin + ln -sf /usr/lib/vscodium/bin/vscodium ${DESTDIR}/usr/bin/ + + vmkdir usr/share/applications + vcopy ${FILESDIR}/vscodium.desktop usr/share/applications/ + + vmkdir usr/share/pixmaps + ln -sf /usr/lib/vscodium/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/vscodium.png + + vlicense resources/app/LICENSE.txt +} From 0bc44f2e207e7aae01e75e102d3a034d505f17c7 Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Wed, 19 Jun 2019 10:28:12 +0200 Subject: [PATCH 2/5] vscodium-bin: update to 1.35.1. --- srcpkgs/vscodium-bin/files/vscodium.desktop | 4 ++-- srcpkgs/vscodium-bin/template | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/srcpkgs/vscodium-bin/files/vscodium.desktop b/srcpkgs/vscodium-bin/files/vscodium.desktop index c30625790c0..2109fd9f1ed 100644 --- a/srcpkgs/vscodium-bin/files/vscodium.desktop +++ b/srcpkgs/vscodium-bin/files/vscodium.desktop @@ -2,7 +2,7 @@ Name=VSCodium Comment=Code Editing. Redefined. GenericName=Text Editor -Exec=/usr/lib/vscodium/vscodium --unity-launch %F +Exec=/usr/lib/vscodium/codium --unity-launch %F Icon=vscodium Type=Application StartupNotify=true @@ -14,5 +14,5 @@ Keywords=vscode; [Desktop Action new-empty-window] Name=New Empty Window -Exec=/usr/lib/vscodium/vscodium --new-window %F +Exec=/usr/lib/vscodium/codium --new-window %F Icon=vscodium diff --git a/srcpkgs/vscodium-bin/template b/srcpkgs/vscodium-bin/template index dd4281f704b..4e2abf5eed6 100644 --- a/srcpkgs/vscodium-bin/template +++ b/srcpkgs/vscodium-bin/template @@ -1,6 +1,6 @@ # Template file for 'vscodium-bin' pkgname=vscodium-bin -version=1.33.0 +version=1.35.1 revision=1 archs="i686 x86_64" create_wrksrc=yes @@ -9,29 +9,32 @@ short_desc="Binary releases of VS Code without MS branding/telemetry/licensing" maintainer="shizonic " license="MIT" homepage="https://github.com/VSCodium/vscodium" -nostrip_files="vscodium" +nostrip_files="codium" if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then _archive="VSCodium-linux-x64-${version}.tar.gz" - checksum=388506a0bee87a72102bf20d32efaf18d6f5d29286bdda3684f63d87e63c646f + checksum=6f5bb7c0c65e35cb21d01e806e059d1595b2a89ba95478845cfcc9ec2ea6e714 else _archive="VSCodium-linux-ia32-${version}.tar.gz" - checksum=cd2e8dddbb5858bc796279f2727c4ee6794653ddd0b6b4316d05334d4c7f2648 + checksum=4350073b44c334c0870bb3f8397153375504f61bb3f06a6897c3c0c3fa14a744 fi distfiles="https://github.com/VSCodium/vscodium/releases/download/${version}/${_archive}" do_install() { + sed -i 's,/usr/share/codium,/usr/lib/vscodium,g' bin/codium + vmkdir usr/lib/vscodium vcopy * usr/lib/vscodium vmkdir usr/bin - ln -sf /usr/lib/vscodium/bin/vscodium ${DESTDIR}/usr/bin/ + ln -sf /usr/lib/vscodium/bin/codium ${DESTDIR}/usr/bin/codium + ln -sf /usr/lib/vscodium/bin/codium ${DESTDIR}/usr/bin/vscodium vmkdir usr/share/applications - vcopy ${FILESDIR}/vscodium.desktop usr/share/applications/ + vinstall ${FILESDIR}/vscodium.desktop 644 usr/share/applications vmkdir usr/share/pixmaps - ln -sf /usr/lib/vscodium/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/vscodium.png + vinstall resources/app/resources/linux/code.png 644 usr/share/pixmaps vscodium.png vlicense resources/app/LICENSE.txt } From 726d4cc32cd306601b434a4e24cc2ca9af01c982 Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Mon, 15 Jul 2019 09:01:50 +0200 Subject: [PATCH 3/5] vscodium-bin: update to 1.36.1. --- srcpkgs/vscodium-bin/template | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/srcpkgs/vscodium-bin/template b/srcpkgs/vscodium-bin/template index 4e2abf5eed6..31f5013283c 100644 --- a/srcpkgs/vscodium-bin/template +++ b/srcpkgs/vscodium-bin/template @@ -1,8 +1,8 @@ # Template file for 'vscodium-bin' pkgname=vscodium-bin -version=1.35.1 +version=1.36.1 revision=1 -archs="i686 x86_64" +archs="x86_64" create_wrksrc=yes depends="GConf libXtst libxkbfile nss dejavu-fonts-ttf" short_desc="Binary releases of VS Code without MS branding/telemetry/licensing" @@ -10,15 +10,8 @@ maintainer="shizonic " license="MIT" homepage="https://github.com/VSCodium/vscodium" nostrip_files="codium" - -if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then - _archive="VSCodium-linux-x64-${version}.tar.gz" - checksum=6f5bb7c0c65e35cb21d01e806e059d1595b2a89ba95478845cfcc9ec2ea6e714 -else - _archive="VSCodium-linux-ia32-${version}.tar.gz" - checksum=4350073b44c334c0870bb3f8397153375504f61bb3f06a6897c3c0c3fa14a744 -fi -distfiles="https://github.com/VSCodium/vscodium/releases/download/${version}/${_archive}" +checksum=f777f216fc5a73ac5efeb590fffec64e5cb346b0359c16a4705c58bae6fec4ab +distfiles="https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-linux-x64-${version}.tar.gz" do_install() { sed -i 's,/usr/share/codium,/usr/lib/vscodium,g' bin/codium From e8655c95232f5c62604bfd6a82b22ac192a2916b Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Mon, 9 Sep 2019 08:30:11 +0200 Subject: [PATCH 4/5] vscodium-bin: update to 1.38.0. --- common/shlibs | 1 + srcpkgs/vscode/template | 48 +++++++++++++++++------------------ srcpkgs/vscodium-bin/template | 12 ++++----- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/common/shlibs b/common/shlibs index 24ffaac9ed7..9d08253c40b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -128,6 +128,7 @@ libGLESv2.so keybase-desktop-3.1.2_1 libGLESv2.so riot-desktop-0.17.9_2 libGLESv2.so wire-desktop-3.6.2885_1 libGLESv2.so vscode-1.36.1_1 +libGLESv2.so vscodium-bin-1.38.0_1 libGLESv2.so Signal-Desktop-1.23.2_1 libGLESv2.so slack-desktop-3.4.2_1 libbrcmEGL.so rpi-userland-20180103_2 diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 5c40ed3eec9..8b3c78b77c2 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,7 +1,7 @@ # Template file for 'vscode' pkgname=vscode -version=1.36.1 -revision=2 +version=1.38.0 +revision=1 hostmakedepends="pkg-config python nodejs-lts yarn" makedepends="libxkbfile-devel libsecret-devel" depends="GConf libXtst libxkbfile nss dejavu-fonts-ttf" @@ -10,7 +10,7 @@ maintainer="shizonic " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=24b9f4046bd8ef7edb663429a58bf7dbe3acc22487a2946a4e5ead216415c065 +checksum=8306b05a7a521d15215248b311781aefa1b43fbc9f907425473b7fb81ef8c011 patch_args="-Np1" # Due to electron @@ -23,35 +23,35 @@ nostrip_files="code-oss" _mem_limit="--max_old_space_size=4095" case "$XBPS_TARGET_MACHINE" in - i686) broken="https://build.voidlinux.org/builders/i686_builder/builds/10486/steps/shell_3/logs/stdio" - _ARCH="ia32";; - x86_64) _ARCH="x64";; + i686) broken="https://build.voidlinux.org/builders/i686_builder/builds/10486/steps/shell_3/logs/stdio" + _ARCH="ia32";; + x86_64) _ARCH="x64";; esac pre_build() { - # Use yarn to install dependencies - echo "" > build/npm/preinstall.js + # Use yarn to install dependencies + echo "" > build/npm/preinstall.js } do_build() { - export NODE_OPTIONS="${_mem_limit}" - # Remove once nodejs-lts >= 10; see node-gyp issue 1457 and - # electron/node issue 64. - export npm_config_build_v8_with_gn="false" - export npm_config_enable_lto="false" + export NODE_OPTIONS="${_mem_limit}" + # Remove once nodejs-lts >= 10; see node-gyp issue 1457 and + # electron/node issue 64. + export npm_config_build_v8_with_gn="false" + export npm_config_enable_lto="false" - yarn install --ignore-engines --arch=${_ARCH} - yarn run gulp vscode-linux-${_ARCH}-min + yarn install --ignore-engines --arch=${_ARCH} + yarn run gulp vscode-linux-${_ARCH}-min } do_install() { - vmkdir usr/lib/code-oss - vcopy ../VSCode-linux-${_ARCH}/* usr/lib/code-oss - vmkdir usr/bin - ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/ - vmkdir usr/share/applications - ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop - vmkdir usr/share/pixmaps - ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png - vlicense LICENSE.txt + vmkdir usr/lib/code-oss + vcopy ../VSCode-linux-${_ARCH}/* usr/lib/code-oss + vmkdir usr/bin + ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/ + vmkdir usr/share/applications + ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop + vmkdir usr/share/pixmaps + ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png + vlicense LICENSE.txt } diff --git a/srcpkgs/vscodium-bin/template b/srcpkgs/vscodium-bin/template index 31f5013283c..03f1275213f 100644 --- a/srcpkgs/vscodium-bin/template +++ b/srcpkgs/vscodium-bin/template @@ -1,6 +1,6 @@ # Template file for 'vscodium-bin' pkgname=vscodium-bin -version=1.36.1 +version=1.38.0 revision=1 archs="x86_64" create_wrksrc=yes @@ -9,25 +9,25 @@ short_desc="Binary releases of VS Code without MS branding/telemetry/licensing" maintainer="shizonic " license="MIT" homepage="https://github.com/VSCodium/vscodium" -nostrip_files="codium" -checksum=f777f216fc5a73ac5efeb590fffec64e5cb346b0359c16a4705c58bae6fec4ab distfiles="https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-linux-x64-${version}.tar.gz" +checksum=6284e80286f91137fc862629c74acde17a5f97d9ec9688f1b89c4575ba2c3827 +nostrip_files="codium" do_install() { - sed -i 's,/usr/share/codium,/usr/lib/vscodium,g' bin/codium + sed -i 's,/usr/share/codium,/usr/lib/vscodium,g' bin/codium vmkdir usr/lib/vscodium vcopy * usr/lib/vscodium vmkdir usr/bin ln -sf /usr/lib/vscodium/bin/codium ${DESTDIR}/usr/bin/codium - ln -sf /usr/lib/vscodium/bin/codium ${DESTDIR}/usr/bin/vscodium + ln -sf /usr/lib/vscodium/bin/codium ${DESTDIR}/usr/bin/vscodium vmkdir usr/share/applications vinstall ${FILESDIR}/vscodium.desktop 644 usr/share/applications vmkdir usr/share/pixmaps - vinstall resources/app/resources/linux/code.png 644 usr/share/pixmaps vscodium.png + vinstall resources/app/resources/linux/code.png 644 usr/share/pixmaps vscodium.png vlicense resources/app/LICENSE.txt } From 1dc4713cda5b9e5137231820031912cdbca1278f Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Thu, 12 Sep 2019 12:53:28 +0200 Subject: [PATCH 5/5] vscodium-bin: update to 1.38.1. --- srcpkgs/vscodium-bin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vscodium-bin/template b/srcpkgs/vscodium-bin/template index 03f1275213f..63d1ca73384 100644 --- a/srcpkgs/vscodium-bin/template +++ b/srcpkgs/vscodium-bin/template @@ -1,6 +1,6 @@ # Template file for 'vscodium-bin' pkgname=vscodium-bin -version=1.38.0 +version=1.38.1 revision=1 archs="x86_64" create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="shizonic " license="MIT" homepage="https://github.com/VSCodium/vscodium" distfiles="https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-linux-x64-${version}.tar.gz" -checksum=6284e80286f91137fc862629c74acde17a5f97d9ec9688f1b89c4575ba2c3827 +checksum=8bf227d26b22537c733ade48876d9ef5f19e81a4eb0cd63cbfa3d78796aba796 nostrip_files="codium" do_install() {