GNOME.org
 

[network-manager-applet/lr/libnm-gtkicide] all: lay libnm-gtk to rest

commit 3af1d162b25a62fffccdd743c204061097f4872a
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Oct 9 16:52:54 2019 +0200

    all: lay libnm-gtk to rest
    
    It's about time.

 .gitlab-ci.yml                                |    4 -
 Makefile.am                                   |  194 ---
 NEWS                                          |    8 +
 configure.ac                                  |   24 -
 meson.build                                   |   28 +-
 meson_options.txt                             |    1 -
 po/POTFILES.in                                |    7 -
 src/libnm-gtk/check-exports.sh                |  130 --
 src/libnm-gtk/examples/mobile-providers.js    |   23 -
 src/libnm-gtk/init.c                          |   23 -
 src/libnm-gtk/libnm-gtk.pc.in                 |   12 -
 src/libnm-gtk/libnm-gtk.ver                   |   45 -
 src/libnm-gtk/meson.build                     |  147 ---
 src/libnm-gtk/nm-cert-chooser.h               |  203 ---
 src/libnm-gtk/nm-mobile-providers.c           | 1553 -----------------------
 src/libnm-gtk/nm-mobile-providers.h           |  125 --
 src/libnm-gtk/nm-mobile-wizard.c              | 1657 -------------------------
 src/libnm-gtk/nm-mobile-wizard.h              |   44 -
 src/libnm-gtk/nm-ui-utils.c                   |  967 ---------------
 src/libnm-gtk/nm-ui-utils.h                   |   39 -
 src/libnm-gtk/nm-vpn-password-dialog.c        |  522 --------
 src/libnm-gtk/nm-vpn-password-dialog.h        |   85 --
 src/libnm-gtk/nm-wifi-dialog.c                | 1429 ---------------------
 src/libnm-gtk/nm-wifi-dialog.h                |   70 --
 src/libnm-gtk/nm-wireless-dialog.c            |   52 -
 src/libnm-gtk/nm-wireless-dialog.h            |   62 -
 src/libnm-gtk/nm.gresource.xml                |    6 -
 src/libnm-gtk/tests/iso3166-test.xml          |   69 -
 src/libnm-gtk/tests/serviceproviders-test.xml |   52 -
 src/libnm-gtk/tests/test-mobile-providers.c   |  517 --------
 src/libnm-gtk/wifi.ui                         |  222 ----
 src/meson.build                               |    4 -
 src/utils/meson.build                         |   24 -
 src/wireless-security/meson.build             |   18 -
 34 files changed, 9 insertions(+), 8357 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f541658..c0af9be2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,6 @@
     - tar xJf network-manager-applet-*.tar.xz
     - dnf -y install meson
     - meson
-      -Dlibnm_gtk=false
       -Dwwan=false
       -Dselinux=false
       -Dteam=false
@@ -84,7 +83,6 @@
     - dnf -y install meson
     - tar xJf network-manager-applet-*.tar.xz
     - meson
-      -Dlibnm_gtk=false
       -Dwwan=true
       -Dselinux=true
       -Dteam=true
@@ -162,8 +160,6 @@ fedora28_dist:
   script:
     - dnf -y install
       autoconf automake make
-      NetworkManager-devel
-      NetworkManager-glib-devel
     - sh autogen.sh
     - make -j$(nproc) distcheck
   artifacts:
diff --git a/Makefile.am b/Makefile.am
index b863a683..e5876460 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,10 +38,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-gcr
 
 
-if WITH_LIBNM_GTK
-DISTCHECK_CONFIGURE_FLAGS += --with-libnm-gtk
-endif
-
 man_MANS =
 
 pkgconfig_DATA =
@@ -194,28 +190,6 @@ src_utils_libutils_libnm_la_LIBADD = \
        $(GTK3_LIBS) \
        $(LIBNM_LIBS)
 
