From feea7bbb99c1b97fea1ce0a6be8437a568718032 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 19 Dec 2017 16:36:05 +0100
Subject: [PATCH] packaging: use libnm instead of libnm-glib
libnm-glib has been deprecated for three years and is eventually
going to disappear.
[GR: update Debian/Ubuntu deps as well and all docker files]
Change-Id: I60a9b1a37098715ac55d5fee6718883d2a55fe3c
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Signed-off-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
---
docker/Dockerfile_debian_8 | 2 +-
docker/Dockerfile_debian_8_i386 | 2 +-
docker/Dockerfile_debian_9 | 2 +-
docker/Dockerfile_debian_9_i386 | 2 +-
docker/Dockerfile_fedora_22 | 3 ++-
docker/Dockerfile_fedora_22_i386 | 3 ++-
docker/Dockerfile_fedora_23 | 3 ++-
docker/Dockerfile_fedora_23_i386 | 3 ++-
docker/Dockerfile_fedora_24 | 3 ++-
docker/Dockerfile_fedora_24_i386 | 3 ++-
docker/Dockerfile_fedora_25 | 3 ++-
docker/Dockerfile_fedora_25_i386 | 3 ++-
docker/Dockerfile_fedora_26 | 3 ++-
docker/Dockerfile_fedora_27 | 3 ++-
docker/Dockerfile_ubuntu_14.04 | 2 +-
docker/Dockerfile_ubuntu_14.04_i386 | 2 +-
docker/Dockerfile_ubuntu_15.10 | 2 +-
docker/Dockerfile_ubuntu_15.10_i386 | 2 +-
docker/Dockerfile_ubuntu_16.04 | 2 +-
docker/Dockerfile_ubuntu_16.04_i386 | 2 +-
docker/Dockerfile_ubuntu_16.10 | 2 +-
docker/Dockerfile_ubuntu_16.10_i386 | 2 +-
docker/Dockerfile_ubuntu_17.04 | 2 +-
docker/Dockerfile_ubuntu_17.04_i386 | 2 +-
docker/Dockerfile_ubuntu_17.10 | 2 +-
docker/Dockerfile_ubuntu_17.10_i386 | 2 +-
make-ring.py | 8 ++++----
packaging/rules/debian/control | 2 +-
packaging/rules/fedora/ring.spec | 2 +-
29 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index b906e4a0..73f61bd3 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 52f5d860..e66deaf8 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 c316443f..b8e22164 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 9f8beed9..46f1824d 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 42ea139a..f9a92c6b 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 ba427e84..9e68e157 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 da194874..fdcf3f62 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 79af6dbb..28fd2f7b 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 134ccdb0..2db293ef 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 7341979b..bc20d48e 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 30cd5a59..93540d77 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 85c21297..0f5aa1b8 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 c2aaf84d..22d3c5b3 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 cf6d3476..5f0ad50a 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 650deea5..7e7366e1 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 ec3b4f88..b1ca9e7b 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 45d87d3f..6ccecdb1 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 3052c671..979a3557 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 eb4e010f..c5bb5c41 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 07fc3394..ee33168a 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 7aab5dff..89e96d50 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 6f55736b..608fc08e 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 6e26e2e3..2a02ff3c 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 93c41594..d47380d0 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 34c6766d..89e3086b 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 4214187c..7ac92f86 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 1afe11dc..05c5c32d 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 a30291c9..f4cc1443 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 af3424b5..82376601 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
--
GitLab