diff --git a/v2/internal/system/packagemanager/zypper.go b/v2/internal/system/packagemanager/zypper.go index 0d7fb082d..c486b53e1 100644 --- a/v2/internal/system/packagemanager/zypper.go +++ b/v2/internal/system/packagemanager/zypper.go @@ -33,6 +33,7 @@ func (z *Zypper) Packages() packagemap { {Name: "gtk3-devel", SystemPackage: true, Library: true}, }, "libwebkit": []*Package{ + {Name: "webkit2gtk3-soup2-devel", SystemPackage: true, Library: true}, {Name: "webkit2gtk3-devel", SystemPackage: true, Library: true}, }, "gcc": []*Package{ @@ -40,6 +41,7 @@ func (z *Zypper) Packages() packagemap { }, "pkg-config": []*Package{ {Name: "pkg-config", SystemPackage: true}, + {Name: "pkgconf-pkg-config", SystemPackage: true}, }, "npm": []*Package{ {Name: "npm10", SystemPackage: true}, @@ -60,7 +62,9 @@ func (z *Zypper) PackageInstalled(pkg *Package) (bool, error) { if pkg.SystemPackage == false { return false, nil } - stdout, _, err := shell.RunCommand(".", "zypper", "info", pkg.Name) + var env []string + env = shell.SetEnv(env, "LANGUAGE", "en_US.utf-8") + stdout, _, err := shell.RunCommandWithEnv(env, ".", "zypper", "info", pkg.Name) if err != nil { _, ok := err.(*exec.ExitError) if ok { @@ -83,7 +87,9 @@ func (z *Zypper) PackageAvailable(pkg *Package) (bool, error) { if pkg.SystemPackage == false { return false, nil } - stdout, _, err := shell.RunCommand(".", "zypper", "info", pkg.Name) + var env []string + env = shell.SetEnv(env, "LANGUAGE", "en_US.utf-8") + stdout, _, err := shell.RunCommandWithEnv(env, ".", "zypper", "info", pkg.Name) // We add a space to ensure we get a full match, not partial match if err != nil { _, ok := err.(*exec.ExitError) diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx index 35e975ebc..b8a5214de 100644 --- a/website/src/pages/changelog.mdx +++ b/website/src/pages/changelog.mdx @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed console printing in `wails generate template`. Fixed by @misitebao in [PR](https://github.com/wailsapp/wails/pull/2483) - Fixed `-skipbindings` flag in `wails dev`. Fixed by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2584) - Fixed `runtime.MenuUpdateApplicationMenu` on macOS. Fixed by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2588) +- Fixed add package name for `libwebkit`/`pkg-config` and use shell.RunCommandWithENV instead of shell.RunCommand in `zypper.go`. Fixed by @wgjtyu in [PR](https://github.com/wailsapp/wails/pull/2593) ## v2.4.1 - 2023-03-20