From c2ba85663f8ef8c3efd1670d6a949ec26f630181 Mon Sep 17 00:00:00 2001 From: Eugene Medvedev Date: Sat, 9 Aug 2025 11:29:31 +0300 Subject: [PATCH] Correct nfpm.yaml template package dependencies. (#4481) * Correct nfpm.yaml template package dependencies. As is, the `nfpm.yaml` template pulls in `-dev` versions of the packages the built Wails application actually relies on, in addition to `build-essential`. Which will work, but is way overkill. This PR corrects this. I have tested this on an Ubuntu 22.04 VM and a Rocky Linux 10 VM, *(which actually necessitated attaching the EPEL repository)* but I did not verify Arch beyond looking up packages. Additionally, it appears that the package name for RPM distro family is not in tune with the rest of them, referring to an earlier version of webkit2gtk, which has also been corrected. **P.S.** Could we supply our own templates or updatable build files pretty please? * Addressing points brought up. --------- Co-authored-by: Lea Anthony --- v3/UNRELEASED_CHANGELOG.md | 1 + .../linux/nfpm/nfpm.yaml.tmpl | 16 +++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/v3/UNRELEASED_CHANGELOG.md b/v3/UNRELEASED_CHANGELOG.md index 7e25f7814..4e7d68f66 100644 --- a/v3/UNRELEASED_CHANGELOG.md +++ b/v3/UNRELEASED_CHANGELOG.md @@ -26,6 +26,7 @@ After processing, the content will be moved to the main changelog and this file ## Fixed ++ Fix extra-broad Linux package dependencies, fix outdated RPM dependencies. ## Deprecated diff --git a/v3/internal/commands/updatable_build_assets/linux/nfpm/nfpm.yaml.tmpl b/v3/internal/commands/updatable_build_assets/linux/nfpm/nfpm.yaml.tmpl index f3766c761..06ad22120 100644 --- a/v3/internal/commands/updatable_build_assets/linux/nfpm/nfpm.yaml.tmpl +++ b/v3/internal/commands/updatable_build_assets/linux/nfpm/nfpm.yaml.tmpl @@ -26,28 +26,22 @@ contents: # Default dependencies for Debian 12/Ubuntu 22.04+ with WebKit 4.1 depends: - - libgtk-3-dev - - libwebkit2gtk-4.1-dev - - build-essential - - pkg-config + - libgtk-3-0 + - libwebkit2gtk-4.1-0 # Distribution-specific overrides for different package formats and WebKit versions overrides: # RPM packages for RHEL/CentOS/AlmaLinux/Rocky Linux (WebKit 4.0) rpm: depends: - - gtk3-devel - - webkit2gtk3-devel - - gcc-c++ - - pkg-config + - gtk3 + - webkit2gtk4.1 # Arch Linux packages (WebKit 4.1) archlinux: depends: - gtk3 - webkit2gtk-4.1 - - base-devel - - pkgconf # scripts section to ensure desktop database is updated after install scripts: @@ -70,4 +64,4 @@ scripts: # conflicts: # - not-foo # - not-bar -# changelog: "changelog.yaml" \ No newline at end of file +# changelog: "changelog.yaml"