[cairo-commit] 7 commits - .gitlab-ci.yml src/cairo-svg-surface.c test/cairo-test-runner.c

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Apr 23 19:40:49 UTC 2021


 .gitlab-ci.yml           |   10 +++++++++-
 src/cairo-svg-surface.c  |    2 +-
 test/cairo-test-runner.c |   28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

New commits:
commit de2a71b230e0202292e5deae7e19a90139165a49
Merge: ec2933b06 0392dd783
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri Apr 23 19:40:46 2021 +0000

    Merge branch 'svg-ci' into 'master'
    
    Enable SVG in CI
    
    See merge request cairo/cairo!156

commit 0392dd783c563c655f7a83b315555f3756c3a512
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Apr 18 13:00:07 2021 +0200

    Ignore create-for-stream failure with svg
    
    The create-for-stream test verifies that writing something to a file and
    writing it to an in-memory surface produces the same output. The test
    currently fails when the svg backend is tested with:
    
    TEST: create_for_stream TARGET: pdf RESULT: PASS
    svg: Stream based output differ from file output for output/create-for-stream.out.svg.
    TEST: create_for_stream TARGET: svg RESULT: FAIL
    
    I guess this is because svg uses unique IDs for surfaces, meaning that
    drawing two times the same thing in the same process can produce
    different outputs. However, this is just a guess and I didn't
    investigate further.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1e1bc2c9..c6f9f8884 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,6 +100,7 @@ fedora autotools build:
     - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_FALLBACK_RESOLUTION=1
     - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_SCRIPT_XCB_HUGE_IMAGE_SHM=1
     - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_SVG_ARGB32_SELF_COPIES=1
+    - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_CREATE_FOR_STREAM=1
     - export CAIRO_TEST_IGNORE_pdf_argb32=bug-image-compositor,clear-source,clip-operator,clip-text,culled-glyphs,extended-blend,extended-blend-solid,fallback,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,font-matrix-translation,glyph-cache-pressure,halo,halo-transform,inverse-text,large-font,linear-gradient-reflect,mask,operator-alpha-alpha,overlapping-glyphs,paint-with-alpha-clip,partial-clip-text-bottom,partial-clip-text-left,pixman-downscale-fast-95,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-95,pixman-downscale-best-24,pixman-downscale-nearest-95,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,record-select-font-face,record1414x-select-font-face,record1414x-text-transform,record2x-select-font-face,record2x-text-transform,record90-select-font-face,recordflip-whole-select-font-face,recordflip-select-font-f
 ace,record-replay-extend-repeat,record-replay-extend-reflect,recording-surface-over,recording-surface-extend-repeat,recording-surface-extend-reflect,rectilinear-miter-limit,rectilinear-dash,rectilinear-stroke,rotate-image-surface-paint,rotate-clip-image-surface-paint,select-font-face,self-copy,show-glyphs-advance,show-text-current-point,smask-text,smp-glyph,surface-pattern,surface-pattern-operator,surface-pattern-scale-down,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,thin-lines,trap-clip,twin,user-font-proxy,user-font-rescale,pthread-same-source,pthread-show-text,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
     - export CAIRO_TEST_IGNORE_pdf_rgb24=bug-image-compositor,clear-source,clip-text,culled-glyphs,extended-blend-alpha-mask,extended-blend-solid,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,font-matrix-translation,glyph-cache-pressure,halo,halo-transform,inverse-text,large-font,linear-gradient-reflect,mask,operator-alpha-alpha,overlapping-glyphs,paint-with-alpha-clip,partial-clip-text-bottom,partial-clip-text-left,pixman-downscale-fast-95,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-95,pixman-downscale-best-24,pixman-downscale-nearest-95,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,random-intersections-curves-eo,random-intersections-curves-nz,record-paint-alpha-clip,record-select-font-face,record-text-transform,record1414x-paint-alpha,record1414x-paint-alpha-clip,record1414x-paint-alpha-clip-mask,record14
 14x-select-font-face,record1414x-text-transform,record2x-paint-alpha-clip-mask,record2x-select-font-face,record2x-text-transform,record90-paint-alpha-clip,record90-paint-alpha-clip-mask,record90-select-font-face,record90-text-transform,recordflip-whole-select-font-face,recordflip-whole-self-intersecting,recordflip-whole-text-transform,recordflip-select-font-face,recordflip-text-transform,record-replay-extend-repeat,record-replay-extend-reflect,recording-surface-over,recording-surface-extend-repeat,rectilinear-miter-limit,rectilinear-dash,rectilinear-stroke,rel-path,rotate-image-surface-paint,rotate-clip-image-surface-paint,select-font-face,self-copy,show-glyphs-advance,show-text-current-point,smask-text,smp-glyph,surface-pattern,surface-pattern-scale-down,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,trap-clip,twin,user-font-proxy,user-font-rescale,pthread-same-source,pthread-show-text,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-
 layout-type1,ft-text-vertical-layout-type3
     - export CAIRO_TEST_IGNORE_script_argb32=xcb-huge-image-shm
