Re: [PATCH for-9.1 4/9] Bump minimum glib version to v2.66

[Paolo Bonzini <pbonzini@redhat.com>]

On 4/12/24 12:58, Thomas Huth wrote:
> On 12/04/2024 12.16, Paolo Bonzini wrote:
>> On Thu, Mar 28, 2024 at 3:06 PM Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> Now that we dropped support for CentOS 8 and Ubuntu 20.04, we can
>>> look into bumping the glib version to a new minimum for further
>>> clean-ups. According to repology.org, available versions are:
>>>
>>>   CentOS Stream 9:       2.66.7
>>>   Debian 11:             2.66.8
>>>   Fedora 38:             2.74.1
>>>   Freebsd:               2.78.4
>>>   Homebrew:              2.80.0
>>>   Openbsd:               2.78.4
>>>   OpenSuse leap 15.5:    2.70.5
>>>   pkgsrc_current:        2.78.4
>>>   Ubuntu 22.04:          2.72.1
>>>
>>> Thus it should be safe to bump the minimum glib version to 2.66 now.
>>> Version 2.66 comes with new functions for URI parsing which will
>>> allow further clean-ups in the following patches.
>>
>> Missing:
>>
>> diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c
>> index b0e0b1d674f..cc1f5a708e4 100644
>> --- a/qga/commands-posix-ssh.c
>> +++ b/qga/commands-posix-ssh.c
>> @@ -288,7 +288,6 @@ qmp_guest_ssh_get_authorized_keys(
>>   }
>>
>>   #ifdef QGA_BUILD_UNIT_TEST
>> -#if GLIB_CHECK_VERSION(2, 60, 0)
>>   static const strList test_key2 = {
>>       .value = (char *)"algo key2 comments"
>>   };
>> @@ -484,11 +483,4 @@ int main(int argc, char *argv[])
>>
>>       return g_test_run();
>>   }
>> -#else
>> -int main(int argc, char *argv[])
>> -{
>> -    g_test_message("test skipped, needs glib >= 2.60");
>> -    return 0;
>> -}
>> -#endif /* GLIB_2_60 */
>>   #endif /* BUILD_UNIT_TEST */
> 
> Indeed! And there seems to be another GLIB_CHECK_VERSION(2,62,0) check 
> in util/error-report.c which we likely can clean up now, too!

Ok, I'll squash the above and

diff --git a/util/error-report.c b/util/error-report.c
index 6e44a557321..1b17c11de19 100644
--- a/util/error-report.c
+++ b/util/error-report.c
@@ -172,18 +172,8 @@ static void print_loc(void)
  static char *
  real_time_iso8601(void)
  {
-#if GLIB_CHECK_VERSION(2,62,0)
      g_autoptr(GDateTime) dt = g_date_time_new_now_utc();
-    /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
      return g_date_time_format_iso8601(dt);
-#pragma GCC diagnostic pop
-#else
-    GTimeVal tv;
-    g_get_current_time(&tv);
-    return g_time_val_to_iso8601(&tv);
-#endif
  }
  
  /*

then.  As an aside, we probably can also drop:

             /*
              * gtk_widget_set_double_buffered() was deprecated in 3.14.
              * It is required for opengl rendering on X11 though.  A
              * proper replacement (native opengl support) is only
              * available in 3.16+.  Silence the warning if possible.
              */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             gtk_widget_set_double_buffered(vc->gfx.drawing_area, FALSE);
#pragma GCC diagnostic pop


and


#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     /*
      * check if RBD image is a clone (= has a parent).
      *
      * rbd_get_parent_info is deprecated from Nautilus onwards, but the
      * replacement rbd_get_parent is not present in Luminous and Mimic.
      */
     if (rbd_get_parent_info(s->image, NULL, 0, NULL, 0, NULL, 0) != -ENOENT) {
         return status;
     }
#pragma GCC diagnostic pop


(Nautilus is Ceph 14, it's in all of CentOS Stream 9, Ubuntu 20.04 and
Debian 11) but I have no idea what the replacement would be. :/

Paolo