diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index b906e4a0d3610f9dc3239a82ceabc094d1c48218..73f61bd307fe4b23fbb776434d4377988e9fd42f 100644
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -56,7 +56,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386
index 52f5d86076d0b42dcb979829136cf5c09d4706ab..e66deaf835a3c083a160bdf25294547e695e12e1 100644
--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -56,7 +56,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index c316443f9fbfa25cea7342d26fb9359e6347e2c5..b8e221640395388b905661d6c94bde7bbbd8e37b 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -58,7 +58,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index 9f8beed97cb5eb907f7cffddefa66d2f97fbbdbc..46f1824d100f1da612085d6c2d1be08f6a8b4e50 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -58,7 +58,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_fedora_22 b/docker/Dockerfile_fedora_22
index 42ea139a686d1a4641ecd754911cbe501e21dc18..f9a92c6b908d5d885091396a6f7a5d7eaf341384 100644
--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ NetworkManager-libnm-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 ba427e84db61efc26b7e1b96f7a125307fd59074..9e68e1570cc1d0ed69215eb277928b89ebc66e58 100644
--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ NetworkManager-libnm-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 da194874847575b0ef916dad76cf534eefc2a005..fdcf3f6265630a162e26651fa186096244982256 100644
--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ NetworkManager-libnm-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 79af6dbbb487d342432a960525382cd42302a654..28fd2f7b34b806ed0ce0fe62e8c3a6405f750ff4 100644
--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ NetworkManager-libnm-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 134ccdb04a8cfdb283848ad8bdc774e42ce22824..2db293ef368ff61bc03a631dac4fcac8a916a531 100644
--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ NetworkManager-libnm-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 7341979bb7f0ab035a13606db26df8a7be90796c..bc20d48ec41fd11804f3242f11efbf6077c5dd94 100644
--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
- libvdpau-devel
+ libvdpau-devel \
+ NetworkManager-libnm-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_25 b/docker/Dockerfile_fedora_25
index 30cd5a5992c85af5d3b3a2a6fd53c8228dca34ca..93540d77916c818219195136b064aa9d50258d66 100644
--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- msgpack-devel
+ msgpack-devel \
+ NetworkManager-libnm-devel
# Packaging tools
RUN dnf install -y yum-utils rpmdevtools
diff --git a/docker/Dockerfile_fedora_25_i386 b/docker/Dockerfile_fedora_25_i386
index 85c21297476146b9407073ed996b67964b7fd5cc..0f5aa1b8b0a8b1035fa6f5805922c6cda4ed2479 100644
--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -52,7 +52,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- msgpack-devel
+ msgpack-devel \
+ NetworkManager-libnm-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26
index c2aaf84d1dd7d503eda277040a89782d0c16a527..22d3c5b34466f558006db6a276287075fd91bba3 100644
--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_26
@@ -52,7 +52,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- msgpack-devel
+ msgpack-devel \
+ NetworkManager-libnm-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
index cf6d3476570c408467a976ff06caf24bf796bbc3..5f0ad50a70feb56c15eb3f89554db015b7352ce8 100644
--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -52,7 +52,8 @@ RUN dnf upgrade -y && \
cryptopp-devel \
libva-devel \
libvdpau-devel \
- msgpack-devel
+ msgpack-devel \
+ NetworkManager-libnm-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 650deea5efb7cd09cb25716528aae8ffe20d8bb9..7e7366e1cd98a6a7903dfa85ebcee130a406c3d1 100644
--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -57,7 +57,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386
index ec3b4f88732771e344ef51f399599118184e31b9..b1ca9e7b0fc2d1416ea4b7f0a23a4d57800e0f13 100644
--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -57,7 +57,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_15.10 b/docker/Dockerfile_ubuntu_15.10
index 45d87d3fd6a5014b88844c06ed850f1499568a58..6ccecdb1e23f8101b98407bead4d5a473b5cbf04 100644
--- a/docker/Dockerfile_ubuntu_15.10
+++ b/docker/Dockerfile_ubuntu_15.10
@@ -57,7 +57,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386
index 3052c671be0771b9e3f69a7be165aa564605d462..979a3557847769a58c33b909c908d22a5983aecd 100644
--- a/docker/Dockerfile_ubuntu_15.10_i386
+++ b/docker/Dockerfile_ubuntu_15.10_i386
@@ -57,7 +57,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
index eb4e010fa02e48b4533c71a11be1525d2f632fda..c5bb5c41367a5035b953433196b2d47627295f13 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -57,7 +57,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index 07fc3394e269cb1629618ea528ec7a137623bcd0..ee33168a4335f26754f86c223ac8518faae159e6 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -57,7 +57,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_16.10 b/docker/Dockerfile_ubuntu_16.10
index 7aab5dff3026a161798997396c28e857d5d852e7..89e96d50ac6d85afca4e3f17e618e4fc630eb785 100644
--- a/docker/Dockerfile_ubuntu_16.10
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -67,7 +67,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386
index 6f55736bfb98dc77e7c673f4d9ecaf8c6a034fbc..608fc08e6a935fc476cef84500a11dff29e23627 100644
--- a/docker/Dockerfile_ubuntu_16.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -67,7 +67,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04
index 6e26e2e32757b0c6c8992485006a4f9f04cee08a..2a02ff3ca7191d895d1f7ef87c42d54e45139833 100644
--- a/docker/Dockerfile_ubuntu_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -69,7 +69,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index 93c4159418abaebb863419d4f35ebe33b42a169e..d47380d07a5c58125bb9c9c0f32dff46402019fb 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -69,7 +69,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_17.10 b/docker/Dockerfile_ubuntu_17.10
index 34c6766d57e7d274f20d3617a2958aa0eebafcf5..89e3086b1d1efe7d4c0750e2e1466a269a6b53af 100644
--- a/docker/Dockerfile_ubuntu_17.10
+++ b/docker/Dockerfile_ubuntu_17.10
@@ -69,7 +69,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/docker/Dockerfile_ubuntu_17.10_i386 b/docker/Dockerfile_ubuntu_17.10_i386
index 4214187cce266a758dd4f50c85172f7c54f68aa0..7ac92f862575d44017a4d0a50230976919042e3e 100644
--- a/docker/Dockerfile_ubuntu_17.10_i386
+++ b/docker/Dockerfile_ubuntu_17.10_i386
@@ -69,7 +69,7 @@ RUN apt-get update && \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
- libnm-glib-dev \
+ libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
diff --git a/make-ring.py b/make-ring.py
index 1afe11dcd8aac2e862f62886118c96791fe20394..05c5c32d942833699b29724ffd98aaffad9a7693 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -109,7 +109,7 @@ FEDORA_DEPENDENCIES = [
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel',
'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel',
- 'webkitgtk4-devel', 'NetworkManager-glib-devel', 'libvdpau-devel', 'msgpack-devel'
+ 'webkitgtk4-devel', 'NetworkManager-libnm-devel', 'libvdpau-devel', 'msgpack-devel'
]
UBUNTU_DEPENDENCIES = [
@@ -123,7 +123,7 @@ UBUNTU_DEPENDENCIES = [
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
- 'libva-dev', 'libnm-glib-dev',
+ 'libva-dev', 'libnm-dev',
'libwebkit2gtk-4.0-dev', 'libvdpau-dev', 'libmsgpack-dev'
]
@@ -138,7 +138,7 @@ DEBIAN_DEPENDENCIES = [
'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
- 'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-glib-dev', 'libvdpau-dev', 'libmsgpack-dev'
+ 'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-dev', 'libvdpau-dev', 'libmsgpack-dev'
]
ARCH_LINUX_DEPENDENCIES = [
@@ -147,7 +147,7 @@ ARCH_LINUX_DEPENDENCIES = [
'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
- 'automake', 'libva', 'webkit2gtk', 'libnm-glib', 'libvdpau'
+ 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau'
]
OSX_DEPENDENCIES = [
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index a30291c9d7b4346bd7f0ff10cef10650fb0708c6..f4cc1443602810da1f34b1ef6e4c4ed82f4ea850 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9),
gettext,
libqrencode-dev,
libappindicator3-dev,
- libnm-glib-dev,
+ libnm-dev,
libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# ring-daemon
libdbus-1-dev,
diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec
index af3424b529dbb2661732b77d4f62b8b734d4f72d..82376601163cf80768c08dd672da8a22935fc6bc 100644
--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -62,7 +62,7 @@ BuildRequires: libnotify-devel
BuildRequires: qt5-qttools-devel
BuildRequires: qrencode-devel
BuildRequires: libappindicator-gtk3-devel
-BuildRequires: NetworkManager-glib-devel
+BuildRequires: NetworkManager-libnm-devel
BuildRequires: libva-devel
BuildRequires: webkitgtk4-devel
BuildRequires: cryptopp-devel