Skip to content

Commit 1d2e1b1

Browse files
committed
Update Linux docs + doctor to suggest webkit2gtk-4.1
1 parent e424a85 commit 1d2e1b1

File tree

9 files changed

+25
-25
lines changed

9 files changed

+25
-25
lines changed

Diff for: mkdocs-website/Taskfile.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ tasks:
77
setup:
88
summary: Setup the project
99
preconditions:
10-
- sh: python{{exeExt}} --version
10+
- sh: python3{{exeExt}} --version
1111
msg: "Looks like Python isn't installed. Python is required to build the documentation: https://www.python.org/downloads/"
1212
cmds:
13-
- python -m pip install -r requirements.txt --user
13+
- python3 -m pip install -r requirements.txt --user
1414

1515
setup:insiders:
1616
summary: Setup the project (insiders)
1717
preconditions:
18-
- sh: python{{exeExt}} --version
18+
- sh: python3{{exeExt}} --version
1919
msg: "Looks like Python isn't installed. Python is required to build the documentation: https://www.python.org/downloads/"
2020
cmds:
21-
- python -m pip install -r requirements.insiders.txt --user
21+
- python3 -m pip install -r requirements.insiders.txt --user
2222

2323
upgrade:insiders:
2424
summary: Upgrade the project (insiders)
2525
preconditions:
26-
- sh: python{{exeExt}} --version
26+
- sh: python3{{exeExt}} --version
2727
msg: "Looks like Python isn't installed. Python is required to build the documentation: https://www.python.org/downloads/"
2828
cmds:
29-
- python -m pip install -r requirements.insiders.txt --upgrade --user
29+
- python3 -m pip install -r requirements.insiders.txt --upgrade --user
3030

3131
build:
3232
summary: Builds the documentation

Diff for: mkdocs-website/docs/en/getting-started/installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ You will also need to install platform specific dependencies:
6363

6464
=== "Linux"
6565

66-
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.
66+
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.
6767

6868
## System Check
6969

Diff for: v3/internal/doctor/packagemanager/apt.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ func NewApt(osid string) *Apt {
2525
// They will potentially differ on different distributions or versions
2626
func (a *Apt) Packages() Packagemap {
2727
return Packagemap{
28-
"libgtk-3": []*Package{
28+
"gtk3": []*Package{
2929
{Name: "libgtk-3-dev", SystemPackage: true, Library: true},
3030
},
31-
"libwebkit": []*Package{
32-
{Name: "libwebkit2gtk-4.0-dev", SystemPackage: true, Library: true},
31+
"webkit2gtk": []*Package{
32+
{Name: "libwebkit2gtk-4.1-dev", SystemPackage: true, Library: true},
3333
},
3434
"gcc": []*Package{
3535
{Name: "build-essential", SystemPackage: true},

Diff for: v3/internal/doctor/packagemanager/dnf.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ func NewDnf(osid string) *Dnf {
2525
// They will potentially differ on different distributions or versions
2626
func (y *Dnf) Packages() Packagemap {
2727
return Packagemap{
28-
"libgtk-3": []*Package{
28+
"gtk3": []*Package{
2929
{Name: "gtk3-devel", SystemPackage: true, Library: true},
3030
},
31-
"libwebkit": []*Package{
32-
{Name: "webkit2gtk4.0-devel", SystemPackage: true, Library: true},
31+
"webkit2gtk": []*Package{
32+
{Name: "webkit2gtk4.1-devel", SystemPackage: true, Library: true},
3333
{Name: "webkit2gtk3-devel", SystemPackage: true, Library: true},
3434
// {Name: "webkitgtk3-devel", SystemPackage: true, Library: true},
3535
},

Diff for: v3/internal/doctor/packagemanager/emerge.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ func NewEmerge(osid string) *Emerge {
2626
// They will potentially differ on different distributions or versions
2727
func (e *Emerge) Packages() Packagemap {
2828
return Packagemap{
29-
"libgtk-3": []*Package{
29+
"gtk3": []*Package{
3030
{Name: "x11-libs/gtk+", SystemPackage: true, Library: true},
3131
},
32-
"libwebkit": []*Package{
33-
{Name: "net-libs/webkit-gtk", SystemPackage: true, Library: true},
32+
"webkit2gtk": []*Package{
33+
{Name: "net-libs/webkit-gtk:6", SystemPackage: true, Library: true},
3434
},
3535
"gcc": []*Package{
3636
{Name: "sys-devel/gcc", SystemPackage: true},

Diff for: v3/internal/doctor/packagemanager/eopkg.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func NewEopkg(osid string) *Eopkg {
2727
// They will potentially differ on different distributions or versions
2828
func (e *Eopkg) Packages() Packagemap {
2929
return Packagemap{
30-
"libgtk-3": []*Package{
30+
"gtk3": []*Package{
3131
{Name: "libgtk-3-devel", SystemPackage: true, Library: true},
3232
},
33-
"libwebkit": []*Package{
33+
"webkit2gtk": []*Package{
3434
{Name: "libwebkit-gtk-devel", SystemPackage: true, Library: true},
3535
},
3636
"gcc": []*Package{

Diff for: v3/internal/doctor/packagemanager/nixpkgs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ func (n *Nixpkgs) Packages() Packagemap {
4040
}
4141

4242
return Packagemap{
43-
"libgtk-3": []*Package{
43+
"gtk3": []*Package{
4444
{Name: channel + ".gtk3", SystemPackage: true, Library: true},
4545
},
46-
"libwebkit": []*Package{
46+
"webkit2gtk": []*Package{
4747
{Name: channel + ".webkitgtk", SystemPackage: true, Library: true},
4848
},
4949
"gcc": []*Package{

Diff for: v3/internal/doctor/packagemanager/pacman.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ func NewPacman(osid string) *Pacman {
2626
// They will potentially differ on different distributions or versions
2727
func (p *Pacman) Packages() Packagemap {
2828
return Packagemap{
29-
"libgtk-3": []*Package{
29+
"gtk3": []*Package{
3030
{Name: "gtk3", SystemPackage: true, Library: true},
3131
},
32-
"libwebkit": []*Package{
33-
{Name: "webkit2gtk", SystemPackage: true, Library: true},
32+
"webkit2gtk": []*Package{
33+
{Name: "webkit2gtk-4.1", SystemPackage: true, Library: true},
3434
},
3535
"gcc": []*Package{
3636
{Name: "gcc", SystemPackage: true},

Diff for: v3/internal/doctor/packagemanager/zypper.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func NewZypper(osid string) *Zypper {
2727
// They will potentially differ on different distributions or versions
2828
func (z *Zypper) Packages() Packagemap {
2929
return Packagemap{
30-
"libgtk-3": []*Package{
30+
"gtk3": []*Package{
3131
{Name: "gtk3-devel", SystemPackage: true, Library: true},
3232
},
33-
"libwebkit": []*Package{
33+
"webkit2gtk": []*Package{
3434
{Name: "webkit2gtk3-soup2-devel", SystemPackage: true, Library: true},
3535
{Name: "webkit2gtk3-devel", SystemPackage: true, Library: true},
3636
},

0 commit comments

Comments
 (0)