diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8 index 9a3eab403274a13fe69c91fad1d67c5296b602c2..008b065904eb16aa4ae849ae892127d9cb682b65 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 a9cf3a051d651a9f4b8f2725cd94f906f115399a..58c96c439aebb9cb6eead06e95be0f7935f6608d 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 a5f5c7123cbf4461b0600b47d0848269291f7c4c..da872a85d2a463ac5c891bdca7acbf74351a0634 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 eef764da381e6897df3c0403b6a39e1428bcad93..263499ee1fee4fecc0a143b7faffa8c3c681922e 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 8c73277ded0754e5922608872a7c5bf610878fc0..f25dd0b76984612074dd7a947114be961f6f7883 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 cc9c0dae0376ae6d55370326160599fa54e117cd..afa3b05668f86979bd0e2c9ba3f070bbad20dd45 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 122f0001cf4a7ace116fa3b1f533a21f23fa1d70..27ab734ed2957c3350170b12cf063083113e54e3 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 a4f551e2903a337f830818ba680fe217880103ec..8025b2717d4e33380675b2e5737fde303eb04455 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 87d72f59dafa3d308ed0bdc70b6bcfd23f66c2c8..70f7aa5e7993af68a70a6c22ee27fea9189bd293 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 706c14119c80096bb0e0076a6ca488a802c9c89e..a8eb5bea1882e5f3d2d9834c4d7eafa62dcf0686 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 1cf17a41e1de9de89c1c4cf9ab5aaea55d048d65..7a8097e7bf25728dd5e4b907eda14c5af20ed3c2 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 d3b2462ad5b930a729fea7d461dcf08e0f2f859b..e686d1f7191d781179da3aeb0bca50487b07d1c0 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 ca4d44f4e84017ef3f995956dae912079641de6b..15ab94fa27b708b3738d667c9adcd7e6e8995f1c 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 e3e7e515bdc6e60dd25ee60e3ce56a3cb189a315..c4cf5a78d8c2a72241ca6402c50b9cf4a4450ac9 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 ec6892dc7a15dd75ff05c76804cab9ff41b7a88d..1a5bb2a52a24d9d452e7b05be8ff3fd03575b0a1 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 6d283a150eb9f89d562d5c683ed94454b5832d58..eabc6dcc79e937199cf94e35248a8dd7ab869b93 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 38bcce38c18a6c068b6577fab84f345134fa03fa..33e35d6859d26e8135607780da7a8c9850b71876 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 35589e6b6a5a4ba1f401e1ef8f64997ccc7d2a02..6cd58e5179cca067b0ddf2d2c265b5e0bdf46efd 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