Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(linux): Build with webkitgtk 4.1 instead of 4.0 #10483

Merged
merged 4 commits into from
Jan 29, 2024
Merged

chore(linux): Build with webkitgtk 4.1 instead of 4.0 #10483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ea8d96
chore(linux): Build with webkitgtk 4.1 instead of 4.0
jbicha Jan 4, 2024
29c7125
chore(core): Update debian package to use webkit2 4.1
ermshiperete Jan 24, 2024
052ac3e
chore(linux): Update changelog
ermshiperete Jan 24, 2024
e33d5ef
chore(linux): Fix changelog
ermshiperete Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/linux/keyman-config.md
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ then you will need to:

```bash
sudo apt install python3-lxml python3-magic python3-numpy python3-qrcode python3-pil \
python3-requests python3-requests-cache python3 python3-gi gir1.2-webkit2-4.0 dconf-cli \
python3-requests python3-requests-cache python3 python3-gi gir1.2-webkit2-4.1 dconf-cli \
python3-setuptools python3-pip python3-dbus ibus libglib2.0-bin liblocale-gettext-perl
```

Expand Down
2 changes: 1 addition & 1 deletion docs/settings/linux/.devcontainer/Dockerfile
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
libjson-glib-dev libgtk-3-dev libxml2-utils help2man python3-lxml \
python3-magic python3-numpy python3-pil python3-pip python3-qrcode \
python3-requests python3-requests-cache python3 python3-gi dconf-cli \
dconf-editor cargo python3-dbus gir1.2-webkit2-4.0 ibus libglib2.0-bin \
dconf-editor cargo python3-dbus gir1.2-webkit2-4.1 ibus libglib2.0-bin \
liblocale-gettext-perl xvfb xserver-xephyr metacity mutter \
&& sudo add-apt-repository --yes ppa:keymanapp/keyman \
&& sudo apt upgrade --yes
7 changes: 7 additions & 0 deletions linux/debian/changelog
View file
Open in desktop
@@ -1,3 +1,10 @@
keyman (16.0.144-2) UNRELEASED; urgency=medium

[Jeremy Bicha]
* Build with webkitgtk 4.1 instead of 4.0 (closes: #1061396)

-- Eberhard Beilharz <eb1@sil.org> Wed, 24 Jan 2024 17:38:11 +0100

keyman (16.0.144-1) unstable; urgency=medium

[Dandan Zhang]
Expand Down
4 changes: 2 additions & 2 deletions linux/debian/control
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ Build-Depends:
bash-completion,
debhelper (>= 11),
dh-python,
gir1.2-webkit2-4.0,
gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0,
ibus,
liblocale-gettext-perl,
perl,
Expand Down Expand Up @@ -85,7 +85,7 @@ Section: python
Architecture: all
Depends:
dconf-cli,
gir1.2-webkit2-4.0,
gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0,
jbicha marked this conversation as resolved.
Show resolved Hide resolved
keyman-engine,
python3-bs4,
python3-gi,
Expand Down
6 changes: 5 additions & 1 deletion linux/keyman-config/keyman_config/downloadkeyboard.py
View file
Open in desktop
Expand Up @@ -7,7 +7,11 @@
import gi

gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.0')
try:
gi.require_version('WebKit2', '4.1')
except ValueError:
# TODO: Remove once we drop support for Ubuntu 20.04 Focal
gi.require_version('WebKit2', '4.0')

from gi.repository import Gtk, WebKit2

Expand Down
6 changes: 5 additions & 1 deletion linux/keyman-config/keyman_config/install_window.py
View file
Open in desktop
Expand Up @@ -14,7 +14,11 @@
import gi

gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.0')
try:
gi.require_version('WebKit2', '4.1')
except ValueError:
# TODO: Remove once we drop support for Ubuntu 20.04 Focal
gi.require_version('WebKit2', '4.0')

from pkg_resources import parse_version

Expand Down
6 changes: 5 additions & 1 deletion linux/keyman-config/keyman_config/keyboard_options_view.py
View file
Open in desktop
Expand Up @@ -8,7 +8,11 @@
import gi

gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.0')
try:
gi.require_version('WebKit2', '4.1')
except ValueError:
# TODO: Remove once we drop support for Ubuntu 20.04 Focal
gi.require_version('WebKit2', '4.0')

from gi.repository import Gtk, WebKit2

Expand Down
6 changes: 5 additions & 1 deletion linux/keyman-config/keyman_config/welcome.py
View file
Open in desktop
Expand Up @@ -7,7 +7,11 @@
import gi

gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.0')
try:
gi.require_version('WebKit2', '4.1')
except ValueError:
# TODO: Remove once we drop support for Ubuntu 20.04 Focal
gi.require_version('WebKit2', '4.0')
from gi.repository import Gtk, WebKit2

from keyman_config import _
Expand Down