Re: [PR PATCH] [Updated] New package: vscode-official-1.81.1

[endigma <endigma@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 951 bytes --]

There is an updated pull request by endigma against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/45669

New package: vscode-official-1.81.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (linux-x64-glibc)

#### Notes

This PR differs from `vscode` in that it isn't Code-OSS, which is required for some extensions and by extension workplaces and users. It is structured similarly to the `spotify`, `discord`, `teamspeak3` packages and is marked as `nonfree` and `restricted`.


A patch file from https://github.com/void-linux/void-packages/pull/45669.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-45669.patch --]
[-- Type: text/x-diff, Size: 6826 bytes --]

From 87b4ad0265fb96549c7eb99d385a1dffc4bb3ad6 Mon Sep 17 00:00:00 2001
From: endigma <endigma@mailcat.ca>
Date: Sat, 19 Aug 2023 09:54:31 -0300
Subject: [PATCH 1/4] New package: vscode-official-1.81.1

---
 .../files/code-url-handler.desktop            | 12 +++++++
 .../vscode-official/files/code-workspace.xml  |  7 ++++
 srcpkgs/vscode-official/files/code.desktop    | 18 ++++++++++
 srcpkgs/vscode-official/template              | 34 +++++++++++++++++++
 4 files changed, 71 insertions(+)
 create mode 100644 srcpkgs/vscode-official/files/code-url-handler.desktop
 create mode 100644 srcpkgs/vscode-official/files/code-workspace.xml
 create mode 100755 srcpkgs/vscode-official/files/code.desktop
 create mode 100644 srcpkgs/vscode-official/template

diff --git a/srcpkgs/vscode-official/files/code-url-handler.desktop b/srcpkgs/vscode-official/files/code-url-handler.desktop
new file mode 100644
index 0000000000000..cf3a83263d7c2
--- /dev/null
+++ b/srcpkgs/vscode-official/files/code-url-handler.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Visual Studio Code - URL Handler
+Comment=Code Editing. Redefined.
+GenericName=Text Editor
+Exec=/opt/code/code --open-url %U
+Icon=com.visualstudio.code
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=x-scheme-handler/vscode;
+Keywords=vscode;
diff --git a/srcpkgs/vscode-official/files/code-workspace.xml b/srcpkgs/vscode-official/files/code-workspace.xml
new file mode 100644
index 0000000000000..54c4d613af67f
--- /dev/null
+++ b/srcpkgs/vscode-official/files/code-workspace.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+	<mime-type type="application/x-code-workspace">
+		<comment>Visual Studio Code Workspace</comment>
+		<glob pattern="*.code-workspace"/>
+	</mime-type>
+</mime-info>
diff --git a/srcpkgs/vscode-official/files/code.desktop b/srcpkgs/vscode-official/files/code.desktop
new file mode 100755
index 0000000000000..c115aea9423ff
--- /dev/null
+++ b/srcpkgs/vscode-official/files/code.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=Visual Studio Code
+Comment=Code Editing. Redefined.
+GenericName=Text Editor
+Exec=/opt/code/code %F
+Icon=com.visualstudio.code
+Type=Application
+StartupNotify=false
+StartupWMClass=Code
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-code-workspace;
+Actions=new-empty-window;
+Keywords=vscode;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Exec=/usr/share/code/code --new-window %F
+Icon=com.visualstudio.code
diff --git a/srcpkgs/vscode-official/template b/srcpkgs/vscode-official/template
new file mode 100644
index 0000000000000..bbe93d2b485a9
--- /dev/null
+++ b/srcpkgs/vscode-official/template
@@ -0,0 +1,34 @@
+# Template file for 'vscode-official'
+pkgname=vscode-official
+version=1.81.1
+revision=1
+short_desc="Microsoft Visual Studio Code for Linux"
+maintainer="PWA <pwa@cya.cx>"
+license="MIT"
+nopie=yes
+makedepends="tar"
+wrksrc="VSCode-linux-x64"
+repository=nonfree
+homepage="https://code.visualstudio.com/"
+distfiles="https://update.code.visualstudio.com/${version}/linux-x64/stable>vscode-${version}.tar.gz"
+
+checksum=4ea6b0aaed22474027dc2678c774461b4bc3df1fcfbd0c918554e173a4af7448
+
+do_install() {
+	vmkdir opt/code
+
+	vcopy * opt/code/
+
+	vmkdir usr/bin
+    
+	vmkdir usr/share/applications
+
+	vinstall ${FILESDIR}/code.desktop 755 usr/share/applications/
+	vinstall ${FILESDIR}/code-url-handler.desktop 755 usr/share/applications/
+
+	chmod -R o-w ${DESTDIR}/opt/code/resources/app/
+}
+
+post_install() {
+    ln -sf /opt/code/bin/code $DESTDIR/usr/bin/code
+}

