[gnome-initial-setup/jjardon/webkit2gtk-4.1] Build against webkit2gtk-4.1
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/jjardon/webkit2gtk-4.1] Build against webkit2gtk-4.1
- Date: Sat, 24 Jul 2021 22:09:55 +0000 (UTC)
commit 6998b3a9155af2367b88f384f6d82a55f880b5a7
Author: Javier Jardón <jjardon gnome org>
Date: Sat Jul 24 02:07:20 2021 +0100
Build against webkit2gtk-4.1
.gitlab-ci/fedora.Dockerfile | 2 +-
gnome-initial-setup/meson.build | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 1ef0ab43..60a03085 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -36,7 +36,7 @@ RUN dnf -y install --enablerepo=updates-testing \
"pkgconfig(libnm)" \
"pkgconfig(libnma)" \
"pkgconfig(malcontent-ui-0)" \
- "pkgconfig(webkit2gtk-4.0)" \
+ "pkgconfig(webkit2gtk-4.1)" \
polkit-devel \
rest-devel \
&& dnf clean all
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 75c44831..bf0c0425 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -25,6 +25,11 @@ sources += [
'gis-keyring.h'
]
+webkit_dep = dependency('webkit2gtk-4.1', required : false)
+if not webkit_dep.found()
+ webkit_dep = dependency('webkit2gtk-4.0')
+endif
+
dependencies = [
dependency ('libnm', version: '>= 1.2'),
dependency ('libnma', version: '>= 1.0'),
@@ -49,7 +54,7 @@ dependencies = [
dependency ('krb5'),
dependency ('libsecret-1', version: '>= 0.18.8'),
dependency ('pwquality'),
- dependency ('webkit2gtk-4.0', version: '>= 2.26.0'),
+ webkit_dep,
cheese_dep,
cheese_gtk_dep,
ibus_dep,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]