-if WITH_LIBNM_GTK
-
-noinst_LTLIBRARIES += src/utils/libutils-libnm-glib.la
-
-src_utils_libutils_libnm_glib_la_CPPFLAGS = \
-       $(dflt_cppflags) \
-       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-       "-I$(srcdir)/shared" \
-       $(GTK3_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS)
-
-src_utils_libutils_libnm_glib_la_SOURCES = \
-       $(shared_files) \
-       src/utils/utils.c \
-       src/utils/utils.h
-
-src_utils_libutils_libnm_glib_la_LIBADD = \
-       $(GTK3_LIBS) \
-       $(LIBNM_GLIB_LIBS)
-
-endif
-
 if WITH_LIBNMA_GTK4
 
 noinst_LTLIBRARIES += src/utils/libutils-libnm-gtk4.la
@@ -329,35 +303,6 @@ src_wireless_security_libwireless_security_libnm_la_LIBADD = \
 
 $(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
 
-if WITH_LIBNM_GTK
-
-noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-glib.la
-
-src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
-       $(wireless_security_c_real)
-
-nodist_src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
-       $(wireless_security_c_gen)
-
-src_wireless_security_libwireless_security_libnm_glib_la_CPPFLAGS = \
-       $(dflt_cppflags) \
-       $(GTK3_CFLAGS) \
-       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-       "-I$(srcdir)/shared" \
-       "-I$(srcdir)/src/utils" \
-       "-I$(srcdir)/src/libnma" \
-       -Isrc/libnma \
-       $(LIBNM_GLIB_CFLAGS)
-
-src_wireless_security_libwireless_security_libnm_glib_la_LIBADD = \
-       src/utils/libutils-libnm-glib.la \
-       $(GTK3_LIBS) \
-       $(LIBNM_GLIB_LIBS)
-
-$(src_wireless_security_libwireless_security_libnm_glib_la_OBJECTS): $(wireless_security_h_gen)
-
-endif
-
 if WITH_LIBNMA_GTK4
 
 noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-gtk4.la
@@ -403,145 +348,6 @@ EXTRA_DIST += \
 
 ###############################################################################
 
-if WITH_LIBNM_GTK
-
-src/libnm-gtk/nm-resources.h: src/libnm-gtk/nm.gresource.xml
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnm-gtk 
--generate-header --internal
-
-src/libnm-gtk/nm-resources.c: src/libnm-gtk/nm.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(srcdir)/src/libnm-gtk --generate-dependencies $(srcdir)/src/libnm-gtk/nm.gresource.xml)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnm-gtk 
--generate-source --internal
-
-CLEANFILES += \
-       $(libnm_gtk_h_priv_gen) \
-       $(libnm_gtk_c_gen)
-
-libnm_gtk_h_priv_gen = \
-       src/libnm-gtk/nm-resources.h
-
-libnm_gtk_c_gen = \
-       src/libnm-gtk/nm-resources.c
-
-libnm_gtk_h_pub = \
-       src/libnm-gtk/nm-wifi-dialog.h \
-       src/libnm-gtk/nm-wireless-dialog.h \
-       src/libnm-gtk/nm-mobile-wizard.h \
-       src/libnm-gtk/nm-ui-utils.h \
-       src/libnm-gtk/nm-mobile-providers.h \
-       src/libnm-gtk/nm-vpn-password-dialog.h \
-       src/libnm-gtk/nm-cert-chooser.h
-
-libnm_gtk_c_real = \
-       src/libnm-gtk/nm-wifi-dialog.c \
-       src/libnm-gtk/nm-wireless-dialog.c \
-       src/libnm-gtk/nm-mobile-wizard.c \
-       src/libnm-gtk/nm-ui-utils.c \
-       src/libnm-gtk/nm-mobile-providers.c \
-       src/libnm-gtk/nm-vpn-password-dialog.c \
-       src/libnma/nma-cert-chooser.c \
-       src/libnma/nma-file-cert-chooser.c \
-       src/libnm-gtk/init.c
-
-src_libnm_gtk_libnmgtkdir = $(includedir)/libnm-gtk
-
-src_libnm_gtk_libnmgtk_HEADERS = \
-       $(libnm_gtk_h_pub)
-
-lib_LTLIBRARIES += src/libnm-gtk/libnm-gtk.la
-
-src_libnm_gtk_libnm_gtk_la_SOURCES = \
-       $(libnm_gtk_c_real)
-
-nodist_src_libnm_gtk_libnm_gtk_la_SOURCES = \
-       $(libnm_gtk_c_gen)
-
-src_libnm_gtk_libnm_gtk_la_CFLAGS = \
-       $(dflt_cppflags) \
-       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-       -DICONDIR=\""$(datadir)/icons"\" \
-       -DBINDIR=\""$(bindir)"\" \
-       -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\" \
-       -DDATADIR=\""$(datadir)"\" \
-       -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
-       -DNMALOCALEDIR=\"$(datadir)/locale\" \
-       "-I$(srcdir)/shared" \
-       "-I$(srcdir)/src/utils" \
-       "-I$(srcdir)/src/wireless-security" \
-       "-I$(srcdir)/src/libnm-gtk" \
-       "-I$(srcdir)/src/libnma" \
-       -Isrc/libnma \
-       $(GTK3_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS) \
-       $(GUDEV_CFLAGS)
-
-src_libnm_gtk_libnm_gtk_la_LIBADD = \
-       src/wireless-security/libwireless-security-libnm-glib.la \
-       $(GTK3_LIBS) \
-       $(LIBNM_GLIB_LIBS) \
-       $(GUDEV_LIBS)
-
-EXTRA_src_libnm_gtk_libnm_gtk_la_DEPENDENCIES = src/libnm-gtk/libnm-gtk.ver
-
-src_libnm_gtk_libnm_gtk_la_LDFLAGS = \
-       -Wl,-no-undefined \
-       -Wl,--version-script=$(srcdir)/src/libnm-gtk/libnm-gtk.ver
-
-$(src_libnm_gtk_libnm_gtk_la_OBJECTS): $(libnm_gtk_h_priv_gen)
-
-check-local-exports-libnm-gtk:
-       $(srcdir)/src/libnm-gtk/check-exports.sh $(builddir)/src/libnm-gtk/.libs/libnm-gtk.so 
$(srcdir)/src/libnm-gtk/libnm-gtk.ver
-
-check_local += check-local-exports-libnm-gtk
-
-
-pkgconfig_DATA += src/libnm-gtk/libnm-gtk.pc
-
-if HAVE_INTROSPECTION
-src/libnm-gtk/NMGtk-1.0.gir: src/libnm-gtk/libnm-gtk.la
-src_libnm_gtk_NMGtk_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
-src_libnm_gtk_NMGtk_1_0_gir_EXPORT_PACKAGES = libnm-gtk
-src_libnm_gtk_NMGtk_1_0_gir_CFLAGS = $(src_libnm_gtk_libnm_gtk_la_CFLAGS)
-src_libnm_gtk_NMGtk_1_0_gir_LIBS = src/libnm-gtk/libnm-gtk.la
-src_libnm_gtk_NMGtk_1_0_gir_FILES = \
-       $(filter-out src/libnm-gtk/nm-wireless-dialog.h, $(libnm_gtk_h_pub)) \
-       $(filter-out src/libnm-gtk/nm-wireless-dialog.c, $(libnm_gtk_c_real))
-src_libnm_gtk_NMGtk_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnm-gtk/NMGtk-1.0.gir
-endif
-
-
-check_programs += src/libnm-gtk/tests/test-mobile-providers
-
-src_libnm_gtk_tests_test_mobile_providers_CPPFLAGS = \
-       $(dflt_cppflags) \
-       -DTEST_DATA_DIR=\""$(abs_srcdir)/src/libnm-gtk/tests"\" \
-       "-I$(srcdir)/shared" \
-       "-I$(srcdir)/src/libnm-gtk" \
-       $(GTK3_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS)
-
-src_libnm_gtk_tests_test_mobile_providers_LDADD = \
-       src/libnm-gtk/libnm-gtk.la \
-       $(LIBNM_GLIB_LIBS)
-
-endif
-
-EXTRA_DIST += \
-       src/libnm-gtk/libnm-gtk.pc.in \
-       src/libnm-gtk/libnm-gtk.ver \
-       src/libnm-gtk/check-exports.sh \
-       src/libnm-gtk/wifi.ui \
-       src/libnm-gtk/nm.gresource.xml \
-       src/libnm-gtk/meson.build \
-       \
-       src/libnm-gtk/tests/iso3166-test.xml \
-       src/libnm-gtk/tests/serviceproviders-test.xml \
-       \
-       src/libnm-gtk/examples/mobile-providers.js \
-       $(NULL)
-
-###############################################################################
-
 src/libnma/nma-resources.h: src/libnma/nma.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma 
