[network-manager-applet/lr/libnmicide: 4/4] libnma: drop
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/libnmicide: 4/4] libnma: drop
- Date: Mon, 14 Oct 2019 08:14:20 +0000 (UTC)
commit 526bfb887dc8b067994ad5617264277313549e3f
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Mon Oct 14 09:01:03 2019 +0200
libnma: drop
.gitlab-ci.yml | 62 +-
Makefile.am | 607 +---------
configure.ac | 162 +--
m4/introspection.m4 | 93 --
meson.build | 188 +--
meson_options.txt | 6 -
po/POTFILES.in | 17 -
src/libnma/init.c | 23 -
src/libnma/libnma-gtk4.pc.in | 11 -
src/libnma/libnma.pc.in | 11 -
src/libnma/libnma.ver | 114 --
src/libnma/meson.build | 186 ---
src/libnma/nma-bar-code-widget.c | 462 --------
src/libnma/nma-bar-code-widget.h | 43 -
src/libnma/nma-bar-code-widget.ui | 45 -
src/libnma/nma-bar-code.c | 222 ----
src/libnma/nma-bar-code.h | 54 -
src/libnma/nma-cert-chooser-button.c | 469 --------
src/libnma/nma-cert-chooser-button.h | 59 -
src/libnma/nma-cert-chooser-private.h | 143 ---
src/libnma/nma-cert-chooser.c | 788 -------------
src/libnma/nma-cert-chooser.h | 151 ---
src/libnma/nma-file-cert-chooser.c | 399 -------
src/libnma/nma-mobile-providers.c | 1600 --------------------------
src/libnma/nma-mobile-providers.h | 131 ---
src/libnma/nma-mobile-wizard.c | 1560 -------------------------
src/libnma/nma-mobile-wizard.h | 65 --
src/libnma/nma-mobile-wizard.ui | 604 ----------
src/libnma/nma-pkcs11-cert-chooser-dialog.c | 643 -----------
src/libnma/nma-pkcs11-cert-chooser-dialog.h | 49 -
src/libnma/nma-pkcs11-cert-chooser-dialog.ui | 153 ---
src/libnma/nma-pkcs11-cert-chooser.c | 559 ---------
src/libnma/nma-pkcs11-token-login-dialog.c | 236 ----
src/libnma/nma-pkcs11-token-login-dialog.h | 43 -
src/libnma/nma-pkcs11-token-login-dialog.ui | 111 --
src/libnma/nma-private.h | 21 -
src/libnma/nma-ui-utils.c | 432 -------
src/libnma/nma-ui-utils.h | 26 -
src/libnma/nma-version.h.in | 119 --
src/libnma/nma-vpn-password-dialog.c | 351 ------
src/libnma/nma-vpn-password-dialog.h | 85 --
src/libnma/nma-vpn-password-dialog.ui | 222 ----
src/libnma/nma-wifi-dialog.c | 1559 -------------------------
src/libnma/nma-wifi-dialog.h | 69 --
src/libnma/nma.gresource.xml | 11 -
src/libnma/qrcodegen.c | 1009 ----------------
src/libnma/qrcodegen.h | 311 -----
src/libnma/tests/bar-code.c | 178 ---
src/libnma/tests/cert-chooser.c | 104 --
src/libnma/tests/meson.build | 31 -
src/libnma/tests/mobile-wizard.c | 33 -
src/libnma/tests/run-vpn.c | 87 --
src/libnma/tests/vpn-password-dialog.c | 36 -
src/libnma/tests/wifi-dialog-secrets.c | 100 --
src/libnma/tests/wifi-dialog.c | 60 -
src/libnma/wifi.ui | 215 ----
src/meson.build | 16 -
src/wireless-security/meson.build | 22 +-
58 files changed, 16 insertions(+), 15150 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35820240..0cc69218 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@
libnotify-devel
libsecret-devel
NetworkManager-libnm-devel
+ libnma-devel
pkgconfig
/usr/bin/autopoint
@@ -35,13 +36,10 @@
libnotify-devel
libsecret-devel
NetworkManager-libnm-devel
+ libnma-devel
pkgconfig
/usr/bin/autopoint
- gcr-devel
- gobject-introspection-devel redhat-rpm-config
- gtk-doc
- iso-codes-devel
- mobile-broadband-provider-info-devel
+ redhat-rpm-config
jansson-devel
ModemManager-glib-devel
libselinux-devel
@@ -62,12 +60,7 @@
-Dwwan=false
-Dselinux=false
-Dteam=false
- -Dgcr=false
- -Diso_codes=false
- -Dmobile_broadband_provider_info=false
-Dld_gc=false
- -Dgtk_doc=false
- -Dintrospection=false
-Dappindicator=no
-Dmore_asserts=no
network-manager-applet-*/ build
@@ -86,12 +79,7 @@
-Dwwan=true
-Dselinux=true
-Dteam=true
- -Dgcr=true
- -Diso_codes=true
- -Dmobile_broadband_provider_info=true
-Dld_gc=true
- -Dgtk_doc=true
- -Dintrospection=true
-Dappindicator=no
-Dmore_asserts=yes
network-manager-applet-*/ build
@@ -111,17 +99,12 @@
--disable-silent-rules
--with-more-asserts=no
--disable-nls
- --disable-iso-codes
- --disable-mobile-broadband-provider-info
- --disable-gtk-doc
- --disable-introspection
--disable-schemas-compile
--disable-more-warnings
--without-appindicator
--without-wwan
--without-selinux
--without-team
- --without-gcr
- make -j$(nproc)
- make -j$(nproc) check
- make -j$(nproc) install
@@ -138,16 +121,11 @@
--disable-silent-rules
--with-more-asserts=yes
--enable-nls
- --enable-iso-codes
- --enable-mobile-broadband-provider-info
- --enable-gtk-doc
- --enable-introspection
--enable-schemas-compile
--enable-more-warnings
--with-wwan
--with-selinux
--with-team
- --with-gcr
- make -j$(nproc)
- make -j$(nproc) check
- make -j$(nproc) install
@@ -206,11 +184,7 @@ centos7:
NetworkManager-libnm-devel
pkgconfig
/usr/bin/autopoint
- gcr-devel
- gobject-introspection-devel redhat-rpm-config
- gtk-doc
- iso-codes-devel
- mobile-broadband-provider-info-devel
+ redhat-rpm-config
jansson-devel
ModemManager-glib-devel
libselinux-devel
@@ -222,42 +196,14 @@ centos7:
--disable-silent-rules
--with-more-asserts=yes
--enable-nls
- --enable-iso-codes
- --enable-mobile-broadband-provider-info
- --enable-gtk-doc
- --enable-introspection
--enable-schemas-compile
--enable-more-warnings
--with-wwan
--with-selinux
--with-team
- --with-gcr
- make -j$(nproc)
- make -j$(nproc) check
- make -j$(nproc) install
- make -j$(nproc) uninstall
image: centos:7
stage: test
-
-# https://network-manager-applet.pages.gitlab.gnome.org/libnma/
-pages:
- <<: *fedora_full
- <<: *dist
- image: fedora:latest
- stage: deploy
- script:
- - dnf -y install make
- - tar xJf network-manager-applet-*.tar.xz
- - cd network-manager-applet-*/
- - ./configure
- --disable-silent-rules
- --enable-gtk-doc
- - make -j$(nproc)
- - cd ..
- - mkdir -p public
- - mv network-manager-applet-*/html public/libnma
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/Makefile.am b/Makefile.am
index e5876460..4a7f334e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
include $(GLIB_MAKEFILE)
--include $(INTROSPECTION_MAKEFILE)
include $(top_srcdir)/gtk-doc.make
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -30,12 +29,9 @@ DISTCLEANFILES =
DISTCHECK_CONFIGURE_FLAGS = \
--disable-dependency-tracking \
- --enable-gtk-doc \
- --enable-introspection \
--enable-more-warnings=error \
--with-wwan \
- --with-team \
- --with-gcr
+ --with-team
man_MANS =
@@ -44,16 +40,6 @@ pkgconfig_DATA =
pkgconfigdir = $(libdir)/pkgconfig
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-BUILT_SOURCES += $(gir_DATA)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-BUILT_SOURCES += $(typelib_DATA)
-
-INTROSPECTION_GIRS =
-
SUBDIRS = \
. \
po
@@ -190,26 +176,6 @@ src_utils_libutils_libnm_la_LIBADD = \
$(GTK3_LIBS) \
$(LIBNM_LIBS)
-if WITH_LIBNMA_GTK4
-
-noinst_LTLIBRARIES += src/utils/libutils-libnm-gtk4.la
-
-src_utils_libutils_libnm_gtk4_la_CPPFLAGS = \
- "-I$(srcdir)/shared" \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS)
-
-src_utils_libutils_libnm_gtk4_la_SOURCES = \
- $(shared_files) \
- src/utils/utils.c \
- src/utils/utils.h
-
-src_utils_libutils_libnm_gtk4_la_LIBADD = \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS)
-
-endif
-
check_programs += src/utils/tests/test-utils
src_utils_tests_test_utils_SOURCES = src/utils/tests/test-utils.c
@@ -291,9 +257,8 @@ src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
$(dflt_cppflags) \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
$(GTK3_CFLAGS) \
+ $(LIBNMA_CFLAGS) \
$(LIBNM_CFLAGS)
src_wireless_security_libwireless_security_libnm_la_LIBADD = \
@@ -303,33 +268,6 @@ src_wireless_security_libwireless_security_libnm_la_LIBADD = \
$(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
-if WITH_LIBNMA_GTK4
-
-noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-gtk4.la
-
-src_wireless_security_libwireless_security_libnm_gtk4_la_SOURCES = \
- $(wireless_security_c_real)
-
-nodist_src_wireless_security_libwireless_security_libnm_gtk4_la_SOURCES = \
- $(wireless_security_c_gen)
-
-src_wireless_security_libwireless_security_libnm_gtk4_la_CPPFLAGS = \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS)
-
-src_wireless_security_libwireless_security_libnm_gtk4_la_LIBADD = \
- src/utils/libutils-libnm-gtk4.la \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS)
-
-$(src_wireless_security_libwireless_security_libnm_gtk4_la_OBJECTS): $(wireless_security_h_gen)
-
-endif
-
EXTRA_DIST += \
src/wireless-security/eap-method-fast.ui \
src/wireless-security/eap-method-leap.ui \
@@ -348,499 +286,6 @@ EXTRA_DIST += \
###############################################################################
-src/libnma/nma-resources.h: src/libnma/nma.gresource.xml
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma
--generate-header --internal
-
-src/libnma/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--sourcedir=$(srcdir)/src/libnma --generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma
--generate-source --internal
-
-src/libnma-gtk4/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml |sed "s,^,$(builddir)/src/libnma-gtk4/,")
- @mkdir -p $(builddir)/src/libnma-gtk4
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/src/libnma-gtk4
--generate-source --internal
-
-
-src/libnma-gtk4/%.ui: src/libnma/%.ui
- @mkdir -p $(builddir)/src/libnma-gtk4
- gtk4-builder-tool simplify --3to4 $< >$@
-
-CLEANFILES += \
- $(libnma_h_priv_gen) \
- $(libnma_c_gen) \
- $(libnma_gtk4_c_gen)
-
-libnma_h_priv_gen = \
- src/libnma/nma-resources.h
-
-libnma_c_gen = \
- src/libnma/nma-resources.c
-
-libnma_gtk4_c_gen = \
- src/libnma-gtk4/nma-resources.c
-
-libnma_h_pub = \
- src/libnma/nma-version.h \
- src/libnma/nma-wifi-dialog.h \
- src/libnma/nma-mobile-wizard.h \
- src/libnma/nma-mobile-providers.h \
- src/libnma/nma-vpn-password-dialog.h \
- src/libnma/nma-ui-utils.h \
- src/libnma/nma-cert-chooser.h \
- src/libnma/nma-bar-code-widget.h \
- src/libnma/nma-bar-code.h
-
-libnma_c_real = \
- src/libnma/nma-wifi-dialog.c \
- src/libnma/nma-mobile-wizard.c \
- src/libnma/nma-mobile-providers.c \
- src/libnma/nma-vpn-password-dialog.c \
- src/libnma/nma-ui-utils.c \
- src/libnma/init.c \
- src/libnma/nma-cert-chooser.c \
- src/libnma/nma-file-cert-chooser.c \
- src/libnma/nma-bar-code-widget.c \
- src/libnma/nma-bar-code.c
-
-EXTRA_DIST += \
- src/libnma/qrcodegen.c \
- src/libnma/qrcodegen.h
-
-libnma_h_priv_real = \
- src/libnma/nma-cert-chooser-private.h \
- src/libnma/nma-private.h
-
-libnma_h_priv_gcr = \
- src/libnma/nma-pkcs11-token-login-dialog.h \
- src/libnma/nma-pkcs11-cert-chooser-dialog.h \
- src/libnma/nma-cert-chooser-button.h
-
-libnma_c_gcr = \
- src/libnma/nma-pkcs11-token-login-dialog.c \
- src/libnma/nma-pkcs11-cert-chooser-dialog.c \
- src/libnma/nma-cert-chooser-button.c \
- src/libnma/nma-pkcs11-cert-chooser.c
-
-src_libnma_libnmadir = $(includedir)/libnma
-
-src_libnma_libnma_HEADERS = \
- $(libnma_h_pub)
-
-lib_LTLIBRARIES += src/libnma/libnma.la
-
-src_libnma_libnma_la_SOURCES = \
- $(libnma_h_priv_real) \
- $(libnma_c_real)
-
-if WITH_GCR
-src_libnma_libnma_la_SOURCES += \
- $(libnma_h_priv_gcr) \
- $(libnma_c_gcr)
-endif
-
-nodist_src_libnma_libnma_la_SOURCES = \
- $(libnma_h_priv_gen) \
- $(libnma_c_gen)
-
-src_libnma_libnma_la_CFLAGS = \
- $(dflt_cppflags) \
- -DICONDIR=\""$(datadir)/icons"\" \
- -DBINDIR=\""$(bindir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
- -DNMALOCALEDIR=\"$(datadir)/locale\" \
- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- $(GUDEV_CFLAGS) \
- $(GCR_CFLAGS)
-
-src_libnma_libnma_la_LIBADD = \
- src/wireless-security/libwireless-security-libnm.la \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- $(GUDEV_LIBS) \
- $(GCR_LIBS)
-
-EXTRA_src_libnma_libnma_la_DEPENDENCIES = src/libnma/libnma.ver
-
-src_libnma_libnma_la_LDFLAGS = \
- -Wl,-no-undefined \
- -Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
-
-
-pkgconfig_DATA += src/libnma/libnma.pc
-
-if HAVE_INTROSPECTION
-src/libnma/NMA-1.0.gir: src/libnma/libnma.la
-src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
-src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
-src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
-src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
-src_libnma_NMA_1_0_gir_FILES = \
- $(libnma_h_pub) \
- $(libnma_c_real)
-if WITH_GCR
-src_libnma_NMA_1_0_gir_FILES += \
- $(libnma_c_gcr)
-endif
-src_libnma_NMA_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnma/NMA-1.0.gir
-endif
-
-check_PROGRAMS_norun += src/libnma/tests/mobile-wizard
-
-src_libnma_tests_mobile_wizard_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_mobile_wizard_LDADD = \
- $(GLIB_LIBS) \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma.la
-
-check_PROGRAMS_norun += src/libnma/tests/vpn-password-dialog
-
-src_libnma_tests_vpn_password_dialog_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_vpn_password_dialog_LDADD = \
- $(GLIB_LIBS) \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma.la
-
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog
-
-src_libnma_tests_wifi_dialog_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_wifi_dialog_LDADD = \
- $(GLIB_LIBS) \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma.la
-
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-secrets
-
-src_libnma_tests_wifi_dialog_secrets_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_wifi_dialog_secrets_LDADD = \
- $(GLIB_LIBS) \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma.la
-
-check_PROGRAMS_norun += src/libnma/tests/run-vpn
-
-src_libnma_tests_run_vpn_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_run_vpn_LDADD = \
- $(GLIB_LIBS) \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma.la
-
-check_PROGRAMS_norun += src/libnma/tests/cert-chooser
-
-src_libnma_tests_cert_chooser_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_cert_chooser_LDADD = \
- $(GLIB_LIBS) \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma.la
-
-check_PROGRAMS_norun += src/libnma/tests/bar-code
-
-src_libnma_tests_bar_code_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_bar_code_LDADD = \
- $(GLIB_LIBS) \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma.la
-
-if WITH_LIBNMA_GTK4
-
-lib_LTLIBRARIES += src/libnma/libnma-gtk4.la
-
-src_libnma_libnma_gtk4_la_SOURCES = \
- $(libnma_h_priv_real) \
- $(libnma_c_real)
-
-if WITH_GCR_GTK4
-src_libnma_libnma_gtk4_la_SOURCES += \
- $(libnma_h_priv_gcr) \
- $(libnma_c_gcr)
-endif
-
-nodist_src_libnma_libnma_gtk4_la_SOURCES = \
- $(libnma_h_priv_gen) \
- $(libnma_gtk4_c_gen)
-
-src_libnma_libnma_gtk4_la_CFLAGS = \
- -DICONDIR=\""$(datadir)/icons"\" \
- -DBINDIR=\""$(bindir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
- -DNMALOCALEDIR=\"$(datadir)/locale\" \
- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- $(GUDEV_CFLAGS) \
- $(GCR_GCR4_CFLAGS)
-
-src_libnma_libnma_gtk4_la_LIBADD = \
- src/wireless-security/libwireless-security-libnm-gtk4.la \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- $(GUDEV_LIBS) \
- $(GCR_GCR4_LIBS)
-
-EXTRA_src_libnma_libnma_gtk4_la_DEPENDENCIES = src/libnma/libnma.ver
-
-src_libnma_libnma_gtk4_la_LDFLAGS = \
- -Wl,-no-undefined \
- -Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
-
-
-pkgconfig_DATA += src/libnma/libnma-gtk4.pc
-
-if HAVE_INTROSPECTION
-src/libnma/NMA4-1.0.gir: src/libnma/libnma-gtk4.la
-src_libnma_NMA4_1_0_gir_INCLUDES = NM-1.0 Gtk-4.0
-src_libnma_NMA4_1_0_gir_EXPORT_PACKAGES = libnma-gtk4
-src_libnma_NMA4_1_0_gir_CFLAGS = $(src_libnma_libnma_gtk4_la_CFLAGS)
-src_libnma_NMA4_1_0_gir_LIBS = src/libnma/libnma-gtk4.la
-src_libnma_NMA4_1_0_gir_FILES = \
- $(libnma_h_pub) \
- $(libnma_c_real)
-if WITH_GCR_GTK4
-src_libnma_NMA4_1_0_gir_FILES += \
- $(libnma_c_gcr)
-endif
-src_libnma_NMA4_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnma/NMA4-1.0.gir
-endif
-
-check_PROGRAMS_norun += src/libnma/tests/mobile-wizard-gtk4
-
-src_libnma_tests_mobile_wizard_gtk4_SOURCES = \
- src/libnma/tests/mobile-wizard.c
-
-src_libnma_tests_mobile_wizard_gtk4_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_mobile_wizard_gtk4_LDADD = \
- $(GLIB_LIBS) \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-check_PROGRAMS_norun += src/libnma/tests/vpn-password-dialog-gtk4
-
-src_libnma_tests_vpn_password_dialog_gtk4_SOURCES = \
- src/libnma/tests/vpn-password-dialog.c
-
-src_libnma_tests_vpn_password_dialog_gtk4_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_vpn_password_dialog_gtk4_LDADD = \
- $(GLIB_LIBS) \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-gtk4
-
-src_libnma_tests_wifi_dialog_gtk4_SOURCES = \
- src/libnma/tests/wifi-dialog.c
-
-src_libnma_tests_wifi_dialog_gtk4_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_wifi_dialog_gtk4_LDADD = \
- $(GLIB_LIBS) \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-secrets-gtk4
-
-src_libnma_tests_wifi_dialog_secrets_gtk4_SOURCES = \
- src/libnma/tests/wifi-dialog-secrets.c
-
-src_libnma_tests_wifi_dialog_secrets_gtk4_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_wifi_dialog_secrets_gtk4_LDADD = \
- $(GLIB_LIBS) \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-check_PROGRAMS_norun += src/libnma/tests/run-vpn-gtk4
-
-src_libnma_tests_run_vpn_gtk4_SOURCES = \
- src/libnma/tests/run-vpn.c
-
-src_libnma_tests_run_vpn_gtk4_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_run_vpn_gtk4_LDADD = \
- $(GLIB_LIBS) \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-check_PROGRAMS_norun += src/libnma/tests/cert-chooser-gtk4
-
-src_libnma_tests_cert_chooser_gtk4_SOURCES = \
- src/libnma/tests/cert-chooser.c
-
-src_libnma_tests_cert_chooser_gtk4_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_cert_chooser_gtk4_LDADD = \
- $(GLIB_LIBS) \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-check_PROGRAMS_norun += src/libnma/tests/bar-code-gtk4
-
-src_libnma_tests_bar_code_gtk4_SOURCES = \
- src/libnma/tests/bar-code.c
-
-src_libnma_tests_bar_code_gtk4_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK4_CFLAGS) \
- $(LIBNM_CFLAGS) \
- "-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
-
-src_libnma_tests_bar_code_gtk4_LDADD = \
- $(GLIB_LIBS) \
- $(GTK4_LIBS) \
- $(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-endif
-
-EXTRA_DIST += \
- src/libnma/nma-version.h.in \
- src/libnma/libnma.pc.in \
- src/libnma/libnma-gtk4.pc.in \
- src/libnma/libnma.ver \
- src/libnma/wifi.ui \
- src/libnma/nma-mobile-wizard.ui \
- src/libnma/nma-bar-code-widget.ui \
- src/libnma/nma-pkcs11-token-login-dialog.ui \
- src/libnma/nma-pkcs11-cert-chooser-dialog.ui \
- src/libnma/nma-vpn-password-dialog.ui \
- src/libnma/nma.gresource.xml \
- src/libnma/meson.build \
- src/libnma/tests/meson.build
-
-###############################################################################
-
src/connection-editor/ce-resources.h: src/connection-editor/ce.gresource.xml
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor
--generate-header --internal
@@ -949,18 +394,17 @@ src_connection_editor_nm_connection_editor_CPPFLAGS = \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
"-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
$(GTK3_CFLAGS) \
+ $(LIBNMA_CFLAGS) \
$(LIBNM_CFLAGS) \
$(JANSSON_CFLAGS) \
$(SELINUX_CFLAGS)
src_connection_editor_nm_connection_editor_LDADD = \
src/wireless-security/libwireless-security-libnm.la \
- src/libnma/libnma.la \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
+ $(LIBNMA_LIBS) \
$(JANSSON_LIBS) \
$(SELINUX_LIBS) \
-lm
@@ -1076,9 +520,8 @@ src_nm_applet_CPPFLAGS = \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
"-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
$(GTK3_CFLAGS) \
+ $(LIBNMA_CFLAGS) \
$(LIBNM_CFLAGS) \
$(LIBSECRET_CFLAGS) \
$(NOTIFY_CFLAGS) \
@@ -1087,9 +530,9 @@ src_nm_applet_CPPFLAGS = \
src_nm_applet_LDADD = \
src/wireless-security/libwireless-security-libnm.la \
- src/libnma/libnma.la \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
+ $(LIBNMA_LIBS) \
$(LIBSECRET_LIBS) \
$(NOTIFY_LIBS) \
$(MM_GLIB_LIBS) \
@@ -1138,43 +581,6 @@ EXTRA_DIST += man/meson.build
###############################################################################
-DOC_MODULE = libnma
-
-DOC_SOURCE_DIR = $(top_srcdir)/src/libnma
-
-SCAN_OPTIONS=--rebuild-types --rebuild-sections
-
-DOC_MAIN_SGML_FILE = libnma-docs.xml
-
-GTKDOC_LIBS = src/libnma/libnma.la
-
-scan-build.stamp: $(GTKDOC_LIBS)
-
-HFILE_GLOB = $(top_srcdir)/src/libnma/*.h
-
-CFILE_GLOB = $(top_srcdir)/src/libnma/*.c
-
-IGNORE_HFILES = \
- nma-resources.h \
- nma-version.h \
- nma-cert-chooser-private.h \
- nma-private.h \
- nma-pkcs11-token-login-dialog.h \
- nma-pkcs11-cert-chooser-dialog.h \
- nma-cert-chooser-button.h
-
-mkdb_ignore_c_files = \
- nma-resources.c \
- nma-file-cert-chooser.c \
- nma-pkcs11-token-login-dialog.c \
- nma-pkcs11-cert-chooser-dialog.c \
- nma-cert-chooser-button.c \
- nma-pkcs11-cert-chooser.c
-
-MKDB_OPTIONS = --ignore-files "$(IGNORE_HFILES) $(mkdb_ignore_c_files)"
-
-###############################################################################
-
check_PROGRAMS += $(check_programs)
check-local: $(check_local)
@@ -1232,7 +638,6 @@ EXTRA_DIST += \
$(desktop_in_files)
CLEANFILES += \
- $(INTROSPECTION_GIRS) \
$(typelib_DATA) \
\
$(autostart_DATA) \
diff --git a/configure.ac b/configure.ac
index 727fed30..5a46cde3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,69 +68,14 @@ GETTEXT_PACKAGE=nm-applet
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-# Check for iso-codes for country names translation
-AC_MSG_CHECKING([whether to disable iso-codes at build-time])
-AC_ARG_ENABLE([iso-codes],
- AS_HELP_STRING([--disable-iso-codes],[do not check for iso-codes at build-time]),
- [],[disable_iso_codes_check=no])
-if test x$disable_iso_codes_check = xno ; then
- AC_MSG_RESULT([no])
-else
- AC_MSG_RESULT([yes])
-fi
-
-if test x$disable_iso_codes_check = "xno" ; then
- AC_MSG_CHECKING([whether iso-codes has iso_3166 domain])
- if $PKG_CONFIG --variable=domains iso-codes | grep iso_3166 >/dev/null ; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
- AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
- PKG_CHECK_MODULES(ISO_CODES, [iso-codes],
- [],
- [echo -e "\n$ISO_CODES_PKG_ERRORS.\n"
- echo "Consider installing the package or adjusting the PKG_CONFIG_PATH environment variable."
- echo "You can also disable build-time check for 'iso-codes' via --disable-iso-codes";
- exit 1;])
-else
- AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
-fi
-
-# Check for mobile-broadband-provider-info for Mobile Broadband wizard
-AC_MSG_CHECKING([whether to disable mobile-broadband-provider-info at build-time])
-AC_ARG_ENABLE([mobile-broadband-provider-info],
- AS_HELP_STRING([--disable-mobile-broadband-provider-info],[do not check for
mobile-broadband-provider-info at build-time]),
- [],[disable_mobile_broadband_provider_info_check=no])
-if test x$disable_mobile_broadband_provider_info_check = xno ; then
- AC_MSG_RESULT([no])
-else
- AC_MSG_RESULT([yes])
-fi
-
-if test x$disable_mobile_broadband_provider_info_check = "xno" ; then
- AC_DEFINE_UNQUOTED([MOBILE_BROADBAND_PROVIDER_INFO_DATABASE],["`$PKG_CONFIG --variable=database
mobile-broadband-provider-info`"],[Mobile Broadband Service Provider Information Database location])
- PKG_CHECK_MODULES(MOBILE_BROADBAND_PROVIDER_INFO, [mobile-broadband-provider-info],
- [],
- [echo -e "\n$MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS.\n"
- echo "Consider installing the package or adjusting the PKG_CONFIG_PATH environment variable."
- echo "You can also disable build-time check for 'mobile-broadband-provider-info' via
--disable-mobile-broadband-provider-info";
- exit 1;])
-else
-
AC_DEFINE_UNQUOTED([MOBILE_BROADBAND_PROVIDER_INFO_DATABASE],["$prefix/share/mobile-broadband-provider-info/serviceproviders.xml"],[Mobile
Broadband Service Provider Information Database location])
-fi
-
-dnl
-dnl API documentation
-dnl
-GTK_DOC_CHECK(1.0)
-
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"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
+PKG_CHECK_MODULES(LIBNMA, libnma)
+
PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 0.18])
# Check for libnotify >= 0.7
@@ -143,20 +88,6 @@ PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10"
-AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for
use with GTK4]))
-if test "$with_libnma_gtk4" == yes; then
- PKG_CHECK_MODULES(GTK4, gtk4 >= 3.94)
- GTK4_CFLAGS="$GTK4_CFLAGS -DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96
-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96"
-else
- with_libnma_gtk4=no
-fi
-AM_CONDITIONAL(WITH_LIBNMA_GTK4, test "$with_libnma_gtk4" != "no")
-
-# No such thing yet, just same lame duck placeholders.
-# it may actually end up being called differently.
-AC_DEFINE(WITH_GCR_GTK4, 0, [Define if GTK4 Gcr is available])
-AM_CONDITIONAL(WITH_GCR_GTK4, false)
-
AC_ARG_WITH([appindicator],
AS_HELP_STRING([--with-appindicator=no|yes|auto|ayatana|ubuntu], [Build with
lib(ayatana-)appindicator support in addition to xembed systray support.]),
[], [with_appindicator=no])
@@ -188,8 +119,6 @@ if test "$with_appindicator" != "no"; then
fi
fi
-AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
-
dnl ModemManager1 with libmm-glib for WWAN support
AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
if (test "${with_wwan}" == "no"); then
@@ -229,79 +158,6 @@ else
fi
AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
-dnl GCR for PKCS#11 enabled certificate chooser
-AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
-if (test "${with_gcr}" == "no"); then
- have_gcr=no
-else
- PKG_CHECK_MODULES(GCR,
- [gcr-3 >= 3.14, gck-1 >= 3.14],
- dnl GCR API is declared subject to change, do an extensive check of the prototypes
- GCR_CFLAGS="$GCR_CFLAGS -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE"
- CFLAGS_SAVED="$CFLAGS"
- CFLAGS="$CFLAGS $GCR_CFLAGS"
- AC_MSG_CHECKING([for GCR usefulness])
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <gcr/gcr.h>
- #include <gck/gck.h>
-
- const GckAttribute *gck_attributes_find (GckAttributes *attrs,
gulong attr_type);
- gboolean gck_attributes_find_string (GckAttributes *attrs, gulong
attr_type, gchar **value);
- gboolean gck_attributes_find_ulong (GckAttributes *attrs, gulong
attr_type, gulong *value);
- GckAttributes *gck_attributes_new_empty (gulong first_type, ...);
- void gck_attributes_unref (gpointer attrs);
- void gck_builder_add_all (GckBuilder *builder, GckAttributes *attrs);
- void gck_builder_add_only (GckBuilder *builder, GckAttributes
*attrs, gulong only_type, ...);
- GckAttributes *gck_builder_end (GckBuilder *builder);
- GckBuilder *gck_builder_new (GckBuilderFlags flags);
- void gck_enumerator_next_async (GckEnumerator *self, gint
max_objects, GCancellable *cancellable,
- GAsyncReadyCallback callback,
gpointer user_data);
- GList *gck_enumerator_next_finish (GckEnumerator *self, GAsyncResult
*result, GError **error);
- void gck_list_unref_free (GList *reflist);
- GList *gck_modules_get_slots (GList *modules, gboolean
token_present);
- void gck_modules_initialize_registered_async (GCancellable
*cancellable, GAsyncReadyCallback callback,
- gpointer user_data);
- GList *gck_modules_initialize_registered_finish (GAsyncResult
*result, GError **error);
- void gck_object_get_async (GckObject *self, const gulong
*attr_types, guint n_attr_types,
- GCancellable *cancellable,
GAsyncReadyCallback callback, gpointer user_data);
- GckAttributes *gck_object_get_finish (GckObject *self, GAsyncResult
*result, GError **error);
- void gck_session_login_async (GckSession *self, gulong user_type,
const guchar *pin,
- gsize n_pin, GCancellable *cancellable,
- GAsyncReadyCallback callback, gpointer
user_data);
- gboolean gck_session_login_finish (GckSession *self, GAsyncResult
*result, GError **error);
- GckSlotInfo *gck_slot_get_info (GckSlot *self);
- GckTokenInfo *gck_slot_get_token_info (GckSlot *self);
- void gck_slot_open_session_async (GckSlot *self, GckSessionOptions
options, GCancellable *cancellable,
- GAsyncReadyCallback callback,
gpointer user_data);
- GckSession *gck_slot_open_session_finish (GckSlot *self,
GAsyncResult *result, GError **error);
- void gck_token_info_free (GckTokenInfo *token_info);
- gchar *gck_uri_build (GckUriData *uri_data, GckUriFlags flags);
- void gck_uri_data_free (GckUriData *uri_data);
- GckUriData *gck_uri_parse (const gchar *string, GckUriFlags flags,
GError **error);
- gchar *gcr_certificate_get_issuer_name (GcrCertificate *self);
- gchar *gcr_certificate_get_subject_name (GcrCertificate *self);
- GcrCertificate *gcr_simple_certificate_new (const guchar *data,
gsize n_data);
- ])],
- have_gcr=yes,
- have_gcr=no)
- AC_MSG_RESULT(${have_gcr})
- CFLAGS="$CFLAGS_SAVED",
- have_gcr=no);
-fi
-
-if (test "${have_gcr}" == "yes"); then
- AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
-else
- if (test "${with_gcr}" == "yes"); then
- AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.])
- fi
- AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
-fi
-AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes")
-
-dnl Check for gobject introspection
-GOBJECT_INTROSPECTION_CHECK([0.9.6])
-
GLIB_CONFIG_NMA
GLIB_GSETTINGS
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
@@ -310,15 +166,6 @@ NM_COMPILER_WARNINGS(CFLAGS, [yes])
NM_LTO
NM_LD_GC
-# Disable extra compiler warning until GTK4 doesn't trigger it via graphene
-# https://github.com/ebassi/graphene/issues/134
-if test "$with_libnma_gtk4" == yes; then
- _CFLAGS_SAVED="$CFLAGS"
- CFLAGS="$CFLAGS $GTK4_CFLAGS"
- NM_COMPILER_WARNING([_CFLAGS], [float-equal], [#include <gtk/gtk.h>])
- CFLAGS="$_CFLAGS_SAVED $_CFLAGS"
-fi
-
AC_ARG_WITH(more-asserts,
AS_HELP_STRING([--with-more-asserts=level], [Enable more assertions for debugging (default: 0)]),
[more_asserts=${with_more_asserts}],
@@ -335,19 +182,14 @@ AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are e
AC_CONFIG_FILES([
Makefile
-src/libnma/libnma.pc
-src/libnma/libnma-gtk4.pc
po/Makefile.in
man/nm-applet.1
man/nm-connection-editor.1
org.gnome.nm-applet.gschema.xml
-src/libnma/nma-version.h
])
AC_OUTPUT
echo ""
-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"
echo " Linker garbage collection: --enable-ld-gc=$enable_ld_gc"
echo " appindicator: $with_appindicator"
diff --git a/meson.build b/meson.build
index 31def378..fc3eacdc 100644
--- a/meson.build
+++ b/meson.build
@@ -74,18 +74,6 @@ if enable_ld_gc
common_ldflags += test_ldflags
endif
-enable_libnma_gtk4 = get_option('libnma_gtk4')
-if enable_libnma_gtk4
- gtk4_ext_dep = dependency('gtk4', version: '>= 3.96')
- gtk4_dep = declare_dependency(
- dependencies: gtk4_ext_dep,
- compile_args: [
- '-DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96',
- '-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96'
- ]
- )
-endif
-
if nma_debug
test_cflags = [
'-Wdeclaration-after-statement',
@@ -108,12 +96,6 @@ if nma_debug
'-Wvla',
]
- # Disable extra compiler warning until GTK4 doesn't trigger it via graphene
- # https://github.com/ebassi/graphene/issues/134
- if not enable_libnma_gtk4 or cc.compiles('#include <gtk/gtk.h>', dependencies: gtk4_ext_dep, args:
['-Werror=float-equal'])
- test_cflags += '-Wfloat-equal'
- endif
-
common_flags += cc.get_supported_arguments(test_cflags)
endif
@@ -122,37 +104,10 @@ add_project_link_arguments(common_ldflags, language: 'c')
linker_script_ver = join_paths(meson.source_root(), 'linker-script-binary.ver')
-# Check for iso-codes for country names translation
-enable_iso_codes = get_option('iso_codes')
-message('whether to disable iso-codes at build-time: ' + enable_iso_codes.to_string())
-if enable_iso_codes
- iso_codes_dep = dependency('iso-codes')
-
- str = 'Consider installing the package or adjusting the PKG_CONFIG_PATH environment variable.\n'
- str += 'You can also disable build-time check for \'iso-codes\' via -Diso_codes=false'
- assert(iso_codes_dep.found(), str)
-
- iso_3166 = iso_codes_dep.get_pkgconfig_variable('domains').contains('iso_3166')
- message('whether iso-codes has iso_3166 domain: ' + iso_3166.to_string())
-
- config_h.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix'))
-else
- config_h.set_quoted('ISO_CODES_PREFIX', nma_prefix)
-endif
-
-# Check for mobile-broadband-provider-info for Mobile Broadband wizard
-enable_mobile_broadband_provider_info = get_option('mobile_broadband_provider_info')
-message('whether to enable mobile-broadband-provider-info at build-time: ' +
enable_mobile_broadband_provider_info.to_string())
-if enable_mobile_broadband_provider_info
- mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info')
- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE',
mobile_broadband_provider_info_dep.get_pkgconfig_variable('database'))
-else
- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir,
'mobile-broadband-provider-info', 'serviceproviders.xml'))
-endif
-
gio_dep = dependency('gio-2.0', version: '>= 2.38')
gmodule_export_dep = dependency('gmodule-export-2.0')
libsecret_dep = dependency('libsecret-1', version: '>= 0.18')
+libnma_dep = dependency('libnma')
m_dep = cc.find_library('m')
@@ -258,85 +213,6 @@ if enable_team
endif
config_h.set10('WITH_JANSSON', enable_team)
-# GCR for PKCS#11 enabled certificate chooser
-enable_gcr = get_option('gcr')
-if enable_gcr
- deps = [
- dependency('gcr-3', version: '>= 3.14'),
- dependency('gck-1', version: '>= 3.14')
- ]
-
- cflags = [
- '-DGCR_API_SUBJECT_TO_CHANGE',
- '-DGCK_API_SUBJECT_TO_CHANGE'
- ]
-
- # GCR API is declared subject to change, do an extensive check of the prototypes
- gcr_src = '''
- #ifndef GCR_API_SUBJECT_TO_CHANGE
- # define GCR_API_SUBJECT_TO_CHANGE
- #endif
- #ifndef GCK_API_SUBJECT_TO_CHANGE
- # define GCK_API_SUBJECT_TO_CHANGE
- #endif
-
- #include <gcr/gcr.h>
- #include <gck/gck.h>
-
- const GckAttribute *gck_attributes_find (GckAttributes *attrs, gulong attr_type);
- gboolean gck_attributes_find_string (GckAttributes *attrs, gulong attr_type, gchar **value);
- gboolean gck_attributes_find_ulong (GckAttributes *attrs, gulong attr_type, gulong *value);
- GckAttributes *gck_attributes_new_empty (gulong first_type, ...);
- void gck_attributes_unref (gpointer attrs);
- void gck_builder_add_all (GckBuilder *builder, GckAttributes *attrs);
- void gck_builder_add_only (GckBuilder *builder, GckAttributes *attrs, gulong only_type, ...);
- GckAttributes *gck_builder_end (GckBuilder *builder);
- GckBuilder *gck_builder_new (GckBuilderFlags flags);
- void gck_enumerator_next_async (GckEnumerator *self, gint max_objects, GCancellable *cancellable,
- GAsyncReadyCallback callback, gpointer user_data);
- GList *gck_enumerator_next_finish (GckEnumerator *self, GAsyncResult *result, GError **error);
- void gck_list_unref_free (GList *reflist);
- GList *gck_modules_get_slots (GList *modules, gboolean token_present);
- void gck_modules_initialize_registered_async (GCancellable *cancellable, GAsyncReadyCallback callback,
- gpointer user_data);
- GList *gck_modules_initialize_registered_finish (GAsyncResult *result, GError **error);
- void gck_object_get_async (GckObject *self, const gulong *attr_types, guint n_attr_types,
- GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
- GckAttributes *gck_object_get_finish (GckObject *self, GAsyncResult *result, GError **error);
- void gck_session_login_async (GckSession *self, gulong user_type, const guchar *pin,
- gsize n_pin, GCancellable *cancellable,
- GAsyncReadyCallback callback, gpointer user_data);
- gboolean gck_session_login_finish (GckSession *self, GAsyncResult *result, GError **error);
- GckSlotInfo *gck_slot_get_info (GckSlot *self);
- GckTokenInfo *gck_slot_get_token_info (GckSlot *self);
- void gck_slot_open_session_async (GckSlot *self, GckSessionOptions options, GCancellable *cancellable,
- GAsyncReadyCallback callback, gpointer user_data);
- GckSession *gck_slot_open_session_finish (GckSlot *self, GAsyncResult *result, GError **error);
- void gck_token_info_free (GckTokenInfo *token_info);
- gchar *gck_uri_build (GckUriData *uri_data, GckUriFlags flags);
- void gck_uri_data_free (GckUriData *uri_data);
- GckUriData *gck_uri_parse (const gchar *string, GckUriFlags flags, GError **error);
- gchar *gcr_certificate_get_issuer_name (GcrCertificate *self);
- gchar *gcr_certificate_get_subject_name (GcrCertificate *self);
- GcrCertificate *gcr_simple_certificate_new (const guchar *data, gsize n_data);
- '''
-
- assert(cc.compiles(gcr_src, dependencies: deps), 'gcr support was requested, but the gcr library is not
available. Use -Dgcr=false to build without it.')
-
- gcr_dep = declare_dependency(
- dependencies: deps,
- compile_args: cflags
- )
-endif
-config_h.set10('WITH_GCR', enable_gcr)
-
-# introspection support
-enable_introspection = get_option('introspection')
-if enable_introspection
- gir_dep = dependency('gobject-introspection-1.0', version: '>= 0.9.6', required: false)
- assert(gir_dep.found(), 'introspection support was requested, but the gobject-introspection library is not
available. Use -Dintrospection=false to build without it.')
-endif
-
more_asserts = get_option('more_asserts')
if more_asserts == 'no'
more_asserts = 0
@@ -430,66 +306,6 @@ install_data(
install_dir: join_paths(nma_datadir, 'GConf', 'gsettings')
)
-# documentation
-enable_gtk_doc = get_option('gtk_doc')
-if enable_gtk_doc
- mod_name = 'libnma'
-
- private_headers = [
- 'nma-cert-chooser-button.h',
- 'nma-cert-chooser-private.h',
- 'nma-pkcs11-cert-chooser-dialog.h',
- 'nma-pkcs11-token-login-dialog.h',
- 'nma-resources.h',
- 'nma-private.h',
- 'nma-version.h',
- ]
-
- private_sources = [
- 'nma-cert-chooser-button.c',
- 'nma-file-cert-chooser.c',
- 'nma-pkcs11-cert-chooser-dialog.c',
- 'nma-pkcs11-cert-chooser.c',
- 'nma-pkcs11-token-login-dialog.c',
- 'nma-resources.c'
- ]
-
- ent_conf = configuration_data()
- ent_conf.set_quoted('PACKAGE', meson.project_name())
- ent_conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/network-manager-applet/issues')
- ent_conf.set_quoted('PACKAGE_NAME', nma_name)
- ent_conf.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(nma_name, nma_version))
- ent_conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
- ent_conf.set_quoted('PACKAGE_URL', '')
- ent_conf.set_quoted('PACKAGE_VERSION', nma_version)
-
- ent = 'gtkdocentities.ent'
-
- configure_file(
- input: ent + '.in',
- output: ent,
- configuration: ent_conf
- )
-
- doc_path = join_paths(nma_datadir, 'gtk-doc', 'html', mod_name)
-
- gnome.gtkdoc(
- mod_name,
- main_xml: mod_name + '-docs.xml',
- src_dir: libnma_inc,
- dependencies: libnma_dep,
- scan_args: [
- '--rebuild-types',
- '--rebuild-sections',
- '--ignore-headers=' + ' '.join(private_headers)
- ],
- mkdb_args: '--ignore-files=' + ' '.join(private_headers + private_sources),
- gobject_typesfile: mod_name + '.types',
- install: true,
- install_dir: doc_path
- )
-endif
-
config = 'config.h'
configure_file(
@@ -505,8 +321,6 @@ meson.add_install_script(
)
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'
output += ' Linker garbage collection: ' + enable_ld_gc.to_string() + '\n'
output += ' libappindicator: ' + enable_appindicator
diff --git a/meson_options.txt b/meson_options.txt
index 01ee5aec..15f96450 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,12 +1,6 @@
-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.')
option('selinux', type: 'boolean', value: true, description: 'Enable support for adjusting SELinux labels in
configuration editor.')
option('team', type: 'boolean', value: true, description: 'Enable team configuration editor.')
-option('gcr', type: 'boolean', value: true, description: 'Enable advanced certificate chooser.')
option('more_asserts', type: 'string', value: '0', description: 'Enable more assertions for debugging.')
-option('iso_codes', type: 'boolean', value: true, description: 'check for iso-codes at build-time')
-option('mobile_broadband_provider_info', type: 'boolean', value: true, description: 'check for
mobile-broadband-provider-info at build-time')
option('ld_gc', type: 'boolean', value: true, description: 'Enable garbage collection of unused symbols on
linking')
-option('gtk_doc', type: 'boolean', value: true, description: 'use gtk-doc to build documentation')
-option('introspection', type: 'boolean', value: true, description: 'Enable introspection for this build')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 78b18609..3803b199 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -80,23 +80,6 @@ src/connection-editor/vpn-helpers.c
src/ethernet-dialog.c
src/gsm-unlock.ui
src/info.ui
-src/libnma/nma-bar-code-widget.c
-src/libnma/nma-bar-code-widget.ui
-src/libnma/nma-file-cert-chooser.c
-src/libnma/nma-mobile-providers.c
-src/libnma/nma-mobile-wizard.c
-src/libnma/nma-mobile-wizard.ui
-src/libnma/nma-cert-chooser-button.c
-src/libnma/nma-pkcs11-cert-chooser.c
-src/libnma/nma-pkcs11-cert-chooser-dialog.c
-src/libnma/nma-pkcs11-cert-chooser-dialog.ui
-src/libnma/nma-pkcs11-token-login-dialog.c
-src/libnma/nma-pkcs11-token-login-dialog.ui
-src/libnma/nma-ui-utils.c
-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/main.c
src/mb-menu-item.c
src/mobile-helpers.c
diff --git a/src/meson.build b/src/meson.build
index af133352..9647a428 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,28 +1,12 @@
src_inc = include_directories('.')
-# FIXME: although this file is contained in the libnma directory
-# it should be generated before because it's used at
-# wireless-security directory, which is needed later for
-# libnma directory.
-libnma_inc = include_directories('libnma')
-
version_conf = configuration_data()
version_conf.set('NMA_MAJOR_VERSION', nma_major_version)
version_conf.set('NMA_MINOR_VERSION', nma_minor_version)
version_conf.set('NMA_MICRO_VERSION', nma_micro_version)
-version = 'nma-version.h'
-
-version_header = configure_file(
- input: 'libnma/' + version + '.in',
- output: version,
- configuration: version_conf,
- install_dir: join_paths(nma_includedir, 'libnma')
-)
-
subdir('utils')
subdir('wireless-security')
-subdir('libnma')
subdir('connection-editor')
diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build
index a621cb2e..288f341e 100644
--- a/src/wireless-security/meson.build
+++ b/src/wireless-security/meson.build
@@ -1,6 +1,6 @@
wireless_security_inc = include_directories('.')
-sources = [version_header] + files(
+sources = files(
'eap-method.c',
'eap-method-fast.c',
'eap-method-leap.c',
@@ -42,13 +42,13 @@ sources += gnome.compile_resources(
incs = [
top_inc,
shared_inc,
- src_inc,
- libnma_inc
+ src_inc
]
deps = [
gtk_dep,
libnm_dep,
+ libnma_dep,
libutils_libnm_dep
]
@@ -58,19 +58,3 @@ libwireless_security_libnm = static_library(
include_directories: incs,
dependencies: deps
)
-
-if enable_libnma_gtk4
- deps = [
- gtk4_dep,
- libnm_dep,
- libutils_libnm_dep
- ]
-
- libwireless_security_libnma_gtk4 = static_library(
- 'wireless-security-libnma-gtk4',
- 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]
