pidgin/pidgin

31532581724a
Parents 606edc665dc2
Children 58ae70ad7f21
Set our global C standard to C17 and warning_level to 2

Testing Done:
I compiled this on Debian unstable, FreeBSD 13 amd64 and i386, OpenBSD 7.2
amd64 and i386, RaspberryPI OS unstable, Windows 11, and macOS Monterey and all
compiled without issue. As for MSVC, support was added for C11 and C17 in
Visual Studio 2019 so we should be fine there as well.

Reviewed at https://reviews.imfreedom.org/r/2248/
--- a/libpurple/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/libpurple/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -322,8 +322,7 @@
dependencies : # static_link_libs
[dnsapi, ws2_32, glib, gio, gplugin_dep, libsoup,
libxml, gdk_pixbuf, gstreamer, gstreamer_app, json,
- sqlite3, math],
- override_options : ['c_std=c99', 'warning_level=2'])
+ sqlite3, math])
install_headers(purple_coreheaders,
subdir : purple_include_base)
--- a/libpurple/protocols/bonjour/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/libpurple/protocols/bonjour/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -37,8 +37,7 @@
link_args : bonjour_link_args,
dependencies : [libxml, avahi, libpurple_dep, glib, ws2_32],
install : true,
- install_dir : PURPLE_PLUGINDIR,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install_dir : PURPLE_PLUGINDIR)
devenv.append('PURPLE_PLUGIN_PATH', meson.current_build_dir())
endif
--- a/libpurple/protocols/demo/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/libpurple/protocols/demo/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -28,8 +28,7 @@
c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Demo"'],
dependencies : [glib, json, libpurple_dep],
install : true,
- install_dir : PURPLE_PLUGINDIR,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install_dir : PURPLE_PLUGINDIR)
devenv.append('PURPLE_PLUGIN_PATH', meson.current_build_dir())
endif
--- a/libpurple/protocols/facebook/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/libpurple/protocols/facebook/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -32,8 +32,7 @@
c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Facebook"'],
dependencies : [json, libpurple_dep, libsoup, glib],
install : true,
- install_dir : PURPLE_PLUGINDIR,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install_dir : PURPLE_PLUGINDIR)
# Used to produce docs.
facebook_inc = include_directories('.')
--- a/libpurple/protocols/ircv3/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/libpurple/protocols/ircv3/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -31,8 +31,7 @@
c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-IRCv3"'],
dependencies : [libpurple_dep, glib, gio, gsasl, ws2_32],
install : true,
- install_dir : PURPLE_PLUGINDIR,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install_dir : PURPLE_PLUGINDIR)
devenv.append('PURPLE_PLUGIN_PATH', meson.current_build_dir())
--- a/libpurple/protocols/jabber/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/libpurple/protocols/jabber/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -102,8 +102,7 @@
link_args : jabber_link_args,
dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, libsoup, glib, gio, math, ws2_32],
install : true,
- install_dir : PURPLE_PLUGINDIR,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install_dir : PURPLE_PLUGINDIR)
devenv.append('PURPLE_PLUGIN_PATH', meson.current_build_dir())
--- a/libpurple/protocols/jabber/tests/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/libpurple/protocols/jabber/tests/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -2,8 +2,7 @@
e = executable(
f'test_jabber_@prog@', f'test_jabber_@prog@.c',
link_with : [jabber_prpl],
- dependencies : [libxml, libpurple_dep, libsoup, glib],
- override_options : ['c_std=c99', 'warning_level=2'])
+ dependencies : [libxml, libpurple_dep, libsoup, glib])
jabberenv = environment()
jabberenv.set('XDG_CONFIG_DIR', meson.current_build_dir() / 'config')
--- a/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -22,7 +22,8 @@
#
project('pidgin', 'c',
version : '3.0.0-devel',
- meson_version : '>=0.58.0')
+ meson_version : '>=0.58.0',
+ default_options : ['c_std=c17', 'warning_level=2'])
purple_soversion = 0
parts = meson.project_version().split('-')
--- a/pidgin/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/pidgin/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -225,8 +225,7 @@
include_directories : [toplevel_inc, include_directories('prefs')],
version : PURPLE_LIB_VERSION,
dependencies : _libpidgin_dependencies,
- install : true,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install : true)
libpidgin_dep = declare_dependency(
include_directories : [toplevel_inc, libpidgin_inc],
link_with : libpidgin,
@@ -239,8 +238,7 @@
include_directories : toplevel_inc,
dependencies : IS_WIN32 ? [] : [libpurple_dep, libpidgin_dep],
win_subsystem : 'windows',
- install : true,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install : true)
meson.override_dependency(pidgin_filebase, libpidgin_dep)
--- a/purple-history/meson.build Tue Feb 21 21:41:53 2023 -0600
+++ b/purple-history/meson.build Tue Feb 21 21:43:14 2023 -0600
@@ -5,5 +5,4 @@
purple_history = executable('purple-history',
PURPLE_HISTORY_SOURCES,
dependencies : [libpurple_dep, glib],
- install : true,
- override_options : ['c_std=c99', 'warning_level=2'])
+ install : true)