GNOME.org
 

[NetworkManager-pptp/lr/no-libnm-glib: 1/3] all: drop libnm-glib version


commit 7b44660ef9cc6e3888f01354d91216bd3f2888a1
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Jun 27 16:15:03 2022 +0200

    all: drop libnm-glib version
    
    libnm is there since 2014 and libnm-glib has been removed in 2019.
    Drop support for libnm-glib.

 .gitlab-ci.yml                       |  4 ---
 Makefile.am                          | 48 +-----------------------------------
 configure.ac                         | 26 -------------------
 properties/libnm-pptp-properties.ver |  6 -----
 properties/nm-pptp-editor-plugin.c   | 11 ---------
 properties/nm-pptp-editor.c          |  4 ---
 shared/nm-default.h                  | 25 -------------------
 7 files changed, 1 insertion(+), 123 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47ca9b8..3acdc14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,6 @@
     - cd NetworkManager-pptp-*/
     - ./configure
       --disable-silent-rules
-      --without-libnm-glib
     - make -j
     - make -j check
     - make -j install
@@ -53,9 +52,6 @@ fedora28_dist:
     - dnf -y install
       /usr/bin/autopoint
       autoconf automake make
-      NetworkManager-devel
-      NetworkManager-glib-devel
-      libnm-gtk-devel
     - sh autogen.sh
     - make -j dist
   artifacts:
diff --git a/Makefile.am b/Makefile.am
index ef7314f..392b4ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ BUILT_SOURCES =
 shared_sources = \
        shared/nm-default.h \
        shared/nm-utils/gsystem-local-alloc.h \
+       shared/nm-utils/nm-glib.h \
        shared/nm-utils/nm-macros-internal.h \
        shared/nm-utils/nm-shared-utils.c \
        shared/nm-utils/nm-shared-utils.h
@@ -162,7 +163,6 @@ CLEANFILES += \
 EXTRA_DIST += \
        properties/nm-pptp-dialog.ui \
        properties/gresource.xml \
-       properties/libnm-pptp-properties.ver \
        properties/libnm-vpn-plugin-pptp.ver \
        properties/libnm-vpn-plugin-pptp-editor.ver
 
@@ -242,37 +242,6 @@ properties_libnm_gtk4_vpn_plugin_pptp_editor_la_LDFLAGS = \
 
 ###############################################################################
 
-if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += properties/libnm-pptp-properties.la
-endif
-
-properties_libnm_pptp_properties_la_SOURCES = \
-       shared/nm-utils/nm-glib.h \
-       $(plugin_sources) \
-       $(editor_sources)
-nodist_properties_libnm_pptp_properties_la_SOURCES = \
-       properties/resources.c \
-       properties/resources.h
-properties_libnm_pptp_properties_la_CFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS) \
-       $(LIBNM_GTK_CFLAGS)
-properties_libnm_pptp_properties_la_CPPFLAGS = \
-       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-       -DNM_VPN_OLD \
-       $(properties_cppflags)
-properties_libnm_pptp_properties_la_LIBADD = \
-       $(GLIB_LIBS) \
-       $(GTK_LIBS) \
-       $(LIBNM_GLIB_LIBS) \
-       $(LIBNM_GLIB_LIBS)
-properties_libnm_pptp_properties_la_LDFLAGS = \
-       -avoid-version \
-       -Wl,--version-script="$(srcdir)/properties/libnm-pptp-properties.ver"
-
-###############################################################################
-
 if WITH_GNOME
 libexec_PROGRAMS += auth-dialog/nm-pptp-auth-dialog
 endif
@@ -297,21 +266,6 @@ auth_dialog_nm_pptp_auth_dialog_LDADD = \
 
 ###############################################################################
 
-if WITH_LIBNM_GLIB
-# Install a file with full path to plugins for an old gnome-shell
-# https://bugzilla.gnome.org/show_bug.cgi?id=693590
-install-data-hook:
-       mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
-       sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
-           -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-           -e 's|[@]PLUGINDIR[@]|@NM_PLUGIN_DIR@|g' \
-           <$(srcdir)/nm-pptp-service.name.in \
-           >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-pptp-service.name
-
-uninstall-hook:
-        rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-pptp-service.name
-endif
-
 appdatadir = $(datadir)/metainfo
 appdata_files = $(appdata_in_files:.xml.in=.xml)
 if WITH_GNOME
diff --git a/configure.ac b/configure.ac
index 7bfc9fb..52f8865 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,12 +75,6 @@ dnl GNOME support
 dnl
 AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-pptp without GNOME support, e.g. 
vpn service only]), [], [with_gnome_specified=no])
 AC_ARG_WITH(gtk4, AS_HELP_STRING([--with-gtk4], [Build NetworkManager-pptp with libnma-gtk4 support]), [], 
[with_gtk4_specified=no])
-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-pptp with libnm-glib 
comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
-if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
-       if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
-               AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
-       fi
-fi
 if test "$with_gnome" != no; then
        with_gnome=yes
 fi
@@ -90,15 +84,8 @@ fi
 if test "$with_gtk4" != yes; then
        with_gtk4=no
 fi
-if test "$with_libnm_glib_specified" == no; then
-       with_libnm_glib=no
-fi
-if test "$with_libnm_glib" != yes; then
-       with_libnm_glib=no
-fi
 AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
 AM_CONDITIONAL(WITH_GTK4, test "$with_gtk4" != no)
-AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
 
 AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name 
files. Useful for development. (default is no)]))
 
