Merge tag 'debian/1.10.4-1' into bionic

network-manager Debian release 1.10.4-1

9 files changed, 177 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 6cd3e6a4..d27f441a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-network-manager (1.10.0-1ubuntu1) UNRELEASED; urgency=medium
+network-manager (1.10.4-1ubuntu1) UNRELEASED; urgency=medium
 
   * Merge with Debian. Remaining changes:
     - Use systemd-resolved instead of dnsmasq
@@ -46,7 +46,56 @@ network-manager (1.10.0-1ubuntu1) UNRELEASED; urgency=medium
     - connectivity-allow-override.patch
     - nm1.10-connectivity-check-api.patch
 
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 12 Nov 2017 15:52:34 -0500
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 08 Feb 2018 17:54:22 -0500
+
+network-manager (1.10.4-1) unstable; urgency=medium
+
+  [ Laurent Bigonville ]
+  * Do not fail installation of network-manager-config-connectivity-* if
+    network-manager fails to reload (see LP: #1742403)
+
+  [ Michael Biebl ]
+  * New upstream version 1.10.4
+  * Rebase patches
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 07 Feb 2018 02:51:36 +0100
+
+network-manager (1.10.2-4) unstable; urgency=medium
+
+  * Set Rules-Requires-Root to no
+  * platform: fix crash hashing NMPlatformTfilter and NMPlatformQdisc
+    (Closes: #888291)
+  * Bump Standards-Version to 4.1.3
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 25 Jan 2018 00:01:19 +0100
+
+network-manager (1.10.2-3) unstable; urgency=medium
+
+  * secret-agent: construct the dbus proxy for async agent with the correct
+    bus name
+  * Revert "Bump debhelper compat level to 11"
+    There are currently too many issues with dh_installsystemd, so switch
+    back to compat 10 using dh_systemd_enable and dh_systemd_start for the
+    time being.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 21 Jan 2018 19:50:39 +0100
+
+network-manager (1.10.2-2) unstable; urgency=medium
+
+  * libnm-core/tc-config: remove deprecation guards from typedefs
+    (Closes: #887815)
+  * Bump debhelper compat level to 11
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 21 Jan 2018 14:32:55 +0100
+
+network-manager (1.10.2-1) unstable; urgency=medium
+
+  * New upstream version 1.10.2
+  * Rebase patches
+  * Update symbols file for libnm0
+  * Bump Standards-Version 4.1.2
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 12 Dec 2017 16:26:27 +0100
 
 network-manager (1.10.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 084ff554..2128640c 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,8 @@ Build-Depends: debhelper (>= 10.3),
                valac (>= 0.17.1.24),
                dbus <!nocheck>,
                python-dbus <!nocheck>
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
+Rules-Requires-Root: no
 Vcs-Git: https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu
 Vcs-Browser: https://git.launchpad.net/network-manager?h=artful
 Homepage: https://wiki.gnome.org/Projects/NetworkManager
diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols
index 56082596..3da4fb3a 100644
--- a/debian/libnm0.symbols
+++ b/debian/libnm0.symbols
@@ -3,6 +3,7 @@ libnm.so.0 libnm0 #MINVER#
  libnm_1_0_4@libnm_1_0_4 1.0.4
  libnm_1_0_6@libnm_1_0_6 1.0.6
  libnm_1_10_0@libnm_1_10_0 1.9.90
+ libnm_1_10_2@libnm_1_10_2 1.10.2
  libnm_1_2_0@libnm_1_2_0 1.1.90
  libnm_1_2_4@libnm_1_2_4 1.2.4
  libnm_1_4_0@libnm_1_4_0 1.4.0
@@ -465,6 +466,8 @@ libnm.so.0 libnm0 #MINVER#
  nm_remote_connection_save@libnm_1_0_0 1.0.0
  nm_remote_connection_save_async@libnm_1_0_0 1.0.0
  nm_remote_connection_save_finish@libnm_1_0_0 1.0.0
+ nm_remote_connection_update2@libnm_1_10_2 1.10.2
+ nm_remote_connection_update2_finish@libnm_1_10_2 1.10.2
  nm_secret_agent_capabilities_get_type@libnm_1_0_0 1.0.0
  nm_secret_agent_error_get_type@libnm_1_0_0 1.0.0
  nm_secret_agent_error_quark@libnm_1_0_0 1.0.0
@@ -874,12 +877,61 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_serial_new@libnm_1_0_0 1.0.0
  nm_setting_serial_parity_get_type@libnm_1_0_0 1.0.0
  nm_setting_set_secret_flags@libnm_1_0_0 1.0.0
+ nm_setting_tc_config_add_qdisc@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_add_tfilter@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_clear_qdiscs@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_clear_tfilters@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_get_num_qdiscs@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_get_num_tfilters@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_get_qdisc@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_get_tfilter@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_get_type@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_new@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_remove_qdisc@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_remove_qdisc_by_value@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_remove_tfilter@libnm_1_10_2 1.10.2
+ nm_setting_tc_config_remove_tfilter_by_value@libnm_1_10_2 1.10.2
+ nm_setting_team_add_link_watcher@libnm_1_10_2 1.10.2
+ nm_setting_team_add_runner_tx_hash@libnm_1_10_2 1.10.2
+ nm_setting_team_clear_link_watchers@libnm_1_10_2 1.10.2
  nm_setting_team_get_config@libnm_1_0_0 1.0.0
+ nm_setting_team_get_link_watcher@libnm_1_10_2 1.10.2
+ nm_setting_team_get_mcast_rejoin_count@libnm_1_10_2 1.10.2
+ nm_setting_team_get_mcast_rejoin_interval@libnm_1_10_2 1.10.2
+ nm_setting_team_get_notify_peers_count@libnm_1_10_2 1.10.2
+ nm_setting_team_get_notify_peers_interval@libnm_1_10_2 1.10.2
+ nm_setting_team_get_num_link_watchers@libnm_1_10_2 1.10.2
+ nm_setting_team_get_num_runner_tx_hash@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_active@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_agg_select_policy@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_fast_rate@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_hwaddr_policy@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_min_ports@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_sys_prio@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_tx_balancer@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_tx_balancer_interval@libnm_1_10_2 1.10.2
+ nm_setting_team_get_runner_tx_hash@libnm_1_10_2 1.10.2
  nm_setting_team_get_type@libnm_1_0_0 1.0.0
  nm_setting_team_new@libnm_1_0_0 1.0.0
+ nm_setting_team_port_add_link_watcher@libnm_1_10_2 1.10.2
+ nm_setting_team_port_clear_link_watchers@libnm_1_10_2 1.10.2
  nm_setting_team_port_get_config@libnm_1_0_0 1.0.0
+ nm_setting_team_port_get_lacp_key@libnm_1_10_2 1.10.2
+ nm_setting_team_port_get_lacp_prio@libnm_1_10_2 1.10.2
+ nm_setting_team_port_get_link_watcher@libnm_1_10_2 1.10.2
+ nm_setting_team_port_get_num_link_watchers@libnm_1_10_2 1.10.2
+ nm_setting_team_port_get_prio@libnm_1_10_2 1.10.2
+ nm_setting_team_port_get_queue_id@libnm_1_10_2 1.10.2
+ nm_setting_team_port_get_sticky@libnm_1_10_2 1.10.2
  nm_setting_team_port_get_type@libnm_1_0_0 1.0.0
  nm_setting_team_port_new@libnm_1_0_0 1.0.0
+ nm_setting_team_port_remove_link_watcher@libnm_1_10_2 1.10.2
+ nm_setting_team_port_remove_link_watcher_by_value@libnm_1_10_2 1.10.2
+ nm_setting_team_remove_link_watcher@libnm_1_10_2 1.10.2
+ nm_setting_team_remove_link_watcher_by_value@libnm_1_10_2 1.10.2
+ nm_setting_team_remove_runner_tx_hash@libnm_1_10_2 1.10.2
+ nm_setting_team_remove_runner_tx_hash_by_value@libnm_1_10_2 1.10.2
  nm_setting_to_string@libnm_1_0_0 1.0.0
  nm_setting_tun_get_group@libnm_1_2_0 1.1.90
  nm_setting_tun_get_mode@libnm_1_2_0 1.1.90
@@ -1046,11 +1098,60 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_wireless_security_wps_method_get_type@libnm_1_10_0 1.9.90
  nm_settings_error_get_type@libnm_1_0_0 1.0.0
  nm_settings_error_quark@libnm_1_0_0 1.0.0
+ nm_settings_update2_flags_get_type@libnm_1_10_2 1.10.2
  nm_simple_connection_get_type@libnm_1_0_0 1.0.0
  nm_simple_connection_new@libnm_1_0_0 1.0.0
  nm_simple_connection_new_clone@libnm_1_0_0 1.0.0
  nm_simple_connection_new_from_dbus@libnm_1_0_0 1.0.0
  nm_state_get_type@libnm_1_0_0 1.0.0
+ nm_tc_action_dup@libnm_1_10_2 1.10.2
+ nm_tc_action_equal@libnm_1_10_2 1.10.2
+ nm_tc_action_get_attribute@libnm_1_10_2 1.10.2
+ nm_tc_action_get_attribute_names@libnm_1_10_2 1.10.2
+ nm_tc_action_get_kind@libnm_1_10_2 1.10.2
+ nm_tc_action_get_type@libnm_1_10_2 1.10.2
+ nm_tc_action_new@libnm_1_10_2 1.10.2
+ nm_tc_action_ref@libnm_1_10_2 1.10.2
+ nm_tc_action_set_attribute@libnm_1_10_2 1.10.2
+ nm_tc_action_unref@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_dup@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_equal@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_get_handle@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_get_kind@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_get_parent@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_get_type@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_new@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_ref@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_set_handle@libnm_1_10_2 1.10.2
+ nm_tc_qdisc_unref@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_dup@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_equal@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_get_handle@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_get_kind@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_get_parent@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_get_type@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_new@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_ref@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_set_handle@libnm_1_10_2 1.10.2
+ nm_tc_tfilter_unref@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_arp_ping_flags_get_type@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_dup@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_equal@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_delay_down@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_delay_up@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_flags@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_init_wait@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_interval@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_missed_max@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_name@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_source_host@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_target_host@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_get_type@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_new_arp_ping@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_new_ethtool@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_new_nsna_ping@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_ref@libnm_1_10_2 1.10.2
+ nm_team_link_watcher_unref@libnm_1_10_2 1.10.2
  nm_utils_ap_mode_security_valid@libnm_1_0_0 1.0.0
  nm_utils_bin2hexstr@libnm_1_0_0 1.0.0
  nm_utils_bond_mode_int_to_string@libnm_1_2_0 1.1.90
@@ -1103,6 +1204,12 @@ libnm.so.0 libnm0 #MINVER#
  nm_utils_security_type_get_type@libnm_1_0_0 1.0.0
  nm_utils_security_valid@libnm_1_0_0 1.0.0
  nm_utils_ssid_to_utf8@libnm_1_0_0 1.0.0
+ nm_utils_tc_action_from_str@libnm_1_10_2 1.10.2
+ nm_utils_tc_action_to_str@libnm_1_10_2 1.10.2
+ nm_utils_tc_qdisc_from_str@libnm_1_10_2 1.10.2
+ nm_utils_tc_qdisc_to_str@libnm_1_10_2 1.10.2
+ nm_utils_tc_tfilter_from_str@libnm_1_10_2 1.10.2
+ nm_utils_tc_tfilter_to_str@libnm_1_10_2 1.10.2
  nm_utils_uuid_generate@libnm_1_0_0 1.0.0
  nm_utils_version@libnm_1_6_0 1.5.90
  nm_utils_wep_key_valid@libnm_1_0_0 1.0.0
diff --git a/debian/network-manager-config-connectivity-debian.postinst b/debian/network-manager-config-connectivity-debian.postinst
index e8698667..eb087aa4 100644
--- a/debian/network-manager-config-connectivity-debian.postinst
+++ b/debian/network-manager-config-connectivity-debian.postinst
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" = configure ]; then
-    invoke-rc.d network-manager force-reload
+    invoke-rc.d network-manager force-reload || true
 fi
 
 #DEBHELPER#
diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
index cb3fe561..694b05b5 100644
--- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -10,10 +10,10 @@ to be autostarted by a client request.
  2 files changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 0cc4d7f..b1b63d4 100644
+index 639921d..2ddc7bc 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3687,11 +3687,6 @@ endif
+@@ -3689,11 +3689,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
index 43712a3c..eb6fbd17 100644
--- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
@@ -16,7 +16,7 @@ Closes: #742933
  1 file changed, 5 insertions(+)
 
 diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
-index 037db11..18282f1 100644
+index 7a37387..867e0d8 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
index 286e2099..c6ca5f72 100644
--- a/debian/patches/Fix-iscsiadm-path.patch
+++ b/debian/patches/Fix-iscsiadm-path.patch
@@ -12,7 +12,7 @@ binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink).
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
-index 9b1f5cc..8cc1313 100644
+index ea4d152..09a4579 100644
 --- a/src/settings/plugins/ibft/nms-ibft-plugin.c
 +++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
 @@ -74,7 +74,7 @@ read_connections (NMSIbftPlugin *self)
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 62878813..6ef9bf54 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 117 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 2766e86..a14c0aa 100644
+index 001fae5..38e8a8f 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -21,10 +21,10 @@ index 2766e86..a14c0aa 100644
  
 +#define IFUPDOWN_STATE_FILE "/run/network/ifstate"
 +
- static gboolean add_device (NMManager *self, NMDevice *device, GError **error);
+ /*****************************************************************************/
  
- static NMActiveConnection *_new_active_connection (NMManager *self,
-@@ -157,6 +159,10 @@ typedef struct {
+ typedef struct {
+@@ -169,6 +171,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index 2766e86..a14c0aa 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -870,6 +876,29 @@ find_best_device_state (NMManager *manager)
+@@ -1122,6 +1128,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index 2766e86..a14c0aa 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -908,6 +937,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -1160,6 +1189,9 @@ nm_manager_update_state (NMManager *manager)
  	else
  		new_state = find_best_device_state (manager);
  
@@ -75,7 +75,7 @@ index 2766e86..a14c0aa 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5090,6 +5122,62 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -5419,6 +5451,62 @@ impl_manager_check_connectivity (NMManager *self,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -138,7 +138,7 @@ index 2766e86..a14c0aa 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -5232,6 +5320,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -5570,6 +5658,9 @@ nm_manager_start (NMManager *self, GError **error)
  	nm_clear_g_source (&priv->devices_inited_id);
  	priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);
  
@@ -148,7 +148,7 @@ index 2766e86..a14c0aa 100644
  	return TRUE;
  }
  
-@@ -6228,6 +6319,22 @@ nm_manager_init (NMManager *self)
+@@ -6565,6 +6656,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -171,7 +171,7 @@ index 2766e86..a14c0aa 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6489,6 +6596,16 @@ dispose (GObject *object)
+@@ -6847,6 +6954,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
index c7219064..e742ffe6 100644
--- a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
+++ b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
@@ -54,7 +54,7 @@ After:
  create mode 100644 libnm/fake-typelib/typelibs.gresource.xml
 
 diff --git a/Makefile.am b/Makefile.am
-index b1b63d4..4fb8f5a 100644
+index 2ddc7bc..a741c6e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -858,6 +858,7 @@ nodist_libnminclude_HEADERS += \
@@ -90,7 +90,7 @@ index b1b63d4..4fb8f5a 100644
  
  if HAVE_INTROSPECTION
 diff --git a/configure.ac b/configure.ac
-index f8dcd13..f2e0cd2 100644
+index c1ce21e..11948ac 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -322,9 +322,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V