Skip to content

Commit db73e01

Browse files
Silence GLib deprecation warnings for GTK 2 build
GTK 2 headers cause deprecation warnings which we obviously cannot fix. Setting GLIB_VERSION_MIN_REQUIRED to an older version than we actually require (2.32 vs. 2.36) avoids this. See also: Commit f8eece5
1 parent 01ad684 commit db73e01

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

acinclude.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@ dnl ======================
178178
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36)
179179
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.36)
180180
181-
AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], [target GLib 2.36])
182-
183181
dnl GTK support
184182
dnl ===========
185183
@@ -194,6 +192,7 @@ AC_ARG_ENABLE(gtk2,
194192
if test $USE_GTK2 = yes ; then
195193
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
196194
AC_DEFINE([USE_GTK], [1], [Define if GTK support enabled])
195+
AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32], [Target GLib 2.32])
197196
elif test $USE_GTK = yes ; then
198197
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.18)
199198
AC_DEFINE(USE_GTK, 1, [Define if GTK support enabled])

config.h.meson

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#mesondefine USE_GTK3
2323
#mesondefine USE_GTK_OR_QT
2424

25-
#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
25+
#mesondefine GLIB_VERSION_MIN_REQUIRED
2626

2727
#mesondefine FILEWRITER_MP3
2828
#mesondefine FILEWRITER_FLAC

meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ endif
188188

189189
if get_option('gtk')
190190
conf.set10('USE_GTK', true)
191-
if not get_option('gtk2')
191+
if get_option('gtk2')
192+
conf.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_32')
193+
else
192194
conf.set10('USE_GTK3', true)
193195
endif
194196
endif

0 commit comments

Comments
 (0)