• Bug#1032913: marked as done (unblock: mutter/43.3-5) (2/2)

    From Debian Bug Tracking System@21:1/5 to Simon McVittie on Tue Mar 14 11:00:01 2023
    [continued from previous message]

    diff -Nru mutter-43.3/src/backends/meta-color-device.c mutter-43.3/src/backends/meta-color-device.c
    --- mutter-43.3/src/backends/meta-color-device.c 2023-03-13 22:25:38.000000000 +0000
    +++ mutter-43.3/src/backends/meta-color-device.c 2023-03-13 22:25:39.000000000 +0000
    @@ -847,7 +847,6 @@
    }

    lcms_context = meta_color_manager_get_lcms_context (color_manager);
    -
    if (!lcms_context)
    {
    g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
    @@ -890,6 +889,7 @@
    cmsSetHeaderRenderingIntent (lcms_profile, INTENT_PERCEPTUAL);
    cmsSetDeviceClass (lcms_profile, cmsSigDisplayClass);

    + g_warn_if_fail (cmsGetProfileContextID (lcms_profile));
    if (!cd_icc_load_handle (cd_icc, g_steal_pointer (&lcms_profile),
    CD_ICC_LOAD_FLAGS_PRIMARIES, error))
    return NULL;
    diff -Nru mutter-43.3/src/core/events.c mutter-43.3/src/core/events.c
    --- mutter-43.3/src/core/events.c 2023-02-13 18:12:26.000000000 +0000
    +++ mutter-43.3/src/core/events.c 2023-03-13 22:25:39.000000000 +0000
    @@ -34,7 +34,6 @@
    #include "core/display-private.h"
    #include "core/window-pr