[gnome-boxes/wip/rishi/rhel: 11/18] build: Require webkitgtk+ and json-glib
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/wip/rishi/rhel: 11/18] build: Require webkitgtk+ and json-glib
- Date: Wed, 11 Oct 2017 12:08:03 +0000 (UTC)
commit 7dbcf465d46d52db044f7efde8a5ceaf6a230fa7
Author: Felipe Borges <felipeborges gnome org>
Date: Mon Oct 2 10:58:10 2017 +0200
build: Require webkitgtk+ and json-glib
In a following patch, we will need json-glib and webkitgtk+ to
download a RHEL 7.x ISO from developers.redhat.com.
https://bugzilla.gnome.org/show_bug.cgi?id=786679
configure.ac | 2 ++
meson.build | 2 ++
src/Makefile.am | 2 ++
src/meson.build | 2 ++
4 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index eb46638..4024aa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,9 +79,11 @@ PKG_CHECK_MODULES(BOXES, [
libusb-1.0 >= $LIBUSB_MIN_VERSION
spice-client-gtk-3.0 >= $SPICE_GTK_MIN_VERSION
gudev-1.0 >= $GUDEV_MIN_VERSION
+ json-glib-1.0
libosinfo-1.0 >= $OSINFO_MIN_VERSION
libsoup-2.4 >= $LIBSOUP_REQUIRED
libarchive >= $LIBARCHIVE_MIN_VERSION
+ webkit2gtk-4.0
])
diff --git a/meson.build b/meson.build
index 5510000..31b7e88 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,7 @@ govirt = dependency ('govirt-1.0', version: '>= 0.3.4')
gtk = dependency ('gtk+-3.0', version: '>= 3.19.8')
gtk_vnc = dependency ('gtk-vnc-2.0', version: '>= 0.4.4')
gudev = dependency ('gudev-1.0', version: '>= 165')
+json_glib = dependency ('json-glib-1.0')
libarchive = dependency ('libarchive', version: '>= 3.0.0')
libosinfo = dependency ('libosinfo-1.0', version: '>= 1.1.0')
libsecret = dependency ('libsecret-1')
@@ -25,6 +26,7 @@ libvirt_gconfig = dependency ('libvirt-gconfig-1.0', version: '>= 0.2.0')
libxml = dependency ('libxml-2.0', version: '>= 2.7.8')
spice_client_gtk = dependency ('spice-client-gtk-3.0', version: '>= 0.32')
tracker = dependency ('tracker-sparql-2.0')
+webkitgtk = dependency ('webkit2gtk-4.0')
cc = meson.get_compiler ('c')
diff --git a/src/Makefile.am b/src/Makefile.am
index 182ff92..551e611 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,7 @@ AM_VALAFLAGS = \
--pkg glib-2.0 \
--pkg gtk-vnc-2.0 \
--pkg gudev-1.0 \
+ --pkg json-glib-1.0 \
--pkg libarchive \
--pkg libsecret-1 \
--pkg libsoup-2.4 \
@@ -44,6 +45,7 @@ AM_VALAFLAGS = \
--pkg spice-client-gtk-3.0 \
--pkg tracker-sparql-$(TRACKER_VERSION) \
--pkg gmodule-2.0 \
+ --pkg webkit2gtk-4.0 \
--gresources $(gresource_file) \
$(VALA_DEBUG_FLAGS) \
$(NULL)
diff --git a/src/meson.build b/src/meson.build
index ee7b22b..108bacb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -116,6 +116,7 @@ dependencies = [
gobject,
gtk,
gtk_vnc,
+ json_glib,
libgd_dep,
libgd_vapi_dep,
libsecret,
@@ -129,6 +130,7 @@ dependencies = [
libsoup,
libarchive,
tracker,
+ webkitgtk,
]
if govirt.found()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]