diff options
Diffstat (limited to 'editors')
6 files changed, 81 insertions, 13 deletions
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index bc4b226d64bf..bc6c46e5efd6 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,5 +1,5 @@ PORTNAME= vscode -DISTVERSION= 1.101.1 +DISTVERSION= 1.101.2 PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules @@ -69,7 +69,7 @@ USES= desktop-file-utils gl gmake gnome gssapi:mit iconv:wchar_t \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 18e3a1ec544e6907be1e944a94c496e302073435 +SOURCE_COMMIT_HASH= 2901c5ac6db8a986a5666c3af51ff804d05af0d4 BINARY_ALIAS= python=${PYTHON_CMD} diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 6abb2ca8eea5..c39714bbf8fa 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1750365794 -SHA256 (vscode/vscode-node-modules-1.101.1.tar.gz) = 7fdee8be7622f42be9d0658076c0d8c077d79a86250eda38d97dcda98111d1a7 -SIZE (vscode/vscode-node-modules-1.101.1.tar.gz) = 395119485 -SHA256 (vscode/vscode-marketplace-exts-1.101.1.tar.gz) = 13c6bd8b7ca7535e6ae1fa5178f56a703b1de7a484ff01d60931a692ec1924c5 -SIZE (vscode/vscode-marketplace-exts-1.101.1.tar.gz) = 1708576 -SHA256 (vscode/microsoft-vscode-1.101.1_GH0.tar.gz) = fc015daead5b5a14422944af9b04eb241c78d5b7273888c46bb184d6651a7a2b -SIZE (vscode/microsoft-vscode-1.101.1_GH0.tar.gz) = 22852405 +TIMESTAMP = 1750968241 +SHA256 (vscode/vscode-node-modules-1.101.2.tar.gz) = 84aab8d4b3f220ea94c9533c33be10fb66c518cdb2e0b643f563319cc4d39533 +SIZE (vscode/vscode-node-modules-1.101.2.tar.gz) = 395151117 +SHA256 (vscode/vscode-marketplace-exts-1.101.2.tar.gz) = 49e723dbfff85988adbb55815b0bcf5632449d3bb16a4a578b7caf9f4d468c26 +SIZE (vscode/vscode-marketplace-exts-1.101.2.tar.gz) = 1714638 +SHA256 (vscode/microsoft-vscode-1.101.2_GH0.tar.gz) = d65d04e68ae04a372b1c6b13d0e8a72e2c919e491d4c3b2dcf997b22fc25a509 +SIZE (vscode/microsoft-vscode-1.101.2_GH0.tar.gz) = 22853707 diff --git a/editors/vscode/files/patch-node__modules_kerberos_binding.gyp b/editors/vscode/files/patch-node__modules_kerberos_binding.gyp index 8d5f1b08f7db..98d1ff149173 100644 --- a/editors/vscode/files/patch-node__modules_kerberos_binding.gyp +++ b/editors/vscode/files/patch-node__modules_kerberos_binding.gyp @@ -1,4 +1,4 @@ ---- node_modules/kerberos/binding.gyp.orig 2025-06-12 22:34:24 UTC +--- node_modules/kerberos/binding.gyp.orig 2025-06-26 19:59:03 UTC +++ node_modules/kerberos/binding.gyp @@ -54,14 +54,14 @@ ] @@ -17,7 +17,7 @@ 'link_settings': { 'libraries': [ '-lkrb5', -@@ -78,7 +78,7 @@ +@@ -78,11 +78,21 @@ }] ] }], @@ -26,3 +26,17 @@ 'defines': ['KERBEROS_USE_RTLD=1'], 'link_settings': { 'libraries': [ + '-ldl', ++ ] ++ }, ++ }], ++ ['OS=="freebsd"', { ++ 'include_dirs+': [ ++ '<!(pkg-config krb5 --cflags-only-I | sed -E "s/(-I *|-isystem *)//g")', ++ ], ++ 'link_settings': { ++ 'library_dirs': [ ++ '<!(pkg-config krb5 --libs-only-L | sed -e "s/-L//g")', + ] + }, + }], diff --git a/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc b/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc new file mode 100644 index 000000000000..4ee74c9e7851 --- /dev/null +++ b/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc @@ -0,0 +1,20 @@ +--- node_modules/kerberos/src/unix/kerberos_gss.cc.orig 2025-06-26 20:14:32 UTC ++++ node_modules/kerberos/src/unix/kerberos_gss.cc +@@ -65,10 +65,17 @@ struct DLOpenHandle { + DLOpenHandle& operator=(DLOpenHandle&) = delete; + }; + ++#ifndef __FreeBSD__ + #define DYLIBS(V) \ + V(gssapi, "libgssapi_krb5.so.2") \ + V(krb5, "libkrb5.so.3") \ + V(comerr, "libcom_err.so.2") ++#else ++#define DYLIBS(V) \ ++ V(gssapi, "libgssapi_krb5.so.2") \ ++ V(krb5, "libkrb5.so.3") \ ++ V(comerr, "libcom_err.so.3") ++#endif + + #define LIBRARY_HANDLE_GETTER(name, lib) \ + static const DLOpenHandle& name ## _handle() { \ diff --git a/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp b/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp index 6f7857f33b31..c45e3b1a359c 100644 --- a/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp +++ b/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp @@ -1,4 +1,4 @@ ---- remote/node_modules/kerberos/binding.gyp.orig 2025-06-12 22:38:39 UTC +--- remote/node_modules/kerberos/binding.gyp.orig 2025-06-26 20:01:28 UTC +++ remote/node_modules/kerberos/binding.gyp @@ -54,14 +54,14 @@ ] @@ -17,7 +17,7 @@ 'link_settings': { 'libraries': [ '-lkrb5', -@@ -78,7 +78,7 @@ +@@ -78,11 +78,21 @@ }] ] }], @@ -26,3 +26,17 @@ 'defines': ['KERBEROS_USE_RTLD=1'], 'link_settings': { 'libraries': [ + '-ldl', ++ ] ++ }, ++ }], ++ ['OS=="freebsd"', { ++ 'include_dirs+': [ ++ '<!(pkg-config krb5 --cflags-only-I | sed -E "s/(-I *|-isystem *)//g")', ++ ], ++ 'link_settings': { ++ 'library_dirs': [ ++ '<!(pkg-config krb5 --libs-only-L | sed -e "s/-L//g")', + ] + }, + }], diff --git a/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc b/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc new file mode 100644 index 000000000000..be4c95e3d422 --- /dev/null +++ b/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc @@ -0,0 +1,20 @@ +--- remote/node_modules/kerberos/src/unix/kerberos_gss.cc.orig 2025-06-26 20:17:25 UTC ++++ remote/node_modules/kerberos/src/unix/kerberos_gss.cc +@@ -65,10 +65,17 @@ struct DLOpenHandle { + DLOpenHandle& operator=(DLOpenHandle&) = delete; + }; + ++#ifndef __FreeBSD__ + #define DYLIBS(V) \ + V(gssapi, "libgssapi_krb5.so.2") \ + V(krb5, "libkrb5.so.3") \ + V(comerr, "libcom_err.so.2") ++#else ++#define DYLIBS(V) \ ++ V(gssapi, "libgssapi_krb5.so.2") \ ++ V(krb5, "libkrb5.so.3") \ ++ V(comerr, "libcom_err.so.3") ++#endif + + #define LIBRARY_HANDLE_GETTER(name, lib) \ + static const DLOpenHandle& name ## _handle() { \ |