--generate-header --internal
 
diff --git a/NEWS b/NEWS
index c35aa23d..52a888d8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+=======================================================
+network-manager-applet-1.8.25
+Overview of changes since network-manager-applet-1.8.24
+=======================================================
+
+* The libnm-gtk, the deprecated libnm-glib compatibility library was
+  removed. Everybody should be using libnma by now.
+
 =======================================================
 network-manager-applet-1.8.24
 Overview of changes since network-manager-applet-1.8.22
diff --git a/configure.ac b/configure.ac
index 378f670f..727fed30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,28 +125,6 @@ dnl API documentation
 dnl
 GTK_DOC_CHECK(1.0)
 
-AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--with-libnm-gtk], [build legacy library libnm-gtk which depends on 
libnm-glib/libnm-util/dbus-glib (deprecated)]))
-if test "$with_libnm_gtk" == yes; then
-       PKG_CHECK_MODULES(LIBNM_GLIB,
-                       [gio-2.0 >= 2.38
-                        NetworkManager >= 1.7
-                        libnm-glib >= 1.7
-                        libnm-util >= 1.7
-                        libnm-glib-vpn >= 1.7
-                        gmodule-export-2.0],
-                        :,
-                        [AC_MSG_FAILURE([$LIBNM_GLIB_PKG_ERRORS
-
-Configure without --with-libnm-gtk if you do not need the legacy library])])
-       LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-       LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
-       LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
-       LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
-else
-       with_libnm_gtk=no
-fi
-AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" == "yes")
-
 PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
