From 0070c098ee23aa98f0f6f13ecd54b6eb7ebf7f14 Mon Sep 17 00:00:00 2001
From: aviau <alexandre@alexandreviau.net>
Date: Fri, 28 Oct 2016 15:00:43 -0400
Subject: [PATCH] Packaging: depend on webkitgtk
Change-Id: If7fc608364f3dc9ea0d08650a4efc34756d61c63
Reviewed-by: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
---
docker/Dockerfile_debian_8 | 1 +
docker/Dockerfile_debian_8_i386 | 1 +
docker/Dockerfile_debian_9 | 1 +
docker/Dockerfile_debian_9_i386 | 1 +
docker/Dockerfile_fedora_22 | 1 +
docker/Dockerfile_fedora_22_i386 | 1 +
docker/Dockerfile_fedora_23 | 1 +
docker/Dockerfile_fedora_23_i386 | 1 +
docker/Dockerfile_fedora_24 | 1 +
docker/Dockerfile_fedora_24_i386 | 1 +
docker/Dockerfile_ubuntu_14.04 | 1 +
docker/Dockerfile_ubuntu_14.04_i386 | 1 +
docker/Dockerfile_ubuntu_15.10 | 1 +
docker/Dockerfile_ubuntu_15.10_i386 | 1 +
docker/Dockerfile_ubuntu_16.04 | 1 +
docker/Dockerfile_ubuntu_16.04_i386 | 1 +
packaging/rules/debian/control | 1 +
packaging/rules/fedora/ring.spec | 1 +
18 files changed, 18 insertions(+)
diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index 9a3eab40..008b0659 100644
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -56,6 +56,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386
index a9cf3a05..58c96c43 100644
--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -56,6 +56,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index a5f5c712..da872a85 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -56,6 +56,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index eef764da..263499ee 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -56,6 +56,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_fedora_22 b/docker/Dockerfile_fedora_22
index 8c73277d..f25dd0b7 100644
--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -47,6 +47,7 @@ RUN dnf upgrade -y && \
patch \
jsoncpp-devel \
libnatpmp-devel \
+ webkitgtk4-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_22_i386 b/docker/Dockerfile_fedora_22_i386
index cc9c0dae..afa3b056 100644
--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -47,6 +47,7 @@ RUN dnf upgrade -y && \
patch \
jsoncpp-devel \
libnatpmp-devel \
+ webkitgtk4-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_23 b/docker/Dockerfile_fedora_23
index 122f0001..27ab734e 100644
--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -47,6 +47,7 @@ RUN dnf upgrade -y && \
patch \
jsoncpp-devel \
libnatpmp-devel \
+ webkitgtk4-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_23_i386 b/docker/Dockerfile_fedora_23_i386
index a4f551e2..8025b271 100644
--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -47,6 +47,7 @@ RUN dnf upgrade -y && \
patch \
jsoncpp-devel \
libnatpmp-devel \
+ webkitgtk4-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_24 b/docker/Dockerfile_fedora_24
index 87d72f59..70f7aa5e 100644
--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -47,6 +47,7 @@ RUN dnf upgrade -y && \
patch \
jsoncpp-devel \
libnatpmp-devel \
+ webkitgtk4-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_24_i386 b/docker/Dockerfile_fedora_24_i386
index 706c1411..a8eb5bea 100644
--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -47,6 +47,7 @@ RUN dnf upgrade -y && \
patch \
jsoncpp-devel \
libnatpmp-devel \
+ webkitgtk4-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_ubuntu_14.04 b/docker/Dockerfile_ubuntu_14.04
index 1cf17a41..7a8097e7 100644
--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -57,6 +57,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-3.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386
index d3b2462a..e686d1f7 100644
--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -57,6 +57,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-3.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_15.10 b/docker/Dockerfile_ubuntu_15.10
index ca4d44f4..15ab94fa 100644
--- a/docker/Dockerfile_ubuntu_15.10
+++ b/docker/Dockerfile_ubuntu_15.10
@@ -57,6 +57,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386
index e3e7e515..c4cf5a78 100644
--- a/docker/Dockerfile_ubuntu_15.10_i386
+++ b/docker/Dockerfile_ubuntu_15.10_i386
@@ -57,6 +57,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
index ec6892dc..1a5bb2a5 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -57,6 +57,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index 6d283a15..eabc6dcc 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -57,6 +57,7 @@ RUN apt-get update && \
libappindicator3-dev \
libqrencode-dev \
libnm-glib-dev \
+ libwebkit2gtk-4.0-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index 38bcce38..33e35d68 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 9),
libqrencode-dev,
libappindicator3-dev,
libnm-glib-dev,
+ libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# ring-daemon
libdbus-1-dev,
libdbus-c++-dev,
diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec
index 35589e6b..6cd58e51 100644
--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -64,6 +64,7 @@ BuildRequires: qrencode-devel
BuildRequires: libappindicator-gtk3-devel
BuildRequires: NetworkManager-glib-devel
BuildRequires: libva-devel
+BuildRequires: webkitgtk4-devel
%description
Ring is free software for universal communication which respects freedoms
--
GitLab