Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

1 files changed, 16 insertions, 10 deletions

diff --git a/meson.build b/meson.build
index db809693..4651739a 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "src/libnm-core-public/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.40.12',
+  version: '1.42.4',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
@@ -96,7 +96,7 @@ set_defines = [
   ['VERSION', nm_version],
 ]
 
-default_test_timeout = 90
+default_test_timeout = 180
 
 foreach define: set_defines
   config_h.set_quoted(define[0], define[1])
@@ -174,21 +174,28 @@ endif
 common_flags += cc.get_supported_arguments([
   '-Wall',
   '-Wextra',
+  '-Wcast-align=strict',
   '-Wdeclaration-after-statement',
   '-Wfloat-equal',
   '-Wformat-nonliteral',
   '-Wformat-security',
   '-Wimplicit-function-declaration',
+  '-Wimplicit-int',
   '-Winit-self',
+  '-Wint-conversion',
   '-Wlogical-op',
   '-Wmissing-declarations',
   '-Wmissing-include-dirs',
   '-Wmissing-prototypes',
+  '-Wold-style-definition',
+  '-Wparentheses-equality',
   '-Wpointer-arith',
   '-Wshadow',
   '-Wshift-negative-value',
   '-Wstrict-prototypes',
+  '-Wtypedef-redefinition',
   '-Wundef',
+  '-Wunknown-attributes',
   '-Wvla',
   '-Wno-duplicate-decl-specifier',
   '-Wno-format-truncation',
@@ -200,13 +207,6 @@ common_flags += cc.get_supported_arguments([
   '-Wno-tautological-constant-out-of-range-compare',
   '-Wno-unknown-pragmas',
   '-Wno-unused-parameter',
-  '-Wparentheses-equality',
-  '-Wpointer-arith',
-  '-Wshadow',
-  '-Wstrict-prototypes',
-  '-Wtypedef-redefinition',
-  '-Wundef',
-  '-Wunknown-attributes',
   '-fno-strict-aliasing',
 ])
 
@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager')
 if enable_modem_manager
   mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991')
 
-  mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database')
+  mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database')
+  if mobile_broadband_provider_info_database == ''
+    mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database')
+  endif
   config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database)
 endif
 
@@ -1054,6 +1057,9 @@ output += '  jansson: ' + jansson_msg + '\n'
 output += '  iptables: ' + config_h.get('IPTABLES_PATH') + '\n'
 output += '  nft: ' + config_h.get('NFT_PATH') + '\n'
 output += '  modemmanager-1: ' + enable_modem_manager.to_string() + '\n'
+if enable_modem_manager
+  output += '  mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n'
+endif
 output += '  ofono: ' + enable_ofono.to_string() + '\n'
 output += '  concheck: ' + enable_concheck.to_string() + '\n'
 output += '  libteamdctl: ' + enable_teamdctl.to_string() + '\n'