From 95ec414663863e66910b325985b6140b4be1cff0 Mon Sep 17 00:00:00 2001
From: endigma <endigma@mailcat.ca>
Date: Sun, 20 Aug 2023 17:10:45 -0300
Subject: [PATCH 2/4] Mark restricted

---
 srcpkgs/vscode-official/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/vscode-official/template b/srcpkgs/vscode-official/template
index bbe93d2b485a9..b490efde40254 100644
--- a/srcpkgs/vscode-official/template
+++ b/srcpkgs/vscode-official/template
@@ -8,6 +8,7 @@ license="MIT"
 nopie=yes
 makedepends="tar"
 wrksrc="VSCode-linux-x64"
+restricted=yes
 repository=nonfree
 homepage="https://code.visualstudio.com/"
 distfiles="https://update.code.visualstudio.com/${version}/linux-x64/stable>vscode-${version}.tar.gz"

From eb11d973d72d56e827a66c391d1792a120ee5e20 Mon Sep 17 00:00:00 2001
From: endigma <endigma@mailcat.ca>
Date: Sun, 20 Aug 2023 17:20:30 -0300
Subject: [PATCH 3/4] Fix linter errors

---
 srcpkgs/vscode-official/template | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/vscode-official/template b/srcpkgs/vscode-official/template
index b490efde40254..6ef567dceff8f 100644
--- a/srcpkgs/vscode-official/template
+++ b/srcpkgs/vscode-official/template
@@ -2,16 +2,15 @@
 pkgname=vscode-official
 version=1.81.1
 revision=1
-short_desc="Microsoft Visual Studio Code for Linux"
-maintainer="PWA <pwa@cya.cx>"
-license="MIT"
-nopie=yes
 makedepends="tar"
-wrksrc="VSCode-linux-x64"
-restricted=yes
-repository=nonfree
+short_desc="Microsoft Visual Studio Code for Linux"
+maintainer="endigma <endigma@mailcat.ca>"
+license="custom:Proprietary"
 homepage="https://code.visualstudio.com/"
 distfiles="https://update.code.visualstudio.com/${version}/linux-x64/stable>vscode-${version}.tar.gz"
+repository=nonfree
+restricted=yes
+nopie=yes
 
 checksum=4ea6b0aaed22474027dc2678c774461b4bc3df1fcfbd0c918554e173a4af7448
 
@@ -21,15 +20,18 @@ do_install() {
 	vcopy * opt/code/
 
 	vmkdir usr/bin
-    
+
 	vmkdir usr/share/applications
 
 	vinstall ${FILESDIR}/code.desktop 755 usr/share/applications/
 	vinstall ${FILESDIR}/code-url-handler.desktop 755 usr/share/applications/
 
+	# No plaintext licenses in tarball
+	# vlicense ${FILESDIR}/LICENSE
+
 	chmod -R o-w ${DESTDIR}/opt/code/resources/app/
 }
 
 post_install() {
-    ln -sf /opt/code/bin/code $DESTDIR/usr/bin/code
+	ln -sf /opt/code/bin/code $DESTDIR/usr/bin/code
 }

From 4c3c1f1e20e11584363dcb4b3e8178beb89a4217 Mon Sep 17 00:00:00 2001
From: endigma <endigma@mailcat.ca>
Date: Sun, 20 Aug 2023 17:21:38 -0300
Subject: [PATCH 4/4] Add `nostrip=yes`

---
 srcpkgs/vscode-official/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/vscode-official/template b/srcpkgs/vscode-official/template
index 6ef567dceff8f..1f4a22cdeae25 100644
--- a/srcpkgs/vscode-official/template
+++ b/srcpkgs/vscode-official/template
@@ -11,6 +11,7 @@ distfiles="https://update.code.visualstudio.com/${version}/linux-x64/stable>vsco
 repository=nonfree
 restricted=yes
 nopie=yes
+nostrip=yes
 
 checksum=4ea6b0aaed22474027dc2678c774461b4bc3df1fcfbd0c918554e173a4af7448