wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vscode: unbreak.

Browse source
This commit is contained in:
Toby Merz 2019-01-21 09:10:03 +01:00 • committed by maxice8
parent 84b09abed3
commit e82ed01104
4 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
srcpkgs/vscode/REMOVE
View file

@ -1,6 +1,9 @@
if [ "$UPDATE" = "no" ]; then if [ "$UPDATE" = "no" ]; then
case "$ACTION" in case "$ACTION" in
post) post)
if [ -d usr/lib/code-oss ]; then
rm -rf usr/lib/code-oss
fi
if [ -d usr/share/code-oss ]; then if [ -d usr/share/code-oss ]; then
rm -rf usr/share/code-oss rm -rf usr/share/code-oss
fi fi

12
srcpkgs/vscode/patches/fix_dir.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
index 55f50b6f1c14..16b73343e6ea 100755
--- a/resources/linux/bin/code.sh
+++ b/resources/linux/bin/code.sh
@@ -26,7 +26,7 @@ else
VSCODE_PATH="$(dirname $(readlink -f $0))/.."
else
# else use the standard install location
- VSCODE_PATH="/usr/share/@@NAME@@"
+ VSCODE_PATH="/usr/lib/@@NAME@@"
fi
fi

4
srcpkgs/vscode/patches/libgl.patch
View file

@ -22,7 +22,7 @@ index f93060d565bd..d511dd86489d 100644
Comment=Code Editing. Redefined. Comment=Code Editing. Redefined.
GenericName=Text Editor GenericName=Text Editor
-Exec=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F -Exec=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F
+Exec=/usr/bin/sh -c '[ -e "${HOME}/.config/Code - OSS/.libgl_always_software" ] && export LIBGL_ALWAYS_SOFTWARE=1; /usr/share/@@NAME@@/@@NAME@@ --unity-launch %F' +Exec=/usr/bin/sh -c '[ -e "${HOME}/.config/Code - OSS/.libgl_always_software" ] && export LIBGL_ALWAYS_SOFTWARE=1; /usr/lib/@@NAME@@/@@NAME@@ --unity-launch %F'
Icon=@@ICON@@ Icon=@@ICON@@
Type=Application Type=Application
StartupNotify=true StartupNotify=true
@ -31,5 +31,5 @@ index f93060d565bd..d511dd86489d 100644
[Desktop Action new-empty-window] [Desktop Action new-empty-window]
Name=New Empty Window Name=New Empty Window
-Exec=/usr/share/@@NAME@@/@@NAME@@ --new-window %F -Exec=/usr/share/@@NAME@@/@@NAME@@ --new-window %F
+Exec=/usr/bin/sh -c '[ -e "${HOME}/.config/Code - OSS/.libgl_always_software" ] && export LIBGL_ALWAYS_SOFTWARE=1; /usr/share/@@NAME@@/@@NAME@@ --new-window %F' +Exec=/usr/bin/sh -c '[ -e "${HOME}/.config/Code - OSS/.libgl_always_software" ] && export LIBGL_ALWAYS_SOFTWARE=1; /usr/lib/@@NAME@@/@@NAME@@ --new-window %F'
Icon=@@ICON@@ Icon=@@ICON@@

7
srcpkgs/vscode/template
View file

@ -12,7 +12,6 @@ homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
checksum=7bf1c9c3c2814146906a6e38188d2f3284e128929e27c2c2dd0bcd7c6422be5e checksum=7bf1c9c3c2814146906a6e38188d2f3284e128929e27c2c2dd0bcd7c6422be5e
patch_args="-Np1" patch_args="-Np1"
broken="https://build.voidlinux.org/builders/x86_64_builder/builds/14182/steps/shell_3/logs/stdio"
# Due to electron # Due to electron
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
@ -41,10 +40,10 @@ do_build() {
} }
do_install() { do_install() {
vmkdir usr/share/code-oss vmkdir usr/lib/code-oss
vcopy ../VSCode-linux-${_ARCH}/* usr/share/code-oss vcopy ../VSCode-linux-${_ARCH}/* usr/lib/code-oss
vmkdir usr/bin vmkdir usr/bin
ln -sf /usr/share/code-oss/bin/code-oss ${DESTDIR}/usr/bin/ ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
vmkdir usr/share/applications vmkdir usr/share/applications
ln -sf /usr/share/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop ln -sf /usr/share/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
vmkdir usr/share/pixmaps vmkdir usr/share/pixmaps