# HG changeset patch # User Gary Kramlich # Date 1639469483 21600 # Node ID f79d8f49abe8de2cc7f957e2a0b4e5a58698e202 # Parent 5c4269ad7ee4501b02df76454458cad4f6fe14bf Require glib-2.70 All of our currents targets already have it. Testing Done: Compiled on Debian Sid, but verified versions everywhere else. We need to move our Ubuntu build from Hirsute to Jammy but that will be done separately. Reviewed at https://reviews.imfreedom.org/r/1189/ diff -r 5c4269ad7ee4 -r f79d8f49abe8 libpurple/glibcompat.h --- a/libpurple/glibcompat.h Tue Dec 14 01:58:31 2021 -0600 +++ b/libpurple/glibcompat.h Tue Dec 14 02:11:23 2021 -0600 @@ -46,22 +46,4 @@ # define g_stat purple_g_stat #endif -/* Backport the static inline version of g_memdup2 if we don't have g_memdup2. - * see https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html - * for more information. - */ -#if !GLIB_CHECK_VERSION(2, 67, 3) -static inline gpointer -g_memdup2(gconstpointer mem, gsize byte_size) { - gpointer new_mem = NULL; - - if(mem && byte_size != 0) { - new_mem = g_malloc (byte_size); - memcpy (new_mem, mem, byte_size); - } - - return new_mem; -} -#endif /* !GLIB_CHECK_VERSION(2, 67, 3) */ - #endif /* PURPLE_GLIBCOMPAT_H */ diff -r 5c4269ad7ee4 -r f79d8f49abe8 meson.build --- a/meson.build Tue Dec 14 01:58:31 2021 -0600 +++ b/meson.build Tue Dec 14 02:11:23 2021 -0600 @@ -225,15 +225,15 @@ # ####################################################################### # # Check for GLib (required) # ####################################################################### -glib = dependency('glib-2.0', version : '>= 2.66.0') +glib = dependency('glib-2.0', version : '>= 2.70.0') gio = dependency('gio-2.0') gobject = dependency('gobject-2.0') gthread = dependency('gthread-2.0') gnome = import('gnome') add_project_arguments( - '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', - '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66', + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_70', + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_70', language : 'c',) #######################################################################