Packaging: depend on webkitgtk

Change-Id: If7fc608364f3dc9ea0d08650a4efc34756d61c63 Reviewed-by: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>

Packaging: depend on webkitgtk
Change-Id: If7fc608364f3dc9ea0d08650a4efc34756d61c63 Reviewed-by: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
0070c098 · aviau · Stepan Salenikovich · a81e132d · 0070c098 · 0070c098
Commit 0070c098 authored Oct 28, 2016 by aviau Committed by Stepan Salenikovich Oct 31, 2016
18 changed files
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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,

--- 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