GNOME.org
 

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


commit e4de2e331a7e54ede65a5d5e3679df37e377a35a
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                               | 51 -------------------------------
 configure.ac                              | 26 ----------------
 properties/libnm-libreswan-properties.ver |  6 ----
 properties/nm-libreswan-editor-plugin.c   | 10 ------
 properties/nm-libreswan-editor.c          |  4 ---
 shared/nm-default.h                       | 25 ---------------
 7 files changed, 126 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f16d3f..406eea0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,6 @@
     - cd NetworkManager-libreswan-*/
     - ./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 8bae961..29084a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,43 +164,7 @@ properties_libnm_gtk4_vpn_plugin_libreswan_editor_la_LDFLAGS = \
 
 ###############################################################################
 
-if WITH_GNOME
-if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += properties/libnm-libreswan-properties.la
-endif
-endif
-
-properties_libnm_libreswan_properties_la_CFLAGS = \
-       -DNM_VPN_OLD \
-       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-       $(common_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS) \
-       $(LIBNM_GTK_CFLAGS)
-
-nodist_properties_libnm_libreswan_properties_la_SOURCES = \
-       properties/resources.h \
-       properties/resources.c
-
-properties_libnm_libreswan_properties_la_SOURCES = \
-       shared/utils.c \
-       shared/utils.h \
-       $(plugin_sources) \
-       $(editor_sources)
-
-properties_libnm_libreswan_properties_la_LIBADD = \
-       $(GTK_LIBS) \
-       $(LIBNM_GLIB_LIBS) \
-       $(LIBNM_GTK_LIBS)
-
-properties_libnm_libreswan_properties_la_LDFLAGS = \
-       -avoid-version \
-       -Wl,--version-script="$(srcdir)/properties/libnm-libreswan-properties.ver"
-
-###############################################################################
-
 EXTRA_DIST += \
-       properties/libnm-libreswan-properties.ver \
        properties/libnm-vpn-plugin-libreswan.ver \
        properties/libnm-vpn-plugin-libreswan-editor.ver \
        properties/nm-libreswan-dialog.ui
@@ -365,21 +329,6 @@ EXTRA_DIST += \
 
 ###############################################################################
 
-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-libreswan-service.name.in \
-           >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-libreswan-service.name
-
-uninstall-hook:
-        rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-libreswan-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 27ee9c6..e68c512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,12 +95,6 @@ dnl GNOME support
 dnl
 AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-libreswan without GNOME support, 
e.g. vpn service only]), [], [with_gnome_specified=no])
 AC_ARG_WITH(gtk4, AS_HELP_STRING([--with-gtk4], [Build NetworkManager-libreswan with libnma-gtk4 support]), 
[], [with_gtk4_specified=no])
-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-libreswan 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
@@ -110,15 +104,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)]))
 
@@ -149,18 +136,6 @@ if test x"$with_gnome" != xno; then
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
        PKG_CHECK_MODULES(LIBNMA, libnma >= 1.2.0)
-
-       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
@@ -211,7 +186,6 @@ echo ""
 echo "Build configuration: "
 echo "  --with-gnome=$with_gnome"
 echo "  --with-gtk4=$with_gtk4"
-echo "  --with-libnm-glib=$with_libnm_glib"
 echo "  --enable-absolute-paths=$enable_absolute_paths"
 echo "  --enable-more-warnings=$set_more_warnings"
 echo "  --with-nm-ipsec-conf=$with_nm_ipsec_conf"
diff --git a/properties/nm-libreswan-editor-plugin.c b/properties/nm-libreswan-editor-plugin.c
index a974766..af72425 100644
--- a/properties/nm-libreswan-editor-plugin.c
+++ b/properties/nm-libreswan-editor-plugin.c
@@ -34,11 +34,7 @@
 
 #include "utils.h"
 
-#ifdef NM_VPN_OLD
-#include "nm-libreswan-editor.h"
-#else
 #include "nm-utils/nm-vpn-plugin-utils.h"
-#endif
 
 #define LIBRESWAN_PLUGIN_NAME    _("IPsec based VPN")
 #define LIBRESWAN_PLUGIN_DESC    _("IPsec based VPN for remote clients")
@@ -315,7 +311,6 @@ get_capabilities (NMVpnEditorPlugin *iface)
        return NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT | NM_VPN_EDITOR_PLUGIN_CAPABILITY_IMPORT;
 }
 
-#ifndef NM_VPN_OLD
 static NMVpnEditor *
 _call_editor_factory (gpointer factory,
                       NMVpnEditorPlugin *editor_plugin,
@@ -327,7 +322,6 @@ _call_editor_factory (gpointer factory,
                                               connection,
                                               error);
 }
-#endif
 
 static NMVpnEditor *
 get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
@@ -350,9 +344,6 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
                editor = "libnm-gtk4-vpn-plugin-libreswan-editor.so";
        }
 
-#ifdef NM_VPN_OLD
-       return nm_vpn_editor_new (connection, error);
-#else
        return nm_vpn_plugin_utils_load_editor (editor,
                                                "nm_vpn_editor_factory_libreswan",
                                                _call_editor_factory,
@@ -360,7 +351,6 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
                                                connection,
                                                NULL,
                                                error);
-#endif
 }
 
 static void
diff --git a/properties/nm-libreswan-editor.c b/properties/nm-libreswan-editor.c
index 4d372c6..bc1fd44 100644
--- a/properties/nm-libreswan-editor.c
+++ b/properties/nm-libreswan-editor.c
@@ -814,8 +814,6 @@ libreswan_editor_interface_init (NMVpnEditorInterface *iface_class)
 
 /*****************************************************************************/
 
-#ifndef NM_VPN_OLD
-
 #include "nm-libreswan-editor-plugin.h"
 
 G_MODULE_EXPORT NMVpnEditor *
@@ -827,5 +825,3 @@ nm_vpn_editor_factory_libreswan (NMVpnEditorPlugin *editor_plugin,
 
        return nm_vpn_editor_new (connection, error);
 }
-#endif
-
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 58807cc..e40dbd0 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -61,25 +61,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 nm_simple_connection_new                    nm_connection_new
-#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
-
-#else /* !NM_VPN_OLD */
-
 #include <NetworkManager.h>
 
 #define NMV_EDITOR_PLUGIN_ERROR                     NM_CONNECTION_ERROR
@@ -87,17 +68,11 @@
 #define NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_CONNECTION_ERROR_INVALID_PROPERTY
 #define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_VPN        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]