pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vscode: fix extract phase



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Fri Oct 23 16:45:26 2026 +0200
Changeset:	cb98185c233f2b0d2dd36ffcc757f2fd752f698e

Modified Files:
	vscode/Makefile
	vscode/distinfo

Log Message:
vscode: fix extract phase

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb98185c233f2b0d2dd36ffcc757f2fd752f698e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vscode/Makefile | 26 +++++++++++++++++++++++++-
 vscode/distinfo | 12 ++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diffs:
diff --git a/vscode/Makefile b/vscode/Makefile
index 277fcc59a0..cf4bdf2ec4 100644
--- a/vscode/Makefile
+++ b/vscode/Makefile
@@ -17,7 +17,7 @@ COMMENT=		The Open Source build of Visual Studio Code (vscode) editor
 LICENSE=		mit
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		zip gmake pkg-config pax bash
+USE_TOOLS+=		zip gmake pkg-config pax bash tar
 
 USE_CXX_FEATURES+=	c++17
 USE_ELECTRON=		bundled
@@ -25,6 +25,7 @@ USE_ELECTRON=		bundled
 DEPENDS+=		ripgrep-[0-9]*:../../textproc/ripgrep
 
 .include "../../wip/electron43/platform.mk"
+.include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
@@ -86,22 +87,45 @@ ELECTRON_ZIP=		electron-v${ELECTRON_VER}-linux-${ELECTRON_ARCH}.zip
 RUN_ZIP_HASH=		sha256 -q ${WRKDIR}/.home/.cache/electron/${ELECTRON_URL_HASH}/${ELECTRON_ZIP}
 RUN_NODEJS_VER=		node --version
 NODEJS_VER=		${RUN_NODEJS_VER:sh}
+COPILOT_DIR=		${WRKSRC}/extensions/copilot/node_modules/@github/copilot-${LOWER_OPSYS}-${ELECTRON_ARCH}
+COPILOT_SDK_DIR=	${WRKSRC}/node_modules/@github/copilot-sdk-linux-${ELECTRON_ARCH}
+.if ${OPSYS} == "Linux"
+OS_PROXY_RESOLV_DIR=	${WRKSRC}/node_modules/@vscode/os-proxy-resolver-${LOWER_OPSYS}-${ELECTRON_ARCH}-gnu
+.else
+OS_PROXY_RESOLV_DIR=	${WRKSRC}/node_modules/@vscode/os-proxy-resolver-${LOWER_OPSYS}-${ELECTRON_ARCH}
+.endif
 
 NOT_PAX_MPROTECT_SAFE+=	lib/vscode/code-oss
 
 post-extract:
 	# Install script
 	${CP} ${FILESDIR}/code.sh.in ${WRKSRC}/code-oss.sh
+
 	# Set electron version
 	${SED} -i'' "s|^target=.*|target=\"${ELECTRON_VER}\"|" ${WRKSRC}/.npmrc
 	${SED} -i'' "s|^target=.*|target=\"${NODEJS_VER}\"|" ${WRKSRC}/remote/.npmrc
+
 	# Copy node modules to source tree
 	cd ${WRKDIR}/vscode-node_modules-${PKGVERSION_NOREV} && \
 		${FIND} . -type f -print | pax -rw -pmp ${WRKSRC}
+
 	# Create moduleignore file
 	${CP} ${WRKSRC}/build/.moduleignore.linux \
 		${WRKSRC}/build/.moduleignore.${LOWER_OPSYS}
 
+	# Extract copilot: doesn't work on BSDs, but need for build
+	${MKDIR} ${COPILOT_DIR} && cd ${WRKSRC} && \
+		${TAR} -xzf copilot-linux-${ELECTRON_ARCH}-*.tgz \
+		--strip-components 1 -C ${COPILOT_DIR}
+	${MKDIR} ${COPILOT_SDK_DIR} && cd ${WRKSRC} && \
+		${TAR} -xzf copilot-sdk-linux-${ELECTRON_ARCH}-*.tgz \
+		--strip-components 1 -C ${COPILOT_SDK_DIR}
+
+	# Extract os-proxy-resolver
+	${MKDIR} ${OS_PROXY_RESOLV_DIR} && cd ${WRKSRC} && \
+		${TAR} -xzf os-proxy-resolver-linux-${ELECTRON_ARCH}-gnu-*.tgz \
+		--strip-components 1 -C ${OS_PROXY_RESOLV_DIR}
+
 do-configure:
 	# vscode wants a zipped electron
 	${MKDIR} ${WRKDIR}/.home/.cache/electron/${ELECTRON_URL_HASH}
diff --git a/vscode/distinfo b/vscode/distinfo
index 8097b96686..5c3babd639 100644
--- a/vscode/distinfo
+++ b/vscode/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.82 2024/12/21 15:30:31 schwarz Exp $
 
-BLAKE2s (vscode-1.100.2.tar.gz) = be05e9071838d4f465c0aae811341ae8d3af6a6dd2c7aba73b82bf611572aed7
-SHA512 (vscode-1.100.2.tar.gz) = 4f29f29e2184d6369da4e89d67e2de51327a13b091be6dda90edd5c0ca56dae6c0b6c294137070248179077ddb7a71a5fd59480f9f3c161d8d58c69fc4111f02
-Size (vscode-1.100.2.tar.gz) = 22647395 bytes
-BLAKE2s (vscode-node_modules-1.100.2.tar.gz) = effb4efa7b6ec861d731befcc9aa47f44355f96301dee808b79696223993b00f
-SHA512 (vscode-node_modules-1.100.2.tar.gz) = a157049466f380d7696d5dff886d769c1b823086e719f0345b2df2c3cd57d5823f04518eec3cf7bc0c560cb993709f0742752f6fd8671e0bde0ba9d1dcb60236
-Size (vscode-node_modules-1.100.2.tar.gz) = 400488024 bytes
+BLAKE2s (vscode-1.142.0.tar.gz) = f90a31a21f0443216d0de85fda2e40c8863b0763dc9dc11b71beb47a2875d752
+SHA512 (vscode-1.142.0.tar.gz) = d86c75ef16eeb7d6292774d9fdab7d579ff8fc1332b2629f8a34a82e7dbfdb2cf4ebdfa1724f78ec7ad1b1905a09d64f3c62a219614ef5c4dc401191a3576e36
+Size (vscode-1.142.0.tar.gz) = 61345998 bytes
+BLAKE2s (vscode-node_modules-1.142.0.tar.gz) = 816acec4af91bf46d5c0d2b22306203386d51f634a238dcdc66fc2dd892354d7
+SHA512 (vscode-node_modules-1.142.0.tar.gz) = c1608133f99cfa1b5ded05757cdc807adb9fbc96ecd272962805f7d27eff102aa3d686e119db4c66d48693a723a0b33eaa73ae6af616bec87397ed9018c22b00
+Size (vscode-node_modules-1.142.0.tar.gz) = 1357774004 bytes
 SHA1 (patch-build_lib_layersChecker.ts) = f7e07c4bf5d4f58ea37383aef61af71e2357f22a
 SHA1 (patch-build_lib_propertyInitOrderChecker.ts) = 8559891b75b3c8d84bcabd90cd1e15d15a9e681b
 SHA1 (patch-build_lib_snapshotLoader.ts) = 7203f8fec3bd86684e85b70f00825aa69661156b


Home | Main Index | Thread Index | Old Index