Update Linux docs + doctor to suggest webkit2gtk-4.1

mkdocs-website/Taskfile.yml

@@ -7,26 +7,26 @@ tasks:
  setup:
  summary: Setup the project
  preconditions:
- - sh: python{{exeExt}} --version
+ - sh: python3{{exeExt}} --version
  msg: "Looks like Python isn't installed. Python is required to build the documentation: https://www.python.org/downloads/"
  cmds:
- - python -m pip install -r requirements.txt --user
+ - python3 -m pip install -r requirements.txt --user
 
  setup:insiders:
  summary: Setup the project (insiders)
  preconditions:
- - sh: python{{exeExt}} --version
+ - sh: python3{{exeExt}} --version
  msg: "Looks like Python isn't installed. Python is required to build the documentation: https://www.python.org/downloads/"
  cmds:
- - python -m pip install -r requirements.insiders.txt --user
+ - python3 -m pip install -r requirements.insiders.txt --user
 
  upgrade:insiders:
  summary: Upgrade the project (insiders)
  preconditions:
- - sh: python{{exeExt}} --version
+ - sh: python3{{exeExt}} --version
  msg: "Looks like Python isn't installed. Python is required to build the documentation: https://www.python.org/downloads/"
  cmds:
- - python -m pip install -r requirements.insiders.txt --upgrade --user
+ - python3 -m pip install -r requirements.insiders.txt --upgrade --user
 
  build:
  summary: Builds the documentation

mkdocs-website/docs/en/getting-started/installation.md

@@ -63,7 +63,7 @@ You will also need to install platform specific dependencies:
 
 === "Linux"
 
- Linux requires the standard `gcc` build tools plus `libgtk3` and `libwebkit`. Rather than list a ton of commands for different distros, Wails can try to determine what the installation commands are for your specific distribution. Run <code>wails doctor</code> after installation to be shown how to install the dependencies. If your distro/package manager is not supported, please let us know on discord.
+ Linux requires the standard `gcc` build tools plus `gtk3` and `webkit2gtk`. Run <code>wails doctor</code> after installation to be shown how to install the dependencies. If your distro/package manager is not supported, please let us know on discord.
 
 ## System Check
 

v3/internal/doctor/packagemanager/apt.go

@@ -25,11 +25,11 @@ func NewApt(osid string) *Apt {
 // They will potentially differ on different distributions or versions
 func (a *Apt) Packages() Packagemap {
  return Packagemap{
- "libgtk-3": []*Package{
+ "gtk3": []*Package{
  {Name: "libgtk-3-dev", SystemPackage: true, Library: true},
  },
- "libwebkit": []*Package{
- {Name: "libwebkit2gtk-4.0-dev", SystemPackage: true, Library: true},
+ "webkit2gtk": []*Package{
+ {Name: "libwebkit2gtk-4.1-dev", SystemPackage: true, Library: true},
  },
  "gcc": []*Package{
  {Name: "build-essential", SystemPackage: true},

v3/internal/doctor/packagemanager/dnf.go

@@ -25,11 +25,11 @@ func NewDnf(osid string) *Dnf {
 // They will potentially differ on different distributions or versions
 func (y *Dnf) Packages() Packagemap {
  return Packagemap{
- "libgtk-3": []*Package{
+ "gtk3": []*Package{
  {Name: "gtk3-devel", SystemPackage: true, Library: true},
  },
- "libwebkit": []*Package{
- {Name: "webkit2gtk4.0-devel", SystemPackage: true, Library: true},
+ "webkit2gtk": []*Package{
+ {Name: "webkit2gtk4.1-devel", SystemPackage: true, Library: true},
  {Name: "webkit2gtk3-devel", SystemPackage: true, Library: true},
  // {Name: "webkitgtk3-devel", SystemPackage: true, Library: true},
  },

v3/internal/doctor/packagemanager/emerge.go

@@ -26,11 +26,11 @@ func NewEmerge(osid string) *Emerge {
 // They will potentially differ on different distributions or versions
 func (e *Emerge) Packages() Packagemap {
  return Packagemap{
- "libgtk-3": []*Package{
+ "gtk3": []*Package{
  {Name: "x11-libs/gtk+", SystemPackage: true, Library: true},
  },
- "libwebkit": []*Package{
- {Name: "net-libs/webkit-gtk", SystemPackage: true, Library: true},
+ "webkit2gtk": []*Package{
+ {Name: "net-libs/webkit-gtk:6", SystemPackage: true, Library: true},
  },
  "gcc": []*Package{
  {Name: "sys-devel/gcc", SystemPackage: true},

v3/internal/doctor/packagemanager/eopkg.go

@@ -27,10 +27,10 @@ func NewEopkg(osid string) *Eopkg {
 // They will potentially differ on different distributions or versions
 func (e *Eopkg) Packages() Packagemap {
  return Packagemap{
- "libgtk-3": []*Package{
+ "gtk3": []*Package{
  {Name: "libgtk-3-devel", SystemPackage: true, Library: true},
  },
- "libwebkit": []*Package{
+ "webkit2gtk": []*Package{
  {Name: "libwebkit-gtk-devel", SystemPackage: true, Library: true},
  },
  "gcc": []*Package{

v3/internal/doctor/packagemanager/nixpkgs.go

@@ -40,10 +40,10 @@ func (n *Nixpkgs) Packages() Packagemap {
  }
 
  return Packagemap{
- "libgtk-3": []*Package{
+ "gtk3": []*Package{
  {Name: channel + ".gtk3", SystemPackage: true, Library: true},
  },
- "libwebkit": []*Package{
+ "webkit2gtk": []*Package{
  {Name: channel + ".webkitgtk", SystemPackage: true, Library: true},
  },
  "gcc": []*Package{

v3/internal/doctor/packagemanager/pacman.go

@@ -26,11 +26,11 @@ func NewPacman(osid string) *Pacman {
 // They will potentially differ on different distributions or versions
 func (p *Pacman) Packages() Packagemap {
  return Packagemap{
- "libgtk-3": []*Package{
+ "gtk3": []*Package{
  {Name: "gtk3", SystemPackage: true, Library: true},
  },
- "libwebkit": []*Package{
- {Name: "webkit2gtk", SystemPackage: true, Library: true},
+ "webkit2gtk": []*Package{
+ {Name: "webkit2gtk-4.1", SystemPackage: true, Library: true},
  },
  "gcc": []*Package{
  {Name: "gcc", SystemPackage: true},

v3/internal/doctor/packagemanager/zypper.go

@@ -27,10 +27,10 @@ func NewZypper(osid string) *Zypper {
 // They will potentially differ on different distributions or versions
 func (z *Zypper) Packages() Packagemap {
  return Packagemap{
- "libgtk-3": []*Package{
+ "gtk3": []*Package{
  {Name: "gtk3-devel", SystemPackage: true, Library: true},
  },
- "libwebkit": []*Package{
+ "webkit2gtk": []*Package{
  {Name: "webkit2gtk3-soup2-devel", SystemPackage: true, Library: true},
  {Name: "webkit2gtk3-devel", SystemPackage: true, Library: true},
  },