@@ -121,18 +108,6 @@ if test x"$with_gnome" != xno; then
 
        PKG_CHECK_MODULES(LIBNMA, libnma >= 1.2.0)
        PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)
-
-       if test x"$with_libnm_glib" != xno; then
-               PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.2.0)
-               PKG_CHECK_MODULES(LIBNM_GLIB,
-                       NetworkManager >= 1.2.0
-                       libnm-util >= 1.2.0
-                       libnm-glib >= 1.2.0
-                       libnm-glib-vpn >= 1.2.0);
-
-               LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
-               LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
-       fi
 fi
 if test x"$with_gtk4" != xno; then
        PKG_CHECK_MODULES(GTK4, gtk4 >= 4.0)
@@ -179,7 +154,6 @@ echo "Build configuration: "
 echo "  --with-dist-version=$ac_distver"
 echo "  --with-gnome=$with_gnome"
 echo "  --with-gtk4=$with_gtk4"
-echo "  --with-libnm-glib=$with_libnm_glib"
 echo "  --with-pppd-plugin-dir=$PPPD_PLUGIN_DIR"
 echo "  --enable-absolute-paths=$enable_absolute_paths"
 echo "  --enable-more-warnings=$set_more_warnings"
diff --git a/properties/nm-pptp-editor-plugin.c b/properties/nm-pptp-editor-plugin.c
index 9389a40..dd0df40 100644
--- a/properties/nm-pptp-editor-plugin.c
+++ b/properties/nm-pptp-editor-plugin.c
@@ -24,12 +24,7 @@
 #include "nm-default.h"
 
 #include "nm-pptp-editor-plugin.h"
-
-#ifdef NM_VPN_OLD
-#include "nm-pptp-editor.h"
-#else
 #include "nm-utils/nm-vpn-plugin-utils.h"
-#endif
 
 #define PPTP_PLUGIN_NAME    _("Point-to-Point Tunneling Protocol (PPTP)")
 #define PPTP_PLUGIN_DESC    _("Compatible with Microsoft and other PPTP VPN servers.")
@@ -132,7 +127,6 @@ get_capabilities (NMVpnEditorPlugin *iface)
        return NM_VPN_EDITOR_PLUGIN_CAPABILITY_NONE;
 }
 
-#ifndef NM_VPN_OLD
 static NMVpnEditor *
 _call_editor_factory (gpointer factory,
                       NMVpnEditorPlugin *editor_plugin,
@@ -144,7 +138,6 @@ _call_editor_factory (gpointer factory,
                                               connection,
                                               error);
 }
-#endif
 
 static NMVpnEditor *
 get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
@@ -168,9 +161,6 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
                editor = "libnm-gtk4-vpn-plugin-pptp-editor.so";
        }
 
-#ifdef NM_VPN_OLD
-       return nm_vpn_plugin_ui_widget_interface_new (connection, error);
-#else
        return nm_vpn_plugin_utils_load_editor (editor,
                                                "nm_vpn_editor_factory_pptp",
                                                _call_editor_factory,
@@ -178,7 +168,6 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
                                                connection,
                                                NULL,
                                                error);
-#endif
 }
 
 static void
diff --git a/properties/nm-pptp-editor.c b/properties/nm-pptp-editor.c
index 5eb519f..da05368 100644
--- a/properties/nm-pptp-editor.c
+++ b/properties/nm-pptp-editor.c
@@ -508,8 +508,6 @@ pptp_plugin_ui_widget_interface_init (NMVpnEditorInterface *iface_class)
 
 /*****************************************************************************/
 
-#ifndef NM_VPN_OLD
-
 #include "nm-pptp-editor-plugin.h"
 
 G_MODULE_EXPORT NMVpnEditor *
@@ -521,5 +519,3 @@ nm_vpn_editor_factory_pptp (NMVpnEditorPlugin *editor_plugin,
 
        return nm_vpn_plugin_ui_widget_interface_new (connection, error);
 }
-#endif
-
diff --git a/shared/nm-default.h b/shared/nm-default.h
index ae548fb..7ca4b5d 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -66,25 +66,6 @@
 
 /*****************************************************************************/
 
-#ifdef NM_VPN_OLD
-
-#define NM_VPN_LIBNM_COMPAT
-#include <nm-connection.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-8021x.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-vpn.h>
-#include <nm-utils.h>
-#include <nm-vpn-plugin-ui-interface.h>
-
-#define NMV_EDITOR_PLUGIN_ERROR                     NM_SETTING_VPN_ERROR
-#define NMV_EDITOR_PLUGIN_ERROR_FAILED              NM_SETTING_VPN_ERROR_UNKNOWN
-#define NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_SETTING_VPN_ERROR_INVALID_PROPERTY
-#define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_VPN        NM_SETTING_VPN_ERROR_UNKNOWN
-#define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE   NM_SETTING_VPN_ERROR_UNKNOWN
-
-#else /* !NM_VPN_OLD */
-
 #include <NetworkManager.h>
 
 #define NMV_EDITOR_PLUGIN_ERROR                     NM_CONNECTION_ERROR
@@ -93,17 +74,11 @@
 #define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_VPN        NM_CONNECTION_ERROR_FAILED
 #define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE   NM_CONNECTION_ERROR_FAILED
 
-#endif /* NM_VPN_OLD */
-
 /*****************************************************************************/
 
 #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR
 
-#ifdef NM_VPN_OLD
-#include <nm-ui-utils.h>
-#else /* NM_VPN_OLD */
 #include <nma-ui-utils.h>
-#endif /* NM_VPN_OLD */
 
 #endif /* NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]