Source: cinnamon-control-center
Version: 3.6.5-1.1
Severity: wishlist
Tags: patch
User: pkg-utopia-maintain...@lists.alioth.debian.org
Usertags: libnm
Hi,
cinnamon-control-center declares a Build-Depends on network-manager-dev.
Afaics, the only reason why NetworkManager.pc is required is due to the
following in configure.ac:
NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
AC_SUBST(NM_VPN_CONFIG_DIR)
AC_SUBST(NM_VPN_MODULE_DIR)
Those defines, NM_VPN_CONFIG_DIR and NM_VPN_MODULE_DIR are never used in
the code though. It thus seems safe to drop the Build-Depends on
network-manager-dev and clean up the use of
NM_VPN_CONFIG_DIR/NM_VPN_MODULE_DIR (patch for that is attached).
Please consider applying the attached patch in your next upload and drop
the Build-Depends on network-manager-dev.
Thanks,
Michael
-- System Information:
Debian Release: buster/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Description: Stop requiring NetworkManager.pc
We don't actually use NM_VPN_CONFIG_DIR and NM_VPN_MODULE_DIR, along with the
corresponding configure check.
Author: Michael Biebl <bi...@debian.org>
--- cinnamon-control-center-3.6.5.orig/configure.ac
+++ cinnamon-control-center-3.6.5/configure.ac
@@ -157,10 +157,6 @@ if test "x$enable_networkmanager" = xyes
if test x${have_networkmanager} = xyes; then
AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is
available])
- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
- AC_SUBST(NM_VPN_CONFIG_DIR)
- AC_SUBST(NM_VPN_MODULE_DIR)
fi
if test x${have_nma_18} = xyes; then
---
cinnamon-control-center-3.6.5.orig/panels/network/connection-editor/Makefile.am
+++ cinnamon-control-center-3.6.5/panels/network/connection-editor/Makefile.am
@@ -37,9 +37,7 @@ libconnection_editor_la_CPPFLAGS = \
$(PANEL_CFLAGS) \
-I$(srcdir)/../wireless-security \
$(NETWORK_PANEL_CFLAGS) \
- $(NETWORK_MANAGER_CFLAGS) \
- -DNM_VPN_CONFIG_DIR=\""$(NM_VPN_CONFIG_DIR)"\" \
- -DNM_VPN_MODULE_DIR=\""$(NM_VPN_MODULE_DIR)"\"
+ $(NETWORK_MANAGER_CFLAGS)
libconnection_editor_la_LIBADD = \
$(builddir)/../wireless-security/libwireless-security.la \
