From 572fe52f94cbf7ff48bb1a2d020838c7645e357a Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 30 Nov 2024 13:19:02 -0300 Subject: [PATCH 1/2] st: Adapt to paint node changes See https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4160 Part-of: --- src/st/st-theme-node-drawing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c index 395f179b60..95b4c65663 100644 --- a/src/st/st-theme-node-drawing.c +++ b/src/st/st-theme-node-drawing.c @@ -2516,23 +2516,23 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state, state->resource_scale, state->resource_scale, 1); + color_state = clutter_paint_context_get_color_state (paint_context); + cogl_color_init_from_4f (&clear_color, 0, 0, 0, 0); root_node = clutter_root_node_new (framebuffer, + color_state, &clear_color, COGL_BUFFER_BIT_COLOR); st_theme_node_paint_borders (state, root_node, &box, ST_PAINT_BORDERS_MODE_SILHOUETTE, 0xff); - color_state = clutter_paint_context_get_color_state (paint_context); nested_paint_context = clutter_paint_context_new_for_framebuffer (framebuffer, NULL, CLUTTER_PAINT_FLAG_NONE, color_state); - clutter_paint_context_push_color_state (nested_paint_context, color_state); clutter_paint_node_paint (root_node, nested_paint_context); - clutter_paint_context_pop_color_state (nested_paint_context); clutter_paint_context_destroy (nested_paint_context); state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node), -- GitLab From 942f7e87be41c5507c9127d69922f7b432ea729a Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 3 Dec 2024 15:54:45 -0300 Subject: [PATCH 2/2] ci: Temporarily neutralize image build job It's failing CI too often, and too consistently. This should be reverted once CI failures are gone. Part-of: --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35076122af..7bc5e03e08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ build-sysext: stages: - pre_review - - prep +# - prep - review - build - test @@ -140,11 +140,11 @@ check-merge-request: reports: junit: check-merge-request-report.xml -build-fedora-container: - extends: - - .fdo.container-build@fedora@x86_64 - - .gnome-shell.fedora - stage: prep +#build-fedora-container: +# extends: +# - .fdo.container-build@fedora@x86_64 +# - .gnome-shell.fedora +# stage: prep js_check: extends: -- GitLab