Compare commits
2 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
|
1cdc39e8f0 | ||
|
|
9dbc3cbbe5 |
BIN
element-desktop-1.12.2.tar.gz
LFS
BIN
element-desktop-1.12.2.tar.gz
LFS
Binary file not shown.
BIN
element-desktop-1.12.3.tar.gz
LFS
Normal file
BIN
element-desktop-1.12.3.tar.gz
LFS
Normal file
Binary file not shown.
@@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 27 10:56:34 UTC 2025 - Dominik Heidler <dheidler@suse.de>
|
||||
|
||||
- Fix no-walrus-operator.patch for 15.6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 24 13:48:48 UTC 2025 - Dominik Heidler <dheidler@suse.de>
|
||||
|
||||
- Remove fix-oxc-resolver.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 24 12:13:00 UTC 2025 - Dominik Heidler <dheidler@suse.de>
|
||||
|
||||
- Version 1.12.3
|
||||
## 🦖 Deprecations
|
||||
|
||||
* Remove allowVoipWithNoMedia feature flag (https://github.com/element-hq/element-web/pull/31087). Contributed by @Half-Shot.
|
||||
|
||||
## ✨ Features
|
||||
|
||||
* Change module API to be an instance getter (https://github.com/element-hq/element-web/pull/31025). Contributed by @dbkr.
|
||||
|
||||
## 🐛 Bug Fixes
|
||||
|
||||
* Wait for Electron to be ready before we fire syntax error dialog (https://github.com/element-hq/element-desktop/pull/2659). Contributed by @t3chguy.
|
||||
* Show hover elements when keyboard focus is within an event tile (https://github.com/element-hq/element-web/pull/31078). Contributed by @t3chguy.
|
||||
* Ensure toolbar navigation pattern works in MessageActionBar (https://github.com/element-hq/element-web/pull/31080). Contributed by @t3chguy.
|
||||
* Ensure sent markers are hidden when showing thread summary. (https://github.com/element-hq/element-web/pull/31076). Contributed by @Half-Shot.
|
||||
* Fix translation in dev mode (https://github.com/element-hq/element-web/pull/31045). Contributed by @florianduros.
|
||||
* Fix sort order in space hierarchy (https://github.com/element-hq/element-web/pull/30975). Contributed by @t3chguy.
|
||||
* New Room list: don't display message preview of thread (https://github.com/element-hq/element-web/pull/31043). Contributed by @florianduros.
|
||||
* Revert "A11y: move focus to right panel when opened" (https://github.com/element-hq/element-web/pull/30999). Contributed by @florianduros.
|
||||
* Fix highlights in messages (or search results) breaking links (https://github.com/element-hq/element-web/pull/30264). Contributed by @bojidar-bg.
|
||||
* Add prepare script (https://github.com/element-hq/element-web/pull/31030). Contributed by @dbkr.
|
||||
* Fix html exports by adding SDKContext (https://github.com/element-hq/element-web/pull/30987). Contributed by @t3chguy.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 22 10:39:01 UTC 2025 - Dominik Heidler <dheidler@suse.de>
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: element-desktop
|
||||
Version: 1.12.2
|
||||
Version: 1.12.3
|
||||
Release: 0
|
||||
Summary: A glossy Matrix collaboration client - desktop
|
||||
License: AGPL-3.0-only OR GPL-3.0-only
|
||||
@@ -34,8 +34,7 @@ Patch2: cc-link-lib-no-static.patch
|
||||
Patch3: remove-fuses.patch
|
||||
Patch4: no-walrus-operator.patch
|
||||
Patch5: break-esbuild-for-good.patch
|
||||
Patch6: fix-oxc-resolver.patch
|
||||
Patch7: no-install-app-deps.patch
|
||||
Patch6: no-install-app-deps.patch
|
||||
BuildRequires: app-builder
|
||||
BuildRequires: cargo
|
||||
BuildRequires: element-web = %{version}
|
||||
@@ -45,6 +44,7 @@ BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: jq
|
||||
BuildRequires: nodejs-electron-devel
|
||||
BuildRequires: zstd
|
||||
BuildRequires: yarn
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: rust-srpm-macros
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -ru a/node_modules/oxc-resolver/package.json b/node_modules/oxc-resolver/package.json
|
||||
--- a/node_modules/oxc-resolver/package.json 2025-08-11 22:18:51.515000000 +0200
|
||||
+++ b/node_modules/oxc-resolver/package.json 2025-08-11 22:13:37.448368507 +0200
|
||||
@@ -24,7 +24,6 @@
|
||||
"test": "vitest run -r ./napi",
|
||||
"build:debug": "napi build --platform --manifest-path napi/Cargo.toml",
|
||||
"build": "pnpm run build:debug --features allocator --release",
|
||||
- "postinstall": "napi-postinstall oxc-resolver 11.8.4 check",
|
||||
"postbuild:debug": "node napi/patch.mjs"
|
||||
},
|
||||
"dependencies": {
|
||||
@@ -1,5 +1,6 @@
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/common.py 2025-10-21 23:01:35.829999000 +0200
|
||||
+++ common.py 2025-10-22 11:49:43.867482064 +0200
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/common.py node_modules/node-gyp/gyp/pylib/gyp/common.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/common.py 2025-11-27 11:42:41.671735777 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/common.py 2025-11-27 11:42:52.856758053 +0100
|
||||
@@ -429,13 +429,17 @@
|
||||
def replace_sep(s):
|
||||
return s.replace(os.sep, "/") if os.sep != "/" else s
|
||||
@@ -22,3 +23,376 @@
|
||||
cmd += shlex.split(replace_sep(CXXFLAGS))
|
||||
else:
|
||||
return defines
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py node_modules/node-gyp/gyp/pylib/gyp/generator/android.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/generator/android.py 2025-11-27 11:45:59.779439170 +0100
|
||||
@@ -898,7 +898,8 @@
|
||||
if self.type != "none":
|
||||
self.WriteTargetFlags(spec, configs, link_deps)
|
||||
|
||||
- if settings := spec.get("aosp_build_settings", {}):
|
||||
+ settings = spec.get("aosp_build_settings", {})
|
||||
+ if settings:
|
||||
self.WriteLn("### Set directly by aosp_build_settings.")
|
||||
for k, v in settings.items():
|
||||
if isinstance(v, list):
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py 2025-11-27 11:47:16.244745837 +0100
|
||||
@@ -809,7 +809,8 @@
|
||||
# link directories to targets defined after it is called.
|
||||
# As a result, link_directories must come before the target definition.
|
||||
# CMake unfortunately has no means of removing entries from LINK_DIRECTORIES.
|
||||
- if (library_dirs := config.get("library_dirs")) is not None:
|
||||
+ library_dirs = config.get("library_dirs")
|
||||
+ if library_dirs is not None:
|
||||
output.write("link_directories(")
|
||||
for library_dir in library_dirs:
|
||||
output.write(" ")
|
||||
@@ -1293,7 +1294,8 @@
|
||||
|
||||
|
||||
def GenerateOutput(target_list, target_dicts, data, params):
|
||||
- if user_config := params.get("generator_flags", {}).get("config", None):
|
||||
+ user_config = params.get("generator_flags", {}).get("config", None)
|
||||
+ if user_config:
|
||||
GenerateOutputForConfig(target_list, target_dicts, data, params, user_config)
|
||||
else:
|
||||
config_names = target_dicts[target_list[0]]["configurations"]
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py 2025-11-27 11:47:48.905711700 +0100
|
||||
@@ -451,7 +451,8 @@
|
||||
if params["options"].generator_output:
|
||||
raise NotImplementedError("--generator_output not implemented for eclipse")
|
||||
|
||||
- if user_config := params.get("generator_flags", {}).get("config", None):
|
||||
+ user_config = params.get("generator_flags", {}).get("config", None)
|
||||
+ if user_config:
|
||||
GenerateOutputForConfig(target_list, target_dicts, data, params, user_config)
|
||||
else:
|
||||
config_names = target_dicts[target_list[0]]["configurations"]
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/generator/make.py 2025-11-27 11:48:30.350337838 +0100
|
||||
@@ -1471,7 +1471,8 @@
|
||||
order_only=True,
|
||||
)
|
||||
|
||||
- if pchdeps := precompiled_header.GetObjDependencies(compilable, objs):
|
||||
+ pchdeps = precompiled_header.GetObjDependencies(compilable, objs)
|
||||
+ if pchdeps:
|
||||
self.WriteLn("# Dependencies from obj files to their precompiled headers")
|
||||
for source, obj, gch in pchdeps:
|
||||
self.WriteLn(f"{obj}: {gch}")
|
||||
@@ -1607,7 +1608,8 @@
|
||||
|
||||
target_prefix = spec.get("product_prefix", target_prefix)
|
||||
target = spec.get("product_name", target)
|
||||
- if product_ext := spec.get("product_extension"):
|
||||
+ product_ext = spec.get("product_extension")
|
||||
+ if product_ext:
|
||||
target_ext = "." + product_ext
|
||||
|
||||
return target_prefix + target + target_ext
|
||||
@@ -1744,7 +1746,8 @@
|
||||
# into the link command, so we need lots of escaping.
|
||||
ldflags.append(r"-Wl,-rpath=\$$ORIGIN/")
|
||||
ldflags.append(r"-Wl,-rpath-link=\$(builddir)/")
|
||||
- if library_dirs := config.get("library_dirs", []):
|
||||
+ library_dirs = config.get("library_dirs", [])
|
||||
+ if library_dirs:
|
||||
library_dirs = [Sourceify(self.Absolutify(i)) for i in library_dirs]
|
||||
ldflags += [("-L%s" % library_dir) for library_dir in library_dirs]
|
||||
self.WriteList(ldflags, "LDFLAGS_%s" % configname)
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py 2025-11-27 11:49:26.160633440 +0100
|
||||
@@ -1362,7 +1362,8 @@
|
||||
Returns:
|
||||
A string with the extension, or None
|
||||
"""
|
||||
- if target_extension := spec.get("product_extension"):
|
||||
+ target_extension = spec.get("product_extension")
|
||||
+ if target_extension:
|
||||
return "." + target_extension
|
||||
return None
|
||||
|
||||
@@ -3167,7 +3168,8 @@
|
||||
"windows_driver": "Link",
|
||||
"static_library": "Lib",
|
||||
}
|
||||
- if msbuild_tool := msbuild_tool_map.get(spec["type"]):
|
||||
+ msbuild_tool = msbuild_tool_map.get(spec["type"])
|
||||
+ if msbuild_tool:
|
||||
msbuild_settings = config["finalized_msbuild_settings"]
|
||||
out_file = msbuild_settings[msbuild_tool].get("OutputFile")
|
||||
if out_file:
|
||||
@@ -3184,7 +3186,8 @@
|
||||
# there are actions.
|
||||
# TODO(jeanluc) Handle the equivalent of setting 'CYGWIN=nontsec'.
|
||||
new_paths = []
|
||||
- if cygwin_dirs := spec.get("msvs_cygwin_dirs", ["."])[0]:
|
||||
+ cygwin_dirs = spec.get("msvs_cygwin_dirs", ["."])[0]
|
||||
+ if cygwin_dirs:
|
||||
cyg_path = "$(MSBuildProjectDirectory)\\%s\\bin\\" % _FixPath(cygwin_dirs)
|
||||
new_paths.append(cyg_path)
|
||||
# TODO(jeanluc) Change the convention to have both a cygwin_dir and a
|
||||
@@ -3406,7 +3409,8 @@
|
||||
msbuild_settings, "ClCompile", "DisableSpecificWarnings", disabled_warnings
|
||||
)
|
||||
# Turn on precompiled headers if appropriate.
|
||||
- if precompiled_header := configuration.get("msvs_precompiled_header"):
|
||||
+ precompiled_header = configuration.get("msvs_precompiled_header")
|
||||
+ if precompiled_header:
|
||||
# While MSVC works with just file name eg. "v8_pch.h", ClangCL requires
|
||||
# the full path eg. "tools/msvs/pch/v8_pch.h" to find the file.
|
||||
# P.S. Only ClangCL defines msbuild_toolset, for MSVC it is None.
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py 2025-11-27 11:51:01.937538138 +0100
|
||||
@@ -264,7 +264,8 @@
|
||||
dir.
|
||||
"""
|
||||
|
||||
- if (PRODUCT_DIR := "$!PRODUCT_DIR") in path:
|
||||
+ PRODUCT_DIR = "$!PRODUCT_DIR"
|
||||
+ if PRODUCT_DIR in path:
|
||||
if product_dir:
|
||||
path = path.replace(PRODUCT_DIR, product_dir)
|
||||
else:
|
||||
@@ -272,7 +273,8 @@
|
||||
path = path.replace(PRODUCT_DIR + "\\", "")
|
||||
path = path.replace(PRODUCT_DIR, ".")
|
||||
|
||||
- if (INTERMEDIATE_DIR := "$!INTERMEDIATE_DIR") in path:
|
||||
+ INTERMEDIATE_DIR = "$!INTERMEDIATE_DIR"
|
||||
+ if INTERMEDIATE_DIR in path:
|
||||
int_dir = self.GypPathToUniqueOutput("gen")
|
||||
# GypPathToUniqueOutput generates a path relative to the product dir,
|
||||
# so insert product_dir in front if it is provided.
|
||||
@@ -2073,14 +2075,16 @@
|
||||
|
||||
|
||||
def CommandWithWrapper(cmd, wrappers, prog):
|
||||
- if wrapper := wrappers.get(cmd, ""):
|
||||
+ wrapper = wrappers.get(cmd, "")
|
||||
+ if wrapper:
|
||||
return wrapper + " " + prog
|
||||
return prog
|
||||
|
||||
|
||||
def GetDefaultConcurrentLinks():
|
||||
"""Returns a best-guess for a number of concurrent links."""
|
||||
- if pool_size := int(os.environ.get("GYP_LINK_CONCURRENCY") or 0):
|
||||
+ pool_size = int(os.environ.get("GYP_LINK_CONCURRENCY") or 0)
|
||||
+ if pool_size:
|
||||
return pool_size
|
||||
|
||||
if sys.platform in ("win32", "cygwin"):
|
||||
@@ -2300,7 +2304,8 @@
|
||||
key_prefix = re.sub(r"\.HOST$", ".host", key_prefix)
|
||||
wrappers[key_prefix] = os.path.join(build_to_root, value)
|
||||
|
||||
- if mac_toolchain_dir := generator_flags.get("mac_toolchain_dir", None):
|
||||
+ mac_toolchain_dir = generator_flags.get("mac_toolchain_dir", None)
|
||||
+ if mac_toolchain_dir:
|
||||
wrappers["LINK"] = "export DEVELOPER_DIR='%s' &&" % mac_toolchain_dir
|
||||
|
||||
if flavor == "win":
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/__init__.py node_modules/node-gyp/gyp/pylib/gyp/__init__.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/__init__.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/__init__.py 2025-11-27 12:02:47.037251013 +0100
|
||||
@@ -4,7 +4,6 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
-from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import copy
|
||||
@@ -26,7 +25,7 @@
|
||||
DEBUG_INCLUDES = "includes"
|
||||
|
||||
|
||||
-def EscapeForCString(string: bytes | str) -> str:
|
||||
+def EscapeForCString(string):
|
||||
if isinstance(string, str):
|
||||
string = string.encode(encoding="utf8")
|
||||
|
||||
@@ -208,7 +207,8 @@
|
||||
|
||||
|
||||
def ShlexEnv(env_name):
|
||||
- if flags := os.environ.get(env_name) or []:
|
||||
+ flags = os.environ.get(env_name) or []
|
||||
+ if flags:
|
||||
flags = shlex.split(flags)
|
||||
return flags
|
||||
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py 2025-11-27 11:51:24.318475126 +0100
|
||||
@@ -24,7 +24,8 @@
|
||||
|
||||
def main(args):
|
||||
executor = MacTool()
|
||||
- if (exit_code := executor.Dispatch(args)) is not None:
|
||||
+ exit_code = executor.Dispatch(args)
|
||||
+ if exit_code is not None:
|
||||
sys.exit(exit_code)
|
||||
|
||||
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py 2025-11-27 11:52:44.183962408 +0100
|
||||
@@ -622,7 +622,8 @@
|
||||
def _GetDefFileAsLdflags(self, ldflags, gyp_to_build_path):
|
||||
""".def files get implicitly converted to a ModuleDefinitionFile for the
|
||||
linker in the VS generator. Emulate that behaviour here."""
|
||||
- if def_file := self.GetDefFile(gyp_to_build_path):
|
||||
+ def_file = self.GetDefFile(gyp_to_build_path)
|
||||
+ if def_file:
|
||||
ldflags.append('/DEF:"%s"' % def_file)
|
||||
|
||||
def GetPGDName(self, config, expand_special):
|
||||
@@ -670,11 +671,14 @@
|
||||
)
|
||||
ld("DelayLoadDLLs", prefix="/DELAYLOAD:")
|
||||
ld("TreatLinkerWarningAsErrors", prefix="/WX", map={"true": "", "false": ":NO"})
|
||||
- if out := self.GetOutputName(config, expand_special):
|
||||
+ out = self.GetOutputName(config, expand_special)
|
||||
+ if out:
|
||||
ldflags.append("/OUT:" + out)
|
||||
- if pdb := self.GetPDBName(config, expand_special, output_name + ".pdb"):
|
||||
+ pdb = self.GetPDBName(config, expand_special, output_name + ".pdb")
|
||||
+ if pdb:
|
||||
ldflags.append("/PDB:" + pdb)
|
||||
- if pgd := self.GetPGDName(config, expand_special):
|
||||
+ pgd = self.GetPGDName(config, expand_special)
|
||||
+ if pgd:
|
||||
ldflags.append("/PGD:" + pgd)
|
||||
map_file = self.GetMapFileName(config, expand_special)
|
||||
ld("GenerateMapFile", map={"true": "/MAP:" + map_file if map_file else "/MAP"})
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings.py node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings.py 2025-11-27 11:44:55.168345970 +0100
|
||||
@@ -396,7 +396,8 @@
|
||||
# This may be unrecognized because it's an exclusion list. If the
|
||||
# setting name has the _excluded suffix, then check the root name.
|
||||
unrecognized = True
|
||||
- if m := re.match(_EXCLUDED_SUFFIX_RE, setting):
|
||||
+ m = re.match(_EXCLUDED_SUFFIX_RE, setting)
|
||||
+ if m:
|
||||
root_setting = m.group(1)
|
||||
unrecognized = root_setting not in settings
|
||||
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py 2025-11-27 11:45:12.610343686 +0100
|
||||
@@ -553,7 +553,8 @@
|
||||
"2019": ("16.0",),
|
||||
"2022": ("17.0",),
|
||||
}
|
||||
- if override_path := os.environ.get("GYP_MSVS_OVERRIDE_PATH"):
|
||||
+ override_path = os.environ.get("GYP_MSVS_OVERRIDE_PATH")
|
||||
+ if override_path:
|
||||
msvs_version = os.environ.get("GYP_MSVS_VERSION")
|
||||
if not msvs_version:
|
||||
raise ValueError(
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py node_modules/node-gyp/gyp/pylib/gyp/win_tool.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/win_tool.py 2025-11-27 11:53:26.278240985 +0100
|
||||
@@ -26,7 +26,8 @@
|
||||
|
||||
def main(args):
|
||||
executor = WinTool()
|
||||
- if (exit_code := executor.Dispatch(args)) is not None:
|
||||
+ exit_code = executor.Dispatch(args)
|
||||
+ if exit_code is not None:
|
||||
sys.exit(exit_code)
|
||||
|
||||
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2025-11-27 12:03:48.309195523 +0100
|
||||
@@ -1347,7 +1347,8 @@
|
||||
if xcode_version < "0500":
|
||||
return ""
|
||||
default_sdk_path = self._XcodeSdkPath("")
|
||||
- if default_sdk_root := XcodeSettings._sdk_root_cache.get(default_sdk_path):
|
||||
+ default_sdk_root = XcodeSettings._sdk_root_cache.get(default_sdk_path)
|
||||
+ if default_sdk_root:
|
||||
return default_sdk_root
|
||||
try:
|
||||
all_sdks = GetStdout(["xcodebuild", "-showsdks"])
|
||||
@@ -1784,9 +1785,11 @@
|
||||
env["INFOPLIST_PATH"] = xcode_settings.GetBundlePlistPath()
|
||||
env["WRAPPER_NAME"] = xcode_settings.GetWrapperName()
|
||||
|
||||
- if install_name := xcode_settings.GetInstallName():
|
||||
+ install_name = xcode_settings.GetInstallName()
|
||||
+ if install_name:
|
||||
env["LD_DYLIB_INSTALL_NAME"] = install_name
|
||||
- if install_name_base := xcode_settings.GetInstallNameBase():
|
||||
+ install_name_base = xcode_settings.GetInstallNameBase()
|
||||
+ if install_name_base:
|
||||
env["DYLIB_INSTALL_NAME_BASE"] = install_name_base
|
||||
xcode_version, _ = XcodeVersion()
|
||||
if xcode_version >= "0500" and not env.get("SDKROOT"):
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/xcode_ninja.py node_modules/node-gyp/gyp/pylib/gyp/xcode_ninja.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/xcode_ninja.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/xcode_ninja.py 2025-11-27 11:54:21.620353669 +0100
|
||||
@@ -74,7 +74,8 @@
|
||||
ninja_target = {}
|
||||
ninja_target["target_name"] = target_name
|
||||
ninja_target["product_name"] = product_name
|
||||
- if product_extension := old_spec.get("product_extension"):
|
||||
+ product_extension = old_spec.get("product_extension")
|
||||
+ if product_extension:
|
||||
ninja_target["product_extension"] = product_extension
|
||||
ninja_target["toolset"] = old_spec.get("toolset")
|
||||
ninja_target["default_configuration"] = old_spec.get("default_configuration")
|
||||
diff -ru foo/node_modules/node-gyp/gyp/pylib/gyp/xcodeproj_file.py node_modules/node-gyp/gyp/pylib/gyp/xcodeproj_file.py
|
||||
--- foo/node_modules/node-gyp/gyp/pylib/gyp/xcodeproj_file.py 2025-11-24 14:35:45.424999000 +0100
|
||||
+++ node_modules/node-gyp/gyp/pylib/gyp/xcodeproj_file.py 2025-11-27 11:55:08.029037174 +0100
|
||||
@@ -183,7 +183,8 @@
|
||||
'path' (None, 'path')
|
||||
"""
|
||||
|
||||
- if source_group_match := _path_leading_variable.match(input_path):
|
||||
+ source_group_match = _path_leading_variable.match(input_path)
|
||||
+ if source_group_match:
|
||||
source_tree = source_group_match.group(1)
|
||||
output_path = source_group_match.group(3) # This may be None.
|
||||
else:
|
||||
@@ -389,7 +390,8 @@
|
||||
def Hashables(self):
|
||||
hashables = [self.__class__.__name__]
|
||||
|
||||
- if (name := self.Name()) is not None:
|
||||
+ name = self.Name()
|
||||
+ if name is not None:
|
||||
hashables.append(name)
|
||||
|
||||
hashables.extend(self._hashables)
|
||||
@@ -1048,7 +1050,8 @@
|
||||
# including paths with a sourceTree, they'll still inherit their parents'
|
||||
# hashables, even though the paths aren't relative to their parents. This
|
||||
# is not expected to be much of a problem in practice.
|
||||
- if (path := self.PathFromSourceTreeAndPath()) is not None:
|
||||
+ path = self.PathFromSourceTreeAndPath()
|
||||
+ if path is not None:
|
||||
components = path.split(posixpath.sep)
|
||||
for component in components:
|
||||
hashables.append(self.__class__.__name__ + ".path")
|
||||
@@ -2104,7 +2107,8 @@
|
||||
specifically, "$(DIR)/path".
|
||||
"""
|
||||
|
||||
- if path_tree_match := self.path_tree_re.search(path):
|
||||
+ path_tree_match = self.path_tree_re.search(path)
|
||||
+ if path_tree_match:
|
||||
path_tree = path_tree_match.group(1)
|
||||
if path_tree in self.path_tree_first_to_subfolder:
|
||||
subfolder = self.path_tree_first_to_subfolder[path_tree]
|
||||
|
||||
BIN
vendor.tar.zst
LFS
BIN
vendor.tar.zst
LFS
Binary file not shown.
Reference in New Issue
Block a user