erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

chore(core): Update debian package to use webkit2 4.1

Browse source 
Ubuntu 20.04 Focal doesn't have webkit2 4.1. The API is the same as
with 4.0, so we use that if we can't find 4.1.
This commit is contained in:
Eberhard Beilharz 2024-01-24 16:11:22 +01:00
parent 7ea8d9648b
commit 29c71253db
No known key found for this signature in database
GPG key ID: E9140597606020D3
5 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linux/debian/control
View file

@ -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,
@ -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,
keyman-engine,
python3-bs4,
python3-gi,

6
linux/keyman-config/keyman_config/downloadkeyboard.py
View file

@ -7,7 +7,11 @@ import urllib.parse
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.1')
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

6
linux/keyman-config/keyman_config/install_window.py
View file

@ -14,7 +14,11 @@ import webbrowser
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.1')
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

6
linux/keyman-config/keyman_config/keyboard_options_view.py
View file

@ -8,7 +8,11 @@ from urllib.parse import parse_qsl, urlencode
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.1')
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

6
linux/keyman-config/keyman_config/welcome.py
View file

@ -7,7 +7,11 @@ import webbrowser
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('WebKit2', '4.1')
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 _