From 29c71253dbeaf81a930bf02ec4e23457b59f6bb3 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 24 Jan 2024 16:11:22 +0100
Subject: [PATCH] chore(core): Update debian package to use webkit2 4.1

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.
---
 linux/debian/control                                       | 4 ++--
 linux/keyman-config/keyman_config/downloadkeyboard.py      | 6 +++++-
 linux/keyman-config/keyman_config/install_window.py        | 6 +++++-
 linux/keyman-config/keyman_config/keyboard_options_view.py | 6 +++++-
 linux/keyman-config/keyman_config/welcome.py               | 6 +++++-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/linux/debian/control b/linux/debian/control
index f3ba49bd8d..69cf433443 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -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,
diff --git a/linux/keyman-config/keyman_config/downloadkeyboard.py b/linux/keyman-config/keyman_config/downloadkeyboard.py
index f97daf3b1d..42ff74308d 100755
--- a/linux/keyman-config/keyman_config/downloadkeyboard.py
+++ b/linux/keyman-config/keyman_config/downloadkeyboard.py
@@ -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
 
diff --git a/linux/keyman-config/keyman_config/install_window.py b/linux/keyman-config/keyman_config/install_window.py
index be79ff7b05..686e24eac9 100755
--- a/linux/keyman-config/keyman_config/install_window.py
+++ b/linux/keyman-config/keyman_config/install_window.py
@@ -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
 
diff --git a/linux/keyman-config/keyman_config/keyboard_options_view.py b/linux/keyman-config/keyman_config/keyboard_options_view.py
index 50d6871209..795386d7bf 100644
--- a/linux/keyman-config/keyman_config/keyboard_options_view.py
+++ b/linux/keyman-config/keyman_config/keyboard_options_view.py
@@ -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
 
diff --git a/linux/keyman-config/keyman_config/welcome.py b/linux/keyman-config/keyman_config/welcome.py
index a14d747c6a..af001ea464 100644
--- a/linux/keyman-config/keyman_config/welcome.py
+++ b/linux/keyman-config/keyman_config/welcome.py
@@ -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 _