2 Commits
Author SHA1 Message Date
Xuc Pan bb6476a864 chore(release): prepare v0.1.3 2026-09-23 09:31:40 +08:00
Xuc Pan 17a09e08a5 fix(wine): use builtin DLLs for WebView2 setup 2026-09-23 09:00:41 +08:00
11 changed files with 56 additions and 30 deletions

No files matched your search

Generated
+1 -1
View File
@@ -1413,7 +1413,7 @@ dependencies = [
[[package]]
name = "uur"
version = "0.1.2"
version = "0.1.3"
dependencies = [
"anyhow",
"ashpd",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "uur"
version = "0.1.2"
version = "0.1.3"
edition = "2021"
description = "Native Linux companion for NetEase UU Remote: X11/Wayland input and capture, packaged as a regular desktop app"
license = "MIT"
+4 -4
View File
@@ -69,7 +69,7 @@ recipes and release artifacts share one version and filesystem layout.
Install a downloaded release package with pacman:
```bash
sudo pacman -U ./dist/uur-0.1.2-1-x86_64.pkg.tar.zst
sudo pacman -U ./dist/uur-0.1.3-1-x86_64.pkg.tar.zst
```
### AUR
@@ -83,13 +83,13 @@ paru -S uur
### Debian and Ubuntu package family
```bash
sudo apt install ./uur_0.1.2_amd64.deb
sudo apt install ./uur_0.1.3_amd64.deb
```
### Fedora and compatible RPM systems
```bash
sudo dnf install ./uur-0.1.2-1.x86_64.rpm
sudo dnf install ./uur-0.1.3-1.x86_64.rpm
```
On systems with different RPM dependency names, install the dependencies
@@ -98,7 +98,7 @@ manually or use the portable archive.
### Portable archive
```bash
sudo tar --zstd -C / -xf ./uur-0.1.2-linux-x86_64.tar.zst
sudo tar --zstd -C / -xf ./uur-0.1.3-linux-x86_64.tar.zst
```
### Nix and NixOS
+4 -4
View File
@@ -66,7 +66,7 @@ uur run
使用 pacman 安装下载的正式发布包:
```bash
sudo pacman -U ./dist/uur-0.1.2-1-x86_64.pkg.tar.zst
sudo pacman -U ./dist/uur-0.1.3-1-x86_64.pkg.tar.zst
```
### AUR
@@ -80,13 +80,13 @@ paru -S uur
### Debian、Ubuntu 及兼容发行版
```bash
sudo apt install ./uur_0.1.2_amd64.deb
sudo apt install ./uur_0.1.3_amd64.deb
```
### Fedora 及兼容 RPM 发行版
```bash
sudo dnf install ./uur-0.1.2-1.x86_64.rpm
sudo dnf install ./uur-0.1.3-1.x86_64.rpm
```
如果发行版的 RPM 依赖名称不同,请手动安装依赖或使用通用压缩包。
@@ -94,7 +94,7 @@ sudo dnf install ./uur-0.1.2-1.x86_64.rpm
### 通用压缩包
```bash
sudo tar --zstd -C / -xf ./uur-0.1.2-linux-x86_64.tar.zst
sudo tar --zstd -C / -xf ./uur-0.1.3-linux-x86_64.tar.zst
```
### Nix 与 NixOS
+5 -5
View File
@@ -12,13 +12,13 @@ needed for system-wide package installation.
paru -S uur
# Downloaded release package
sudo pacman -U ./uur-0.1.2-1-x86_64.pkg.tar.zst
sudo pacman -U ./uur-0.1.3-1-x86_64.pkg.tar.zst
```
## Debian, Ubuntu, and derivatives
```bash
sudo apt install ./uur_0.1.2_amd64.deb
sudo apt install ./uur_0.1.3_amd64.deb
```
The same release artifact covers Debian, Ubuntu, Linux Mint, Pop!_OS, KDE neon,
@@ -28,10 +28,10 @@ derivatives.
## Fedora, RHEL, and openSUSE families
```bash
sudo dnf install ./uur-0.1.2-1.x86_64.rpm
sudo dnf install ./uur-0.1.3-1.x86_64.rpm
# openSUSE
sudo zypper install ./uur-0.1.2-1.x86_64.rpm
sudo zypper install ./uur-0.1.3-1.x86_64.rpm
```
This format also covers Fedora derivatives and RPM systems whose repositories
@@ -42,7 +42,7 @@ provide the declared Wine, GLib, PipeWire, and portal dependencies.
The portable archive targets conventional glibc/FHS systems:
```bash
sudo tar --zstd -C / -xf ./uur-0.1.2-linux-x86_64.tar.zst
sudo tar --zstd -C / -xf ./uur-0.1.3-linux-x86_64.tar.zst
```
## Nix and NixOS
+5 -5
View File
@@ -46,7 +46,7 @@ paru -S uur
From a downloaded Arch package:
```bash
sudo pacman -U ./uur-0.1.2-1-x86_64.pkg.tar.zst
sudo pacman -U ./uur-0.1.3-1-x86_64.pkg.tar.zst
```
Install the portal backend supplied or recommended by the selected desktop.
@@ -60,7 +60,7 @@ Zorin OS, elementary OS, KDE neon, TUXEDO OS, Kali Linux, MX Linux, and other
compatible derivatives:
```bash
sudo apt install ./uur_0.1.2_amd64.deb
sudo apt install ./uur_0.1.3_amd64.deb
```
The package manager resolves Wine, PipeWire, and the portal frontend. Install
@@ -74,10 +74,10 @@ dependency names. Install it with the native frontend:
```bash
# Fedora and compatible systems
sudo dnf install ./uur-0.1.2-1.x86_64.rpm
sudo dnf install ./uur-0.1.3-1.x86_64.rpm
# openSUSE family
sudo zypper install ./uur-0.1.2-1.x86_64.rpm
sudo zypper install ./uur-0.1.3-1.x86_64.rpm
```
RHEL, CentOS Stream, Rocky Linux, AlmaLinux, Oracle Linux, Nobara, Ultramarine,
@@ -91,7 +91,7 @@ PCLinuxOS, and similar mutable/FHS systems can use the portable archive when
they provide compatible glibc, Wine, PipeWire, and portal libraries:
```bash
sudo tar --zstd -C / -xf ./uur-0.1.2-linux-x86_64.tar.zst
sudo tar --zstd -C / -xf ./uur-0.1.3-linux-x86_64.tar.zst
```
Alternatively, build and install for one user:
+1 -1
View File
@@ -23,7 +23,7 @@ let
in
rustPlatform.buildRustPackage {
pname = "uur";
version = "0.1.2";
version = "0.1.3";
src = lib.cleanSource ../.;
cargoLock.lockFile = ../Cargo.lock;
+1 -1
View File
@@ -1,7 +1,7 @@
# Contributor: uur contributors
# Maintainer: uur contributors
pkgname=uur
pkgver=0.1.2
pkgver=0.1.3
pkgrel=0
pkgdesc="Native Linux companion for NetEase UU Remote"
url="https://github.com/panxuc/uur"
+2 -2
View File
@@ -1,6 +1,6 @@
pkgbase = uur
pkgdesc = Native Linux companion for NetEase UU Remote (X11/Wayland input and capture bridge)
pkgver = 0.1.2
pkgver = 0.1.3
pkgrel = 1
url = https://github.com/panxuc/uur
install = uur.install
@@ -31,7 +31,7 @@ pkgbase = uur
optdepends = libva-utils: VA-API capability diagnostics
optdepends = vulkan-tools: Vulkan and Vulkan Video capability diagnostics
optdepends = nvidia-utils: NVENC and NVDEC capability diagnostics on NVIDIA GPUs
source = uur-0.1.2.tar.gz::https://github.com/panxuc/uur/archive/refs/tags/v0.1.2.tar.gz
source = uur-0.1.3.tar.gz::https://github.com/panxuc/uur/archive/refs/tags/v0.1.3.tar.gz
sha256sums = SKIP
pkgname = uur
+1 -1
View File
@@ -8,7 +8,7 @@
# `uur setup` (it is never redistributed by this package).
pkgname=uur
pkgver=0.1.2
pkgver=0.1.3
pkgrel=1
pkgdesc="Native Linux companion for NetEase UU Remote (X11/Wayland input and capture bridge)"
arch=('x86_64')
+31 -5
View File
@@ -171,6 +171,22 @@ fn deploy_terminal_proxy(install_dir: &Path) -> Result<PathBuf> {
/// The client UI needs the Evergreen WebView2 runtime; the official
/// bootstrapper ships inside the client's bin directory.
const WEBVIEW2_DLL_OVERRIDES: &str = "wtsapi32=b,wevtapi=b";
fn webview2_install_command(prefix: &Path, bootstrapper: &Path) -> Command {
let mut command = Command::new("wine");
command
.env("WINEPREFIX", prefix)
.env("WINEDEBUG", wine_debug())
// The bootstrapper is a 32-bit process. uur's native preload DLLs are
// 64-bit, so inherited global native-only overrides make its updater
// unable to load WTSAPI32.dll under WoW64.
.env("WINEDLLOVERRIDES", WEBVIEW2_DLL_OVERRIDES)
.arg(bootstrapper)
.args(["/silent", "/install"]);
command
}
fn ensure_webview2(prefix: &Path, install_dir: &Path) -> Result<()> {
let marker = prefix.join("drive_c/Program Files (x86)/Microsoft/EdgeWebView/Application");
if marker.exists() {
@@ -183,11 +199,7 @@ fn ensure_webview2(prefix: &Path, install_dir: &Path) -> Result<()> {
anyhow::bail!("{}", t!("session.webview_missing"));
}
println!("{}", t!("session.installing_webview"));
let status = Command::new("wine")
.env("WINEPREFIX", prefix)
.env("WINEDEBUG", wine_debug())
.arg(bootstrapper.to_string_lossy().as_ref())
.args(["/silent", "/install"])
let status = webview2_install_command(prefix, &bootstrapper)
.status()
.context("running the WebView2 bootstrapper")?;
if !status.success() {
@@ -716,6 +728,20 @@ fn wine_debug() -> String {
#[cfg(test)]
mod tests {
use super::*;
use std::ffi::OsStr;
#[test]
fn webview2_installer_uses_builtin_wow64_dlls() {
let command = webview2_install_command(
Path::new("/tmp/uur-wine-prefix"),
Path::new("/tmp/MicrosoftEdgeWebview2Setup.exe"),
);
let overrides = command
.get_envs()
.find_map(|(name, value)| (name == OsStr::new("WINEDLLOVERRIDES")).then_some(value))
.flatten();
assert_eq!(overrides, Some(OsStr::new(WEBVIEW2_DLL_OVERRIDES)));
}
#[test]
fn tasklist_parser_matches_the_exact_image() {