@@ -357,7 +335,6 @@ AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are e
 
 AC_CONFIG_FILES([
 Makefile
-src/libnm-gtk/libnm-gtk.pc
 src/libnma/libnma.pc
 src/libnma/libnma-gtk4.pc
 po/Makefile.in
@@ -369,7 +346,6 @@ src/libnma/nma-version.h
 AC_OUTPUT
 
 echo ""
-echo "  Build legacy library libnm-gtk: --with-libnm-gtk=${with_libnm_gtk}"
 echo "  Build EXPERIMENTAL libnma-gtk4 library for use with GTK4: --with-libnma-gtk4=${with_libnma_gtk4}"
 echo "  GCR: --with-gcr=$have_gcr"
 echo "  LTO: --enable-lto=$enable_lto"
diff --git a/meson.build b/meson.build
index e15cdbc5..31def378 100644
--- a/meson.build
+++ b/meson.build
@@ -20,8 +20,6 @@ nma_micro_version = version_array[2].to_int()
 nma_gir_version = '1.0'
 nma_gir_prefix = 'NMA'
 
-nma_gtk_gir_ns = 'NMGtk'
-
 nma_prefix = get_option('prefix')
 nma_bindir = join_paths(nma_prefix, get_option('bindir'))
 nma_datadir = join_paths(nma_prefix, get_option('datadir'))
@@ -198,30 +196,6 @@ libnm_dep = declare_dependency(
   compile_args: cflags
 )
 
-enable_libnm_gtk = get_option('libnm_gtk')
-if enable_libnm_gtk
-  deps = [
-    gio_dep,
-    gmodule_export_dep,
-    dependency('libnm-glib', version: nm_req_version),
-    dependency('libnm-glib-vpn', version: nm_req_version),
-    dependency('libnm-util', version: nm_req_version),
-    dependency('NetworkManager', version: nm_req_version)
-  ]
-
-  cflags = [
-    '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38',
-    '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38',
-    '-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4',
-    '-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4'
-  ]
-
-  libnm_glib_dep = declare_dependency(
-    dependencies: deps,
-    compile_args: cflags
-  )
-endif
-
 # No such thing yet, just same lame duck placeholders.
 # it may actually end up being called differently.
 config_h.set10('WITH_GCR_GTK4', false)
@@ -530,7 +504,7 @@ meson.add_install_script(
   nma_sysconfdir
 )
 
-output = '\n  Build legacy library libnm-gtk: ' + enable_libnm_gtk.to_string() + '\n'
+output = '\n'
 output += '  Build EXPERIMENTAL library libnm-gtk4 for use with GTK4: ' + enable_libnma_gtk4.to_string() + 
'\n'
 output += '  GCR: ' + enable_gcr.to_string() + '\n'
 output += '  LTO: ' + get_option('b_lto').to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
index eadec332..01ee5aec 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('libnm_gtk', type: 'boolean', value: false, description: 'build legacy library libnm-gtk which 
depends on libnm-glib/libnm-util/dbus-glib')
 option('libnma_gtk4', type: 'boolean', value: false, description: 'build EXPERIMENTAL library libnma-gtk4 
for use with GTK4')
 option('appindicator', type: 'string', value: 'no', description: 'Build with lib(ayatana-)appindicator 
support in addition to xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "no", "yes" is an 
alias for "auto".')
 option('wwan', type: 'boolean', value: true, description: 'Enable WWAN support.')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c08b9128..78b18609 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -97,13 +97,6 @@ src/libnma/nma-vpn-password-dialog.c
 src/libnma/nma-vpn-password-dialog.ui
 src/libnma/nma-wifi-dialog.c
 src/libnma/wifi.ui
-src/libnm-gtk/nm-mobile-providers.c
-src/libnm-gtk/nm-mobile-wizard.c
-src/libnm-gtk/nm-ui-utils.c
-src/libnm-gtk/nm-vpn-password-dialog.c
-src/libnm-gtk/nm-wifi-dialog.c
-src/libnm-gtk/tests/test-mobile-providers.c
-src/libnm-gtk/wifi.ui
 src/main.c
 src/mb-menu-item.c
 src/mobile-helpers.c
diff --git a/src/meson.build b/src/meson.build
index 761cfb43..af133352 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -24,10 +24,6 @@ subdir('utils')
 subdir('wireless-security')
 subdir('libnma')
 
-if enable_libnm_gtk
-  subdir('libnm-gtk')
-endif
-
 subdir('connection-editor')
 
 sources = files(
diff --git a/src/utils/meson.build b/src/utils/meson.build
index 11d23911..c3bec9ea 100644
--- a/src/utils/meson.build
+++ b/src/utils/meson.build
@@ -35,27 +35,3 @@ exe = executable(
 )
 
 test(test_unit, exe)
-
-if enable_libnm_gtk
-  deps = [
-    gtk_dep,
-    libnm_glib_dep
-  ]
-
-  cflags = '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY'
-
-  libutils_libnm_glib = static_library(
-    'utils-libnm-glib',
-    sources: shared_legacy_sources + files(
-      'utils.c',
-    ),
-    include_directories: incs,
-    dependencies: deps,
-    c_args: cflags
-  )
-
-  libutils_libnm_glib_dep = declare_dependency(
-    link_with: libutils_libnm_glib,
-    include_directories: utils_inc
-  )
-endif
diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build
index 2348fcb9..a621cb2e 100644
--- a/src/wireless-security/meson.build
+++ b/src/wireless-security/meson.build
@@ -74,21 +74,3 @@ if enable_libnma_gtk4
     c_args: cflags
   )
 endif
-
-if enable_libnm_gtk
-  deps = [
-    gtk_dep,
-    libnm_glib_dep,
-    libutils_libnm_glib_dep
-  ]
-
-  cflags = '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY'
-
-  libwireless_security_libnm_glib = static_library(
-    'wireless-security-libnm-glib',
-    sources: sources,
-    include_directories: incs,
-    dependencies: deps,
-    c_args: cflags
-  )
-endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]