diff --git a/test/cairo-test-runner.c b/test/cairo-test-runner.c
index 50e944f9c..39fad0580 100644
--- a/test/cairo-test-runner.c
+++ b/test/cairo-test-runner.c
@@ -934,6 +934,18 @@ main (int argc, char **argv)
 
 	if (ctx.test->preamble != NULL) {
 	    status = _cairo_test_runner_preamble (&runner, &ctx);
+	    if (getenv ("CAIRO_TEST_UGLY_HACK_TO_IGNORE_CREATE_FOR_STREAM") && strcmp (ctx.test_name, "create-for-stream") == 0) {
+		if (status == CAIRO_TEST_FAILURE) {
+		    cairo_test_log (&ctx, "Turning FAIL into XFAIL due to env\n");
+		    fprintf (stderr, "Turning FAIL into XFAIL due to env\n");
+		    runner.num_ignored_via_env++;
+		    status = CAIRO_TEST_XFAILURE;
+		} else {
+		    fprintf (stderr, "Test was expected to fail due to an environment variable, but did not!\n");
+		    fprintf (stderr, "Please remove the hack to ignore fallback-resolution failures.\n");
+		    status = CAIRO_TEST_ERROR;
+		}
+	    }
 	    if (getenv ("CAIRO_TEST_UGLY_HACK_TO_IGNORE_FALLBACK_RESOLUTION") && strcmp (ctx.test_name, "fallback-resolution") == 0) {
 		if (status == CAIRO_TEST_FAILURE) {
 		    cairo_test_log (&ctx, "Turning FAIL into XFAIL due to env\n");
commit 2f8b5bc7b202a00c19bfce732564c54df47e3010
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Apr 18 10:08:37 2021 +0200

    Add hack to ignore a svg test crashes
    
    This adds a special hack to the test suite to ignore the crashes for
    self-copy and self-copy-overlap for the svg backend in CI.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ee4649c4..a1e1bc2c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,6 +99,7 @@ fedora autotools build:
     # Current test failures that we ignore for now
     - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_FALLBACK_RESOLUTION=1
     - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_SCRIPT_XCB_HUGE_IMAGE_SHM=1
+    - export CAIRO_TEST_UGLY_HACK_TO_IGNORE_SVG_ARGB32_SELF_COPIES=1
     - export CAIRO_TEST_IGNORE_pdf_argb32=bug-image-compositor,clear-source,clip-operator,clip-text,culled-glyphs,extended-blend,extended-blend-solid,fallback,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,font-matrix-translation,glyph-cache-pressure,halo,halo-transform,inverse-text,large-font,linear-gradient-reflect,mask,operator-alpha-alpha,overlapping-glyphs,paint-with-alpha-clip,partial-clip-text-bottom,partial-clip-text-left,pixman-downscale-fast-95,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-95,pixman-downscale-best-24,pixman-downscale-nearest-95,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,record-select-font-face,record1414x-select-font-face,record1414x-text-transform,record2x-select-font-face,record2x-text-transform,record90-select-font-face,recordflip-whole-select-font-face,recordflip-select-font-f
 ace,record-replay-extend-repeat,record-replay-extend-reflect,recording-surface-over,recording-surface-extend-repeat,recording-surface-extend-reflect,rectilinear-miter-limit,rectilinear-dash,rectilinear-stroke,rotate-image-surface-paint,rotate-clip-image-surface-paint,select-font-face,self-copy,show-glyphs-advance,show-text-current-point,smask-text,smp-glyph,surface-pattern,surface-pattern-operator,surface-pattern-scale-down,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,thin-lines,trap-clip,twin,user-font-proxy,user-font-rescale,pthread-same-source,pthread-show-text,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
     - export CAIRO_TEST_IGNORE_pdf_rgb24=bug-image-compositor,clear-source,clip-text,culled-glyphs,extended-blend-alpha-mask,extended-blend-solid,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,font-matrix-translation,glyph-cache-pressure,halo,halo-transform,inverse-text,large-font,linear-gradient-reflect,mask,operator-alpha-alpha,overlapping-glyphs,paint-with-alpha-clip,partial-clip-text-bottom,partial-clip-text-left,pixman-downscale-fast-95,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-95,pixman-downscale-best-24,pixman-downscale-nearest-95,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,random-intersections-curves-eo,random-intersections-curves-nz,record-paint-alpha-clip,record-select-font-face,record-text-transform,record1414x-paint-alpha,record1414x-paint-alpha-clip,record1414x-paint-alpha-clip-mask,record14
 14x-select-font-face,record1414x-text-transform,record2x-paint-alpha-clip-mask,record2x-select-font-face,record2x-text-transform,record90-paint-alpha-clip,record90-paint-alpha-clip-mask,record90-select-font-face,record90-text-transform,recordflip-whole-select-font-face,recordflip-whole-self-intersecting,recordflip-whole-text-transform,recordflip-select-font-face,recordflip-text-transform,record-replay-extend-repeat,record-replay-extend-reflect,recording-surface-over,recording-surface-extend-repeat,rectilinear-miter-limit,rectilinear-dash,rectilinear-stroke,rel-path,rotate-image-surface-paint,rotate-clip-image-surface-paint,select-font-face,self-copy,show-glyphs-advance,show-text-current-point,smask-text,smp-glyph,surface-pattern,surface-pattern-scale-down,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,trap-clip,twin,user-font-proxy,user-font-rescale,pthread-same-source,pthread-show-text,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-
 layout-type1,ft-text-vertical-layout-type3
     - export CAIRO_TEST_IGNORE_script_argb32=xcb-huge-image-shm
diff --git a/test/cairo-test-runner.c b/test/cairo-test-runner.c
index c3f12a300..50e944f9c 100644
--- a/test/cairo-test-runner.c
+++ b/test/cairo-test-runner.c
@@ -1024,6 +1024,22 @@ main (int argc, char **argv)
 				status = CAIRO_TEST_ERROR;
 			    }
 			}
+			if (getenv ("CAIRO_TEST_UGLY_HACK_TO_IGNORE_SVG_ARGB32_SELF_COPIES")) {
+			    if ((strcmp (target->name, "svg11") == 0 || strcmp (target->name, "svg12") == 0) &&
+					target->content == CAIRO_CONTENT_COLOR_ALPHA &&
+					(strcmp (ctx.test_name, "self-copy") == 0 || strcmp (ctx.test_name, "self-copy-overlap") == 0)) {
+				if (status == CAIRO_TEST_CRASHED) {
+				    cairo_test_log (&ctx, "Turning CRASH into XFAIL due to env\n");
+				    fprintf (stderr, "Turning CRASH into XFAIL due to env\n");
+				    runner.num_ignored_via_env++;
+				    status = CAIRO_TEST_XFAILURE;
+				} else {
+				    fprintf (stderr, "Test was expected to crash due to an environment variable, but did not!\n");
+				    fprintf (stderr, "Please remove the hack to ignore self-copy* crashes for the svg backend.\n");
+				    status = CAIRO_TEST_ERROR;
+				}
+			    }
+			}
 			if (getenv ("CAIRO_TEST_UGLY_HACK_TO_IGNORE_SCRIPT_XCB_HUGE_IMAGE_SHM")) {
 			    if (strcmp (target->name, "script") == 0 && strcmp (ctx.test_name, "xcb-huge-image-shm") == 0) {
 				if (status == CAIRO_TEST_FAILURE) {
commit 0c9dacbc432abc98ffc5f0d7097821e330663e64
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Apr 18 09:32:44 2021 +0200

    svg: Reject raster sources
    
    This hopefully fixes the raster-source test case crashing:
    
    cairo-svg-surface.c:2269: _cairo_svg_surface_emit_pattern: Assertion `!"reached"' failed.
    
    I cannot / did not test this change locally and rely on CI to tell me
    whether this works.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 7e7051eb6..f89860709 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -1138,7 +1138,7 @@ _cairo_svg_surface_analyze_operation (cairo_svg_surface_t   *surface,
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     }
 
-    if (pattern->type == CAIRO_PATTERN_TYPE_MESH)
+    if (pattern->type == CAIRO_PATTERN_TYPE_MESH || pattern->type == CAIRO_PATTERN_TYPE_RASTER_SOURCE)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     /* SVG doesn't support extend reflect for image pattern */
commit 9ea171b132c442a2c972b22596a5911d7bf033a7
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Apr 18 08:40:17 2021 +0200

    Ignore current svg failures in CI
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc87330a7..2ee4649c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,6 +108,10 @@ fedora autotools build:
     - export CAIRO_TEST_IGNORE_image16_rgb24=a1-bug,aliasing,arc-direction,arc-looping-dash,big-line,bug-spline,bug-84115,bug-bo-ricotz,bug-source-cu,bug-extents,bug-seams,bug-image-compositor,caps,caps-2,caps-05,caps-joins-2,caps-joins-alpha,caps-joins-curve,caps-tails-curve,clear-source,clip-disjoint,clip-disjoint-quad,clip-stroke-unbounded,clip-fill-nz-unbounded,clip-fill-eo-unbounded,clip-fill,clip-image,clip-intersect,clip-operator,clip-push-group,clip-shape,clip-stroke,clip-text,clip-twice,close-path-current-point,copy-path,coverage-rectangles,coverage-rhombus,coverage-intersecting-quads,coverage-intersecting-triangles,coverage-row-triangles,coverage-column-triangles,coverage-triangles,coverage-abutting,culled-glyphs,dash-caps-joins,dash-curve,dash-scale,dash-state,dash-zero-length,degenerate-arc,degenerate-curve-to,degenerate-path,degenerate-pen,degenerate-rel-curve-to,drunkard-tails,extend-pad-border,extended-blend,extended-blend-alpha,extended-blend-mask,extended-blend-alph
 a-mask,extended-blend-solid,extended-blend-solid-alpha,fallback,fill-alpha,fill-alpha-pattern,fill-and-stroke,fill-and-stroke-alpha,fill-and-stroke-alpha-add,fill-degenerate-sort-order,fill-image,fill-missed-stop,fill-rule,filter-bilinear-extents,finer-grained-fallbacks,font-matrix-translation,glyph-cache-pressure,gradient-alpha,gradient-constant-alpha,group-unaligned,halo,halo-transform,hatchings,huge-linear,huge-radial,inverse-text,joins,joins-loop,joins-star,joins-retrace,large-font,large-twin-antialias-mixed,leaky-dashed-stroke,line-width-overlap-offset,line-width-scale,linear-gradient,linear-gradient-reflect,linear-gradient-subset,long-dashed-lines,mask,mask-alpha,mask-ctm,mask-surface-ctm,mask-transformed-image,mask-transformed-similar,mesh-pattern,mesh-pattern-conical,mesh-pattern-control-points,mesh-pattern-fold,mesh-pattern-overlap,mesh-pattern-transformed,new-sub-path,operator-source,over-around-source,overlapping-boxes,overlapping-glyphs,overlapping-dash-caps,paint-source
 -alpha,paint-with-alpha,paint-with-alpha-clip,paint-with-alpha-clip-mask,partial-coverage-reference,partial-coverage-three-quarter-reference,pass-through,path-append,path-stroke-twice,pdf-isolated-group,pixman-downscale-fast-96,pixman-downscale-good-96,pixman-downscale-best-96,pixman-downscale-best-24,pixman-downscale-nearest-96,pixman-downscale-bilinear-96,pixman-rotate,push-group,push-group-color,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,random-clip,random-intersections-eo,random-intersections-nonzero,random-intersections-curves-eo,random-intersections-curves-nz,raster-source,record-paint-alpha,record-paint-alpha-clip,record-paint-alpha-clip-mask,record-fill-alpha,record-select-font-face,record-text-transform,record1414x-paint-alpha,record1414x-paint-alpha-clip,record1414x-paint-alpha-clip-mask,record1414x-fill-alpha,record1414x-select-font-face,record1414x-text-transform,record2x-paint-alpha,record2x-paint-alpha-clip,record2x-paint-al
 pha-clip-mask,record2x-fill-alpha,record2x-select-font-face,record2x-text-transform,record90-paint-alpha,record90-paint-alpha-clip,record90-paint-alpha-clip-mask,record90-fill-alpha,record90-select-font-face,record90-text-transform,recordflip-whole-paint-alpha,recordflip-whole-paint-alpha-clip,recordflip-whole-paint-alpha-clip-mask,recordflip-whole-fill-alpha,recordflip-whole-select-font-face,recordflip-whole-text-transform,recordflip-paint-alpha,recordflip-paint-alpha-clip,recordflip-paint-alpha-clip-mask,recordflip-fill-alpha,recordflip-select-font-face,recordflip-text-transform,record-neg-extents-unbounded,record-neg-extents-bounded,record-mesh,record-replay-extend-repeat,record-replay-extend-reflect,record-replay-extend-pad,recording-surface-over,recording-surface-source,recording-surface-extend-none,recording-surface-extend-repeat,recording-surface-extend-reflect,rectilinear-dash-scale-unaligned,reflected-stroke,rel-path,rotate-clip-image-surface-paint,rotated-clip,rounded-rect
 angle-fill,rounded-rectangle-stroke,scale-offset-image,scale-offset-similar,stroke-ctm-caps,stroke-image,select-font-face,set-source,show-glyphs-advance,show-text-current-point,shape-general-convex,shape-sierpinski,simple-edge,smask,smask-fill,smask-mask,smask-paint,smask-stroke,smask-text,spline-decomposition,stroke-pattern,subsurface,subsurface-scale,surface-pattern,surface-pattern-operator,surface-pattern-scale-down,surface-pattern-scale-up,text-antialias-gray,text-antialias-subpixel,text-antialias-subpixel-rgb,text-antialias-subpixel-bgr,text-antialias-subpixel-vrgb,text-antialias-subpixel-vbgr,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,tighten-bounds,tiger,a1-tiger,transforms,trap-clip,twin,twin-antialias-gray,twin-antialias-mixed,twin-antialias-subpixel,unbounded-operator,unclosed-strokes,user-font,user-font-mask,user-font-proxy,user-font-rescale,world-map,world-map-stroke,world-map-fill,xcb-huge-image-shm,xcb-huge-subimage,xcomposite-projec
 tion,pthread-same-source,pthread-show-text,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
     - export CAIRO_TEST_IGNORE_recording_argb32=bug-source-cu,clear-source,clip-text,coverage-rectangles,culled-glyphs,finer-grained-fallbacks,halo-transform,inverse-text,overlapping-glyphs,radial-gradient-source,record-select-font-face,record1414x-fill-alpha,record1414x-select-font-face,record1414x-text-transform,record2x-paint-alpha-clip-mask,record2x-fill-alpha,record2x-select-font-face,record2x-text-transform,record90-select-font-face,recordflip-whole-select-font-face,recordflip-select-font-face,recording-surface-over,recording-surface-source,recording-surface-extend-none,recording-surface-extend-repeat,recording-surface-extend-reflect,scale-offset-similar,select-font-face,show-glyphs-advance,subsurface,subsurface-scale,text-antialias-subpixel,text-antialias-subpixel-rgb,text-antialias-subpixel-bgr,text-antialias-subpixel-vrgb,text-antialias-subpixel-vbgr,text-pattern,text-rotate,text-unhinted-metrics,user-font-rescale,pthread-same-source,pthread-show-text,ft-show-glyphs-positio
 ning,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
     - export CAIRO_TEST_IGNORE_recording_rgb24=bug-source-cu,clear-source,clip-text,coverage-rectangles,culled-glyphs,extended-blend-alpha-mask,finer-grained-fallbacks,halo-transform,inverse-text,overlapping-glyphs,radial-gradient-source,record-select-font-face,record1414x-fill-alpha,record1414x-select-font-face,record1414x-text-transform,record2x-paint-alpha-clip-mask,record2x-fill-alpha,record2x-select-font-face,record2x-text-transform,record90-select-font-face,recordflip-whole-select-font-face,recordflip-select-font-face,recording-surface-over,recording-surface-source,recording-surface-extend-none,recording-surface-extend-repeat,recording-surface-extend-reflect,scale-offset-similar,select-font-face,show-glyphs-advance,subsurface,subsurface-scale,text-antialias-subpixel,text-antialias-subpixel-rgb,text-antialias-subpixel-bgr,text-antialias-subpixel-vrgb,text-antialias-subpixel-vbgr,text-pattern,text-rotate,text-unhinted-metrics,user-font-rescale,pthread-same-source,pthread-show-te
 xt,ft-show-glyphs-positioning,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
+    - export CAIRO_TEST_IGNORE_svg11_argb32=a8-clear,arc-looping-dash,bug-51910,bug-84115,bug-source-cu,caps,caps-2,caps-1,caps-05,checkerboard,caps-joins-2,caps-joins-1,caps-joins-05,caps-joins-curve,caps-tails-curve,caps-sub-paths,clear-source,clip-complex-bug61592,clip-disjoint-quad,clip-fill-rule,clip-image,clip-push-group,clip-text,clipped-group,close-path,close-path-current-point,copy-path,culled-glyphs,dash-caps-joins,dash-curve,dash-infinite-loop,dash-scale,dash-state,degenerate-arcs,degenerate-curve-to,degenerate-linear-gradient,degenerate-pen,degenerate-radial-gradient,degenerate-rel-curve-to,device-offset-fractional,device-offset-scale,extend-pad-border,fallback,fill-and-stroke-alpha,fill-and-stroke-alpha-add,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,finer-grained-fallbacks,font-matrix-translation,glyph-cache-pressure,group-unaligned,halo,halo-transform,huge-radial,infinite-join,inverse-text,joins,large-font,leaky-dashed-stroke,leaky-polygon
 ,line-width-scale,line-width-tolerance,linear-gradient,linear-gradient-extend,linear-gradient-reflect,linear-gradient-subset,long-dashed-lines,mask-transformed-image,mask-transformed-similar,mesh-pattern,mesh-pattern-conical,mesh-pattern-control-points,mesh-pattern-fold,mesh-pattern-overlap,mesh-pattern-transformed,overlapping-glyphs,paint-source-alpha,paint-with-alpha,paint-with-alpha-solid-clip,paint-with-alpha-clip,paint-with-alpha-clip-mask,partial-clip-text-top,partial-clip-text-bottom,partial-clip-text-left,partial-clip-text-right,path-stroke-twice,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-24,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,radial-gradient-extend,record-paint,record-paint-alpha,record-paint-alpha-solid-clip,record-paint-alpha-clip,record-paint-alpha-clip-mask,record-fill-alpha,record-select-font-face,record-self
 -intersecting,record-text-transform,record1414x-paint,record1414x-paint-alpha,record1414x-paint-alpha-solid-clip,record1414x-paint-alpha-clip,record1414x-paint-alpha-clip-mask,record1414x-fill-alpha,record1414x-select-font-face,record1414x-self-intersecting,record1414x-text-transform,record2x-paint,record2x-paint-alpha,record2x-paint-alpha-solid-clip,record2x-paint-alpha-clip,record2x-paint-alpha-clip-mask,record2x-fill-alpha,record2x-select-font-face,record2x-self-intersecting,record2x-text-transform,record90-paint,record90-paint-alpha,record90-paint-alpha-solid-clip,record90-paint-alpha-clip,record90-paint-alpha-clip-mask,record90-fill-alpha,record90-select-font-face,record90-self-intersecting,record90-text-transform,recordflip-whole-paint,recordflip-whole-paint-alpha,recordflip-whole-paint-alpha-solid-clip,recordflip-whole-paint-alpha-clip,recordflip-whole-paint-alpha-clip-mask,recordflip-whole-fill-alpha,recordflip-whole-select-font-face,recordflip-whole-self-intersecting,record
 flip-whole-text-transform,recordflip-paint,recordflip-paint-alpha,recordflip-paint-alpha-solid-clip,recordflip-paint-alpha-clip,recordflip-paint-alpha-clip-mask,recordflip-fill-alpha,recordflip-select-font-face,recordflip-self-intersecting,recordflip-text-transform,record-extend-none,record-extend-pad,record-extend-repeat,record-extend-reflect,record-extend-none-similar,record-extend-pad-similar,record-extend-repeat-similar,record-extend-reflect-similar,record-neg-extents-unbounded,record-neg-extents-bounded,record-mesh,record-replay-extend-none,record-replay-extend-repeat,record-replay-extend-pad,recording-surface-over,recording-surface-source,recording-surface-extend-none,recording-surface-extend-repeat,recording-surface-extend-reflect,rectilinear-miter-limit,reflected-stroke,rotate-image-surface-paint,clip-rotate-image-surface-paint,rotate-clip-image-surface-paint,scale-offset-image,scale-offset-similar,scale-source-surface-paint,stroke-ctm-caps,select-font-face,show-glyphs-advan
 ce,show-text-current-point,shape-sierpinski,smask,smask-image-mask,smask-mask,smask-paint,smask-stroke,smask-text,smp-glyph,spline-decomposition,surface-pattern,surface-pattern-scale-down,surface-pattern-scale-down-extend-pad,surface-pattern-scale-up,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,tiger,transforms,twin,unclosed-strokes,user-font,user-font-proxy,user-font-rescale,world-map,world-map-stroke,world-map-fill,pthread-same-source,pthread-show-text,pthread-similar,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
+    - export CAIRO_TEST_IGNORE_svg11_rgb24=a8-clear,arc-looping-dash,bug-51910,bug-84115,bug-bo-ricotz,bug-source-cu,caps,caps-2,caps-1,caps-05,checkerboard,caps-joins-2,caps-joins-1,caps-joins-05,caps-joins-curve,caps-tails-curve,caps-sub-paths,clear-source,clip-complex-bug61592,clip-disjoint-quad,clip-fill-rule,clip-image,clip-push-group,clip-text,clipped-group,close-path,close-path-current-point,copy-path,culled-glyphs,dash-caps-joins,dash-curve,dash-infinite-loop,dash-scale,dash-state,dash-zero-length,degenerate-arcs,degenerate-curve-to,degenerate-linear-gradient,degenerate-path,degenerate-pen,degenerate-radial-gradient,degenerate-rel-curve-to,device-offset-fractional,device-offset-scale,extend-pad-border,extended-blend-alpha-mask,fill-and-stroke,fill-and-stroke-alpha,fill-and-stroke-alpha-add,fill-missed-stop,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,finer-grained-fallbacks,font-matrix-translation,glyph-cache-pressure,gradient-alpha,gradient-const
 ant-alpha,group-unaligned,halo,halo-transform,huge-radial,infinite-join,inverse-text,joins,large-font,leaky-dashed-stroke,leaky-polygon,line-width-scale,line-width-tolerance,linear-gradient,linear-gradient-extend,linear-gradient-reflect,linear-gradient-subset,long-dashed-lines,mask,mask-transformed-image,mask-transformed-similar,mesh-pattern,mesh-pattern-conical,mesh-pattern-control-points,mesh-pattern-fold,mesh-pattern-overlap,mesh-pattern-transformed,new-sub-path,overlapping-glyphs,paint-source-alpha,paint-with-alpha,paint-with-alpha-solid-clip,paint-with-alpha-clip,paint-with-alpha-clip-mask,partial-clip-text-top,partial-clip-text-bottom,partial-clip-text-left,partial-clip-text-right,path-stroke-twice,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-24,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,push-group,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,radial-gradient-extend,reco
 rd-paint,record-paint-alpha,record-paint-alpha-solid-clip,record-paint-alpha-clip,record-paint-alpha-clip-mask,record-fill-alpha,record-select-font-face,record-self-intersecting,record-text-transform,record1414x-paint,record1414x-paint-alpha,record1414x-paint-alpha-solid-clip,record1414x-paint-alpha-clip,record1414x-paint-alpha-clip-mask,record1414x-fill-alpha,record1414x-select-font-face,record1414x-self-intersecting,record1414x-text-transform,record2x-paint,record2x-paint-alpha,record2x-paint-alpha-solid-clip,record2x-paint-alpha-clip,record2x-paint-alpha-clip-mask,record2x-fill-alpha,record2x-select-font-face,record2x-self-intersecting,record2x-text-transform,record90-paint,record90-paint-alpha,record90-paint-alpha-solid-clip,record90-paint-alpha-clip,record90-paint-alpha-clip-mask,record90-fill-alpha,record90-select-font-face,record90-self-intersecting,record90-text-transform,recordflip-whole-paint,recordflip-whole-paint-alpha,recordflip-whole-paint-alpha-solid-clip,recordflip-w
 hole-paint-alpha-clip,recordflip-whole-paint-alpha-clip-mask,recordflip-whole-fill-alpha,recordflip-whole-select-font-face,recordflip-whole-self-intersecting,recordflip-whole-text-transform,recordflip-paint,recordflip-paint-alpha,recordflip-paint-alpha-solid-clip,recordflip-paint-alpha-clip,recordflip-paint-alpha-clip-mask,recordflip-fill-alpha,recordflip-select-font-face,recordflip-self-intersecting,recordflip-text-transform,record-extend-none,record-extend-pad,record-extend-repeat,record-extend-reflect,record-extend-none-similar,record-extend-pad-similar,record-extend-repeat-similar,record-extend-reflect-similar,record-neg-extents-unbounded,record-neg-extents-bounded,record-mesh,record-replay-extend-none,record-replay-extend-repeat,record-replay-extend-pad,recording-surface-over,recording-surface-source,recording-surface-extend-none,recording-surface-extend-repeat,recording-surface-extend-reflect,rectilinear-miter-limit,reflected-stroke,rel-path,rotate-image-surface-paint,clip-rot
 ate-image-surface-paint,rotate-clip-image-surface-paint,scale-offset-image,scale-offset-similar,scale-source-surface-paint,stroke-ctm-caps,select-font-face,self-copy,show-glyphs-advance,show-text-current-point,shape-sierpinski,smask,smask-image-mask,smask-mask,smask-paint,smask-stroke,smask-text,smp-glyph,spline-decomposition,surface-pattern,surface-pattern-scale-down,surface-pattern-scale-down-extend-pad,surface-pattern-scale-up,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,tiger,transforms,twin,unclosed-strokes,user-font,user-font-proxy,user-font-rescale,world-map,world-map-stroke,world-map-fill,pthread-same-source,pthread-show-text,pthread-similar,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
+    - export CAIRO_TEST_IGNORE_svg12_argb32=a8-clear,arc-looping-dash,big-empty-box,big-empty-triangle,big-little-box,big-little-triangle,bug-51910,bug-84115,bug-source-cu,bug-image-compositor,caps,caps-2,caps-1,caps-05,checkerboard,caps-joins-2,caps-joins-1,caps-joins-05,caps-joins-curve,caps-tails-curve,caps-sub-paths,clear,clear-source,clip-complex-bug61592,clip-disjoint-quad,clip-stroke-unbounded,clip-fill-nz-unbounded,clip-fill-eo-unbounded,clip-fill-rule,clip-image,clip-operator,clip-push-group,clip-text,clip-unbounded,clipped-group,close-path,close-path-current-point,copy-path,culled-glyphs,dash-caps-joins,dash-curve,dash-infinite-loop,dash-scale,dash-state,degenerate-arcs,degenerate-curve-to,degenerate-linear-gradient,degenerate-pen,degenerate-radial-gradient,degenerate-rel-curve-to,device-offset-fractional,device-offset-scale,extend-pad-border,extended-blend,extended-blend-alpha,extended-blend-mask,extended-blend-alpha-mask,extended-blend-solid,extended-blend-solid-alpha,fa
 llback,fill-and-stroke-alpha,fill-and-stroke-alpha-add,fill-empty,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,finer-grained-fallbacks,font-matrix-translation,glyph-cache-pressure,group-unaligned,halo,halo-transform,huge-radial,infinite-join,inverse-text,joins,large-font,leaky-dashed-stroke,leaky-polygon,line-width-scale,line-width-tolerance,linear-gradient,linear-gradient-extend,linear-gradient-reflect,linear-gradient-subset,long-dashed-lines,mask-transformed-image,mask-transformed-similar,mesh-pattern,mesh-pattern-conical,mesh-pattern-control-points,mesh-pattern-fold,mesh-pattern-overlap,mesh-pattern-transformed,operator,operator-alpha,operator-clear,operator-source,over-around-source,over-below-source,over-between-source,overlapping-boxes,overlapping-glyphs,paint-source-alpha,paint-with-alpha,paint-with-alpha-solid-clip,paint-with-alpha-clip,paint-with-alpha-clip-mask,partial-clip-text-top,partial-clip-text-bottom,partial-clip-text-left,partial-clip-te
 xt-right,path-stroke-twice,pdf-isolated-group,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-24,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,push-group-color,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,radial-gradient-extend,record-paint,record-paint-alpha,record-paint-alpha-solid-clip,record-paint-alpha-clip,record-paint-alpha-clip-mask,record-fill-alpha,record-select-font-face,record-self-intersecting,record-text-transform,record1414x-paint,record1414x-paint-alpha,record1414x-paint-alpha-solid-clip,record1414x-paint-alpha-clip,record1414x-paint-alpha-clip-mask,record1414x-fill-alpha,record1414x-select-font-face,record1414x-self-intersecting,record1414x-text-transform,record2x-paint,record2x-paint-alpha,record2x-paint-alpha-solid-clip,record2x-paint-alpha-clip,record2x-paint-alpha-clip-mask,record2x-fill-alpha,record2x-select-font-face,record2x-self-intersecting,record2x-text-t
 ransform,record90-paint,record90-paint-alpha,record90-paint-alpha-solid-clip,record90-paint-alpha-clip,record90-paint-alpha-clip-mask,record90-fill-alpha,record90-select-font-face,record90-self-intersecting,record90-text-transform,recordflip-whole-paint,recordflip-whole-paint-alpha,recordflip-whole-paint-alpha-solid-clip,recordflip-whole-paint-alpha-clip,recordflip-whole-paint-alpha-clip-mask,recordflip-whole-fill-alpha,recordflip-whole-select-font-face,recordflip-whole-self-intersecting,recordflip-whole-text-transform,recordflip-paint,recordflip-paint-alpha,recordflip-paint-alpha-solid-clip,recordflip-paint-alpha-clip,recordflip-paint-alpha-clip-mask,recordflip-fill-alpha,recordflip-select-font-face,recordflip-self-intersecting,recordflip-text-transform,record-extend-none,record-extend-pad,record-extend-repeat,record-extend-reflect,record-extend-none-similar,record-extend-pad-similar,record-extend-repeat-similar,record-extend-reflect-similar,record-neg-extents-unbounded,record-neg-
 extents-bounded,record-mesh,record-replay-extend-none,record-replay-extend-repeat,record-replay-extend-reflect,record-replay-extend-pad,recording-surface-over,recording-surface-source,recording-surface-extend-none,recording-surface-extend-repeat,recording-surface-extend-reflect,rectilinear-miter-limit,reflected-stroke,rotate-image-surface-paint,clip-rotate-image-surface-paint,rotate-clip-image-surface-paint,scale-offset-image,scale-offset-similar,scale-source-surface-paint,stroke-ctm-caps,select-font-face,show-glyphs-advance,show-text-current-point,shape-sierpinski,smask,smask-image-mask,smask-mask,smask-paint,smask-stroke,smask-text,smp-glyph,spline-decomposition,surface-pattern,surface-pattern-operator,surface-pattern-scale-down,surface-pattern-scale-down-extend-pad,surface-pattern-scale-up,text-glyph-range,text-pattern,text-rotate,text-transform,text-unhinted-metrics,tighten-bounds,tiger,transforms,twin,unbounded-operator,unclosed-strokes,user-font,user-font-proxy,user-font-resca
 le,world-map,world-map-stroke,world-map-fill,xlib-expose-event,pthread-same-source,pthread-show-text,pthread-similar,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
+    - export CAIRO_TEST_IGNORE_svg12_rgb24=a8-clear,arc-looping-dash,big-empty-box,big-empty-triangle,big-little-box,big-little-triangle,bug-51910,bug-84115,bug-bo-ricotz,bug-source-cu,bug-image-compositor,caps,caps-2,caps-1,caps-05,checkerboard,caps-joins-2,caps-joins-1,caps-joins-05,caps-joins-curve,caps-tails-curve,caps-sub-paths,clear,clear-source,clip-complex-bug61592,clip-disjoint-quad,clip-stroke-unbounded,clip-fill-nz-unbounded,clip-fill-eo-unbounded,clip-fill-rule,clip-image,clip-operator,clip-push-group,clip-text,clip-unbounded,clipped-group,close-path,close-path-current-point,copy-path,culled-glyphs,dash-caps-joins,dash-curve,dash-infinite-loop,dash-scale,dash-state,dash-zero-length,degenerate-arcs,degenerate-curve-to,degenerate-linear-gradient,degenerate-path,degenerate-pen,degenerate-radial-gradient,degenerate-rel-curve-to,device-offset-fractional,device-offset-scale,extend-pad-border,extended-blend,extended-blend-alpha,extended-blend-mask,extended-blend-alpha-mask,exte
 nded-blend-solid,extended-blend-solid-alpha,fallback,fill-and-stroke,fill-and-stroke-alpha,fill-and-stroke-alpha-add,fill-empty,fill-missed-stop,filter-bilinear-extents,filter-nearest-offset,filter-nearest-transformed,finer-grained-fallbacks,font-matrix-translation,glyph-cache-pressure,gradient-alpha,gradient-constant-alpha,group-unaligned,halo,halo-transform,huge-radial,infinite-join,inverse-text,joins,large-font,leaky-dashed-stroke,leaky-polygon,line-width-scale,line-width-tolerance,linear-gradient,linear-gradient-extend,linear-gradient-reflect,linear-gradient-subset,long-dashed-lines,mask,mask-transformed-image,mask-transformed-similar,mesh-pattern,mesh-pattern-conical,mesh-pattern-control-points,mesh-pattern-fold,mesh-pattern-overlap,mesh-pattern-transformed,new-sub-path,operator,operator-alpha,operator-clear,operator-source,over-around-source,over-below-source,over-between-source,overlapping-boxes,overlapping-glyphs,paint-source-alpha,paint-with-alpha,paint-with-alpha-solid-cli
 p,paint-with-alpha-clip,paint-with-alpha-clip-mask,partial-clip-text-top,partial-clip-text-bottom,partial-clip-text-left,partial-clip-text-right,path-stroke-twice,pdf-isolated-group,pixman-downscale-fast-24,pixman-downscale-good-24,pixman-downscale-best-24,pixman-downscale-nearest-24,pixman-downscale-bilinear-24,push-group,push-group-color,radial-gradient,radial-gradient-mask,radial-gradient-source,radial-gradient-mask-source,radial-gradient-one-stop,radial-gradient-extend,record-paint,record-paint-alpha,record-paint-alpha-solid-clip,record-paint-alpha-clip,record-paint-alpha-clip-mask,record-fill-alpha,record-select-font-face,record-self-intersecting,record-text-transform,record1414x-paint,record1414x-paint-alpha,record1414x-paint-alpha-solid-clip,record1414x-paint-alpha-clip,record1414x-paint-alpha-clip-mask,record1414x-fill-alpha,record1414x-select-font-face,record1414x-self-intersecting,record1414x-text-transform,record2x-paint,record2x-paint-alpha,record2x-paint-alpha-solid-cli
 p,record2x-paint-alpha-clip,record2x-paint-alpha-clip-mask,record2x-fill-alpha,record2x-select-font-face,record2x-self-intersecting,record2x-text-transform,record90-paint,record90-paint-alpha,record90-paint-alpha-solid-clip,record90-paint-alpha-clip,record90-paint-alpha-clip-mask,record90-fill-alpha,record90-select-font-face,record90-self-intersecting,record90-text-transform,recordflip-whole-paint,recordflip-whole-paint-alpha,recordflip-whole-paint-alpha-solid-clip,recordflip-whole-paint-alpha-clip,recordflip-whole-paint-alpha-clip-mask,recordflip-whole-fill-alpha,recordflip-whole-select-font-face,recordflip-whole-self-intersecting,recordflip-whole-text-transform,recordflip-paint,recordflip-paint-alpha,recordflip-paint-alpha-solid-clip,recordflip-paint-alpha-clip,recordflip-paint-alpha-clip-mask,recordflip-fill-alpha,recordflip-select-font-face,recordflip-self-intersecting,recordflip-text-transform,record-extend-none,record-extend-pad,record-extend-repeat,record-extend-reflect,recor
 d-extend-none-similar,record-extend-pad-similar,record-extend-repeat-similar,record-extend-reflect-similar,record-neg-extents-unbounded,record-neg-extents-bounded,record-mesh,record-replay-extend-none,record-replay-extend-repeat,record-replay-extend-reflect,record-replay-extend-pad,recording-surface-over,recording-surface-source,recording-surface-extend-none,recording-surface-extend-repeat,recording-surface-extend-reflect,rectilinear-miter-limit,reflected-stroke,rel-path,rotate-image-surface-paint,clip-rotate-image-surface-paint,rotate-clip-image-surface-paint,scale-offset-image,scale-offset-similar,scale-source-surface-paint,stroke-ctm-caps,select-font-face,self-copy,show-glyphs-advance,show-text-current-point,shape-sierpinski,smask,smask-image-mask,smask-mask,smask-paint,smask-stroke,smask-text,smp-glyph,spline-decomposition,surface-pattern,surface-pattern-operator,surface-pattern-scale-down,surface-pattern-scale-down-extend-pad,surface-pattern-scale-up,text-glyph-range,text-patte
 rn,text-rotate,text-transform,text-unhinted-metrics,tighten-bounds,tiger,transforms,twin,unbounded-operator,unclosed-strokes,user-font,user-font-proxy,user-font-rescale,world-map,world-map-stroke,world-map-fill,xlib-expose-event,pthread-same-source,pthread-show-text,pthread-similar,ft-show-glyphs-positioning,ft-show-glyphs-table,ft-text-vertical-layout-type1,ft-text-vertical-layout-type3
     - make check V=1 VERBOSE=1
   artifacts:
     when: 'always'
commit ca3423a701a441425b336dadfb3901a6ff948e3b
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Apr 18 08:18:49 2021 +0200

    Install gtk2-devel on CI
    
    From config.log from CI:
    
    configure:27855: $PKG_CONFIG --exists --print-errors "$librsvg_DEPENDENCY gdk-2.0"
    Package gdk-2.0 was not found in the pkg-config search path.
    Perhaps you should add the directory containing `gdk-2.0.pc'
    to the PKG_CONFIG_PATH environment variable
    Package 'gdk-2.0', required by 'virtual:world', not found
    configure:27858: $? = 1
    Package 'gdk-2.0', required by 'virtual:world', not found
    configure:27885: result: no
    configure:27921: WARNING: SVG backend will not be tested since librsvg >= 2.35.0 is not available
    
    According to Google, it seems like gtk2-devel is the right package to
    get gdk-2.0.pc.
    
    Thanks a lot to @tpm for explaining that I also have to change the TAG
    variable.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34fe0938c..fc87330a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ include:
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
   FDO_DISTRIBUTION_VERSION: '32'
-  FDO_DISTRIBUTION_TAG: '2020-09-29.0'
+  FDO_DISTRIBUTION_TAG: '2021-04-18.0'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one.
   WINDOWS_IMAGE:             "registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v16-master"
@@ -69,6 +69,7 @@ fedora image:
       libXrender-devel
       glib2-devel
       librsvg2-devel
+      gtk2-devel
       libdrm-devel
       poppler-glib-devel
       pixman-devel
commit f8157ae751caeace9e8fdc9df4cc41e0593fd841
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Apr 18 08:01:09 2021 +0200

    Add config.log to build artefacts
    
    This fail is not large, so doesn't "cost much", but it helps in figuring
    out build problems in CI like "what exactly is missing for the SVG
    backend?".
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a42cc655..34fe0938c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,6 +112,7 @@ fedora autotools build:
     when: 'always'
     expire_in: "7 days"
     paths:
+      - config.log
       - test/*.log
       - test/pdiff/*.log
       - test/output


More information about the cairo-commit mailing list