From: Jeremy Bícha Date: Sat, 5 Aug 2023 08:56:42 +0000 (-0400) Subject: Refresh patches X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~56 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=efeaaa58826956dcbe1fbd52529b1e066deb3cd2;p=gtk4.git Refresh patches --- diff --git a/debian/patches/Revert-build-Drop-the-install-tests-option.patch b/debian/patches/Revert-build-Drop-the-install-tests-option.patch index 45206ccdab..6fa1599f87 100644 --- a/debian/patches/Revert-build-Drop-the-install-tests-option.patch +++ b/debian/patches/Revert-build-Drop-the-install-tests-option.patch @@ -22,22 +22,22 @@ This reverts commit 3121f88265ac61733e257f5335473d6f139f158c. 12 files changed, 353 insertions(+), 43 deletions(-) diff --git a/meson.build b/meson.build -index 1351771..33b95e5 100644 +index b7717e1..9870c07 100644 --- a/meson.build +++ b/meson.build -@@ -902,6 +902,7 @@ summary('Documentation', get_option('gtk_doc'), section: 'Build') +@@ -915,6 +915,7 @@ summary('Documentation', get_option('gtk_doc'), section: 'Build') summary('Man pages', get_option('man-pages'), section: 'Build') summary('Testsuite', get_option('build-testsuite'), section: 'Build') summary('Tests', get_option('build-tests'), section: 'Build') +summary('Install tests', get_option('install-tests'), section: 'Build') - summary('Demos', get_option('demos'), section: 'Build') + summary('Demos', get_option('build-demos'), section: 'Build') summary('Examples', get_option('build-examples'), section: 'Build') diff --git a/meson_options.txt b/meson_options.txt -index 9f608e9..5e16043 100644 +index f4399d3..0ca7936 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -133,3 +133,8 @@ option('build-tests', +@@ -144,3 +144,8 @@ option('build-tests', type: 'boolean', value: true, description : 'Build tests') @@ -47,7 +47,7 @@ index 9f608e9..5e16043 100644 + value: false, + description : 'Install tests') diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build -index c43465e..4547b21 100644 +index 2686d6c..e70522d 100644 --- a/testsuite/a11y/meson.build +++ b/testsuite/a11y/meson.build @@ -1,3 +1,6 @@ @@ -57,7 +57,7 @@ index c43465e..4547b21 100644 # Available keys for each test: # # - 'name': the test name; used for the test and to determine the base -@@ -61,11 +64,12 @@ foreach t : tests +@@ -67,11 +70,12 @@ foreach t : tests test_extra_suites = t.get('suites', []) test_timeout = 60 @@ -73,10 +73,10 @@ index c43465e..4547b21 100644 if test_extra_suites.contains('slow') diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build -index a75b530..9409f48 100644 +index f78d27e..e0ef9d4 100644 --- a/testsuite/css/change/meson.build +++ b/testsuite/css/change/meson.build -@@ -7,10 +7,17 @@ changetest_env.set('GIO_USE_VFS', 'local') +@@ -6,10 +6,17 @@ changetest_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) changetest_env.set('GSETTINGS_BACKEND', 'memory') changetest_env.set('G_ENABLE_DIAGNOSTIC', '0') @@ -96,7 +96,7 @@ index a75b530..9409f48 100644 ) test('change', test_change, -@@ -19,3 +26,22 @@ test('change', test_change, +@@ -18,3 +25,22 @@ test('change', test_change, env: changetest_env, suite: 'css', ) @@ -120,10 +120,10 @@ index a75b530..9409f48 100644 + +endif diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build -index 24084d6..20c0314 100644 +index 746b042..c3ed717 100644 --- a/testsuite/css/meson.build +++ b/testsuite/css/meson.build -@@ -13,10 +13,14 @@ subdir('nodes') +@@ -12,10 +12,14 @@ subdir('nodes') subdir('style') subdir('change') @@ -140,14 +140,14 @@ index 24084d6..20c0314 100644 ) test('api', test_api, -@@ -26,11 +30,12 @@ test('api', test_api, +@@ -25,11 +29,12 @@ test('api', test_api, suite: 'css', ) -test_data = executable('data', - sources: ['data.c'], +test_data = executable('data', 'data.c', - c_args: common_cflags, + c_args: common_cflags + ['-DGTK_COMPILATION'], include_directories: [confinc, ], dependencies: libgtk_static_dep, + install: get_option('install-tests'), @@ -155,21 +155,21 @@ index 24084d6..20c0314 100644 ) test('data', test_data, -@@ -40,10 +45,11 @@ test('data', test_data, +@@ -39,10 +44,11 @@ test('data', test_data, suite: 'css', ) -transition = executable('transition', - sources: ['transition.c'], +transition = executable('transition', 'transition.c', - c_args: common_cflags, + c_args: common_cflags + ['-DGTK_COMPILATION'], dependencies: libgtk_static_dep, + install: get_option('install-tests'), + install_dir: testexecdir, ) test('transition', transition, -@@ -53,6 +59,24 @@ test('transition', transition, +@@ -52,6 +58,24 @@ test('transition', transition, suite: 'css' ) @@ -195,10 +195,10 @@ index 24084d6..20c0314 100644 adwaita_env = csstest_env diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build -index 576b4d8..eb619cf 100644 +index f682cdb..a7cb3e2 100644 --- a/testsuite/css/nodes/meson.build +++ b/testsuite/css/nodes/meson.build -@@ -7,15 +7,81 @@ nodetest_env.set('GIO_USE_VFS', 'local') +@@ -6,15 +6,81 @@ nodetest_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) nodetest_env.set('GSETTINGS_BACKEND', 'memory') nodetest_env.set('G_ENABLE_DIAGNOSTIC', '0') @@ -286,7 +286,7 @@ index 576b4d8..eb619cf 100644 + install_data(test_data, install_dir: testexecdir) +endif diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build -index b419c29..d0fdd0d 100644 +index b05efb7..bfb9936 100644 --- a/testsuite/css/parser/meson.build +++ b/testsuite/css/parser/meson.build @@ -1,8 +1,11 @@ @@ -306,7 +306,7 @@ index b419c29..d0fdd0d 100644 test_data = [ 'animation-crash-3.12.css', -@@ -534,3 +537,15 @@ foreach testname : test_data +@@ -623,3 +626,15 @@ foreach testname : test_data suite: 'css') endif endforeach @@ -323,10 +323,10 @@ index b419c29..d0fdd0d 100644 + +endif diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build -index a6c5e2e..6b2d252 100644 +index 7fc4036..52c962c 100644 --- a/testsuite/css/style/meson.build +++ b/testsuite/css/style/meson.build -@@ -7,21 +7,73 @@ styletest_env.set('GIO_USE_VFS', 'local') +@@ -6,21 +6,73 @@ styletest_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) styletest_env.set('GSETTINGS_BACKEND', 'memory') styletest_env.set('G_ENABLE_DIAGNOSTIC', '0') @@ -404,7 +404,7 @@ index a6c5e2e..6b2d252 100644 + install_data(test_data, install_dir: testexecdir) +endif diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build -index ebaa66f..98b57cb 100644 +index 32a31da..67c08ab 100644 --- a/testsuite/gdk/meson.build +++ b/testsuite/gdk/meson.build @@ -1,10 +1,13 @@ @@ -427,7 +427,7 @@ index ebaa66f..98b57cb 100644 tests = [ { 'name': 'array' }, -@@ -31,7 +34,8 @@ foreach t : tests +@@ -33,7 +36,8 @@ foreach t : tests sources: '@0@.c'.format(test_name), c_args: common_cflags, dependencies: libgtk_dep, @@ -437,9 +437,9 @@ index ebaa66f..98b57cb 100644 ) suites = ['gdk'] + t.get('suites', []) -@@ -58,7 +62,8 @@ foreach t : internal_tests +@@ -61,7 +65,8 @@ foreach t : internal_tests test_exe = executable(t, '@0@.c'.format(t), - c_args: common_cflags, + c_args: common_cflags + ['-DGTK_COMPILATION'], dependencies: libgtk_static_dep, - install: false, + install: get_option('install-tests'), @@ -447,7 +447,7 @@ index ebaa66f..98b57cb 100644 ) test(t, test_exe, -@@ -72,3 +77,28 @@ foreach t : internal_tests +@@ -75,3 +80,28 @@ foreach t : internal_tests suite: 'gdk', ) endforeach @@ -477,7 +477,7 @@ index ebaa66f..98b57cb 100644 + install_subdir('image-data', install_dir: testexecdir) +endif diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build -index ca8f833..44ad57a 100644 +index 1a57cfa..9b29ba0 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -1,12 +1,22 @@ @@ -505,7 +505,7 @@ index ca8f833..44ad57a 100644 ) compare_render_tests = [ -@@ -277,9 +287,11 @@ foreach t : tests +@@ -368,9 +378,11 @@ foreach t : tests test_extra_ldflags = t.get(3, []) test_exe = executable(test_name, test_srcs, @@ -518,7 +518,7 @@ index ca8f833..44ad57a 100644 ) test(test_name, test_exe, -@@ -308,11 +320,12 @@ foreach t : internal_tests +@@ -399,11 +411,12 @@ foreach t : internal_tests test_extra_cargs = t.get(2, []) test_extra_ldflags = t.get(3, []) @@ -526,7 +526,7 @@ index ca8f833..44ad57a 100644 - sources: test_srcs, - dependencies : libgtk_static_dep, + test_exe = executable(test_name, test_srcs, - c_args : test_cargs + test_extra_cargs + common_cflags, + c_args : test_cargs + test_extra_cargs + common_cflags + ['-DGTK_COMPILATION'], link_args : test_extra_ldflags, + dependencies : libgtk_static_dep, + install: get_option('install-tests'), @@ -535,7 +535,7 @@ index ca8f833..44ad57a 100644 test(test_name, test_exe, diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index 73dd136..3c107ef 100644 +index 12b025f..f7700bb 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -1,3 +1,6 @@ @@ -545,7 +545,7 @@ index 73dd136..3c107ef 100644 gtk_tests_export_dynamic_ldflag = [] if cc.get_id() != 'msvc' -@@ -169,6 +172,8 @@ foreach t : tests +@@ -167,6 +170,8 @@ foreach t : tests c_args: test_cargs + test_extra_cargs, link_args: test_extra_ldflags, dependencies: libgtk_dep, @@ -554,8 +554,8 @@ index 73dd136..3c107ef 100644 ) if test_extra_suites.contains('slow') -@@ -197,6 +202,8 @@ foreach t : internal_tests - c_args: test_cargs + test_extra_cargs, +@@ -195,6 +200,8 @@ foreach t : internal_tests + c_args: test_cargs + test_extra_cargs + ['-DGTK_COMPILATION'], link_args: test_extra_ldflags, dependencies: libgtk_static_dep, + install: get_option('install-tests'), @@ -563,7 +563,7 @@ index 73dd136..3c107ef 100644 ) if test_extra_suites.contains('slow') -@@ -215,8 +222,10 @@ endforeach +@@ -213,8 +220,10 @@ endforeach # FIXME: if objc autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++ if add_languages('cpp', required: false, native: false) test_exe = executable('autotestkeywords', @@ -575,7 +575,7 @@ index 73dd136..3c107ef 100644 ) test('c++ keywords', test_exe, args: [ '--tap', '-k' ], -@@ -224,6 +233,16 @@ if add_languages('cpp', required: false, native: false) +@@ -222,6 +231,16 @@ if add_languages('cpp', required: false, native: false) env: test_env, suite: 'gtk', ) @@ -592,7 +592,7 @@ index 73dd136..3c107ef 100644 endif -@@ -249,10 +268,13 @@ focus_chain_tests = [ +@@ -247,10 +266,13 @@ focus_chain_tests = [ #[ 'widget-factory3', 'tab-backward' ], ] @@ -607,7 +607,7 @@ index 73dd136..3c107ef 100644 ) foreach test : focus_chain_tests -@@ -274,6 +296,30 @@ test('potfiles', make_pot, +@@ -273,6 +295,30 @@ test('potfiles', make_pot, workdir: meson.project_source_root(), suite: ['gtk', 'translations' ]) @@ -639,7 +639,7 @@ index 73dd136..3c107ef 100644 performance_env = test_env diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build -index 986c2d6..582bce6 100644 +index e19a819..54ede78 100644 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@ -1,12 +1,23 @@ @@ -650,7 +650,7 @@ index 986c2d6..582bce6 100644 if bash.found() test_env = environment() - foreach t : ['simplify', 'simplify-3to4', 'validate', 'settings'] + foreach t : ['simplify', 'simplify-3to4', 'validate', 'enumerate', 'settings'] - configure_file(output: t, - input: '@0@.in'.format(t), - copy: true, diff --git a/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch b/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch index a5da614f30..5908fb35c0 100644 --- a/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch +++ b/debian/patches/Revert-tests-Stop-copying-the-tool-tests.patch @@ -7,6 +7,8 @@ This reverts commit bb3a6214cbeaa3211be007192e536bd473323836. This is actually used by the installed tests which we also had to revert dropping (in a separate patch) --- + testsuite/tools/enumerate | 37 ------------------------------- + testsuite/tools/enumerate.in | 37 +++++++++++++++++++++++++++++++ testsuite/tools/meson.build | 8 +++++-- testsuite/tools/settings | 20 ----------------- testsuite/tools/settings.in | 20 +++++++++++++++++ @@ -16,7 +18,6 @@ which we also had to revert dropping (in a separate patch) testsuite/tools/simplify.in | 47 ++++++++++++++++++++++++++++++++++++++++ testsuite/tools/validate | 37 ------------------------------- testsuite/tools/validate.in | 37 +++++++++++++++++++++++++++++++ - 9 files changed, 157 insertions(+), 153 deletions(-) delete mode 100755 testsuite/tools/settings create mode 100755 testsuite/tools/settings.in delete mode 100755 testsuite/tools/simplify @@ -26,6 +27,92 @@ which we also had to revert dropping (in a separate patch) delete mode 100755 testsuite/tools/validate create mode 100755 testsuite/tools/validate.in +diff --git a/testsuite/tools/enumerate b/testsuite/tools/enumerate +deleted file mode 100755 +index 8abd9d6..0000000 +--- a/testsuite/tools/enumerate ++++ /dev/null +@@ -1,37 +0,0 @@ +-#! /bin/bash +- +-GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool} +-TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/enumerate-data +-TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}/enumerate +- +-mkdir -p "$TEST_RESULT_DIR" +- +-shopt -s nullglob +-TESTS=( "$TEST_DATA_DIR"/*.ui ) +- +-echo "1..${#TESTS[*]}" +- +-I=1 +-for t in ${TESTS[*]}; do +- name=$(basename $t .ui) +- expected="$TEST_DATA_DIR/$name.expected" +- result="$TEST_RESULT_DIR/$name.out" +- diff="$TEST_RESULT_DIR/$name.diff" +- ref="$TEST_RESULT_DIR/$name.ref" +- +- cd $TEST_DATA_DIR +- +- $GTK_BUILDER_TOOL enumerate --callbacks $(basename $t) >$result +- +- cd $OLDPWD +- +- if diff -u "$expected" "$result" > "$diff"; then +- echo "ok $I $name" +- rm "$diff" +- else +- echo "not ok $I $name" +- cp "$expected" "$ref" +- fi +- +- I=$((I+1)) +-done +diff --git a/testsuite/tools/enumerate.in b/testsuite/tools/enumerate.in +new file mode 100755 +index 0000000..8abd9d6 +--- /dev/null ++++ b/testsuite/tools/enumerate.in +@@ -0,0 +1,37 @@ ++#! /bin/bash ++ ++GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool} ++TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/enumerate-data ++TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}/enumerate ++ ++mkdir -p "$TEST_RESULT_DIR" ++ ++shopt -s nullglob ++TESTS=( "$TEST_DATA_DIR"/*.ui ) ++ ++echo "1..${#TESTS[*]}" ++ ++I=1 ++for t in ${TESTS[*]}; do ++ name=$(basename $t .ui) ++ expected="$TEST_DATA_DIR/$name.expected" ++ result="$TEST_RESULT_DIR/$name.out" ++ diff="$TEST_RESULT_DIR/$name.diff" ++ ref="$TEST_RESULT_DIR/$name.ref" ++ ++ cd $TEST_DATA_DIR ++ ++ $GTK_BUILDER_TOOL enumerate --callbacks $(basename $t) >$result ++ ++ cd $OLDPWD ++ ++ if diff -u "$expected" "$result" > "$diff"; then ++ echo "ok $I $name" ++ rm "$diff" ++ else ++ echo "not ok $I $name" ++ cp "$expected" "$ref" ++ fi ++ ++ I=$((I+1)) ++done diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build index 96ac7fd..986c2d6 100644 --- a/testsuite/tools/meson.build @@ -33,7 +120,7 @@ index 96ac7fd..986c2d6 100644 @@ -3,8 +3,12 @@ if bash.found() test_env = environment() - foreach t : ['simplify', 'simplify-3to4', 'validate', 'settings'] + foreach t : ['simplify', 'simplify-3to4', 'validate', 'enumerate', 'settings'] - test(t, - find_program(t, dirs: meson.current_source_dir()), + configure_file(output: t, @@ -76,7 +163,6 @@ new file mode 100755 index 0000000..3c5ce69 --- /dev/null +++ b/testsuite/tools/settings.in -@@ -0,0 +1,20 @@ +#! /bin/bash + +GTK_QUERY_SETTINGS=${GTK_QUERY_SETTINGS:-gtk4-query-settings} @@ -338,7 +424,7 @@ index 42048ef..0000000 - - cd $TEST_DATA_DIR - -- $GTK_BUILDER_TOOL validate $(basename $t) 2>$result +- $GTK_BUILDER_TOOL validate --deprecations $(basename $t) 2>$result - - cd $OLDPWD - @@ -381,7 +467,7 @@ index 0000000..42048ef + + cd $TEST_DATA_DIR + -+ $GTK_BUILDER_TOOL validate $(basename $t) 2>$result ++ $GTK_BUILDER_TOOL validate --deprecations $(basename $t) 2>$result + + cd $OLDPWD + diff --git a/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch b/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch index 78b6e7c70f..5733178723 100644 --- a/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch +++ b/debian/patches/debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch @@ -10,25 +10,44 @@ Signed-off-by: Simon McVittie Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3195 Applied-upstream: no, upstream want reftests to be a strict pass/fail with identical results required --- - testsuite/gsk/compare-render.c | 9 ++++++++- + testsuite/gsk/compare-render.c | 28 +++++++++++++++++++++++----- testsuite/reftests/gtk-reftest.c | 9 ++++++++- testsuite/reftests/reftest-compare.c | 28 +++++++++++++++++++++++++--- testsuite/reftests/reftest-compare.h | 5 ++++- - 4 files changed, 45 insertions(+), 6 deletions(-) + 4 files changed, 60 insertions(+), 10 deletions(-) diff --git a/testsuite/gsk/compare-render.c b/testsuite/gsk/compare-render.c -index 919957e..7145363 100644 +index 7ba25ad..e26b16c 100644 --- a/testsuite/gsk/compare-render.c +++ b/testsuite/gsk/compare-render.c -@@ -227,12 +227,19 @@ main (int argc, char **argv) - else +@@ -229,6 +229,9 @@ main (int argc, char **argv) + GError *error = NULL; + GOptionContext *context; + GdkTexture *diff_texture; ++ guint max_diff = 0; ++ guint pixels_changed = 0; ++ guint pixels = 0; + + (g_test_init) (&argc, &argv, NULL); + +@@ -283,9 +286,12 @@ main (int argc, char **argv) + } + + /* Now compare the two */ +- diff_texture = reftest_compare_textures (rendered_texture, reference_texture); ++ diff_texture = reftest_compare_textures (rendered_texture, reference_texture, ++ &max_diff, &pixels_changed, &pixels); + if (diff_texture) { - GdkTexture *diff_texture; -+ guint max_diff = 0; -+ guint pixels_changed = 0; -+ guint pixels = 0; ++ g_print ("%u (out of %u) pixels differ from reference by up to %u levels\n", ++ pixels_changed, pixels, max_diff); + save_image (diff_texture, node_file, ".diff.png"); + g_object_unref (diff_texture); + success = FALSE; +@@ -317,10 +323,13 @@ main (int argc, char **argv) + + save_image (reference_texture, node_file, "-flipped.ref.png"); - /* Now compare the two */ - diff_texture = reftest_compare_textures (rendered_texture, reference_texture); + diff_texture = reftest_compare_textures (rendered_texture, reference_texture, + &max_diff, &pixels_changed, &pixels); @@ -37,12 +56,56 @@ index 919957e..7145363 100644 { + g_print ("%u (out of %u) pixels differ from reference by up to %u levels\n", + pixels_changed, pixels, max_diff); -+ - save_image (diff_texture, node_file, ".diff.png"); + save_image (diff_texture, node_file, "-flipped.diff.png"); + g_object_unref (diff_texture); + success = FALSE; +@@ -390,10 +399,13 @@ main (int argc, char **argv) + + save_image (reference_texture, node_file, "-repeated.ref.png"); + +- diff_texture = reftest_compare_textures (rendered_texture, reference_texture); ++ diff_texture = reftest_compare_textures (rendered_texture, reference_texture, ++ &max_diff, &pixels_changed, &pixels); + + if (diff_texture) + { ++ g_print ("%u (out of %u) pixels differ from reference by up to %u levels\n", ++ pixels_changed, pixels, max_diff); + save_image (diff_texture, node_file, "-repeated.diff.png"); + g_object_unref (diff_texture); + success = FALSE; +@@ -427,10 +439,13 @@ main (int argc, char **argv) + + save_image (reference_texture, node_file, "-rotated.ref.png"); + +- diff_texture = reftest_compare_textures (rendered_texture, reference_texture); ++ diff_texture = reftest_compare_textures (rendered_texture, reference_texture, ++ &max_diff, &pixels_changed, &pixels); + + if (diff_texture) + { ++ g_print ("%u (out of %u) pixels differ from reference by up to %u levels\n", ++ pixels_changed, pixels, max_diff); + save_image (diff_texture, node_file, "-rotated.diff.png"); + g_object_unref (diff_texture); + success = FALSE; +@@ -473,10 +488,13 @@ main (int argc, char **argv) + + save_image (reference_texture, node_file, "-masked.ref.png"); + +- diff_texture = reftest_compare_textures (rendered_texture, reference_texture); ++ diff_texture = reftest_compare_textures (rendered_texture, reference_texture, ++ &max_diff, &pixels_changed, &pixels); + + if (diff_texture) + { ++ g_print ("%u (out of %u) pixels differ from reference by up to %u levels\n", ++ pixels_changed, pixels, max_diff); + save_image (diff_texture, node_file, "-masked.diff.png"); g_object_unref (diff_texture); success = FALSE; diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index d61d833..fba6aa3 100644 +index 2ba47a4..046751d 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -341,6 +341,9 @@ test_ui_file (GFile *file) diff --git a/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch b/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch index 4202e5bc1f..87b9eb53fd 100644 --- a/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch +++ b/debian/patches/debian/reftests-Allow-minor-differences-to-be-tolerated.patch @@ -28,10 +28,10 @@ Applied-upstream: no, upstream want reftests to be a strict pass/fail with ident 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/testsuite/gsk/compare-render.c b/testsuite/gsk/compare-render.c -index 7145363..2d5fdf9 100644 +index 05a13bf..19c0024 100644 --- a/testsuite/gsk/compare-render.c +++ b/testsuite/gsk/compare-render.c -@@ -98,6 +98,12 @@ get_output_file (const char *file, +@@ -102,6 +102,12 @@ get_output_file (const char *file, return result; } @@ -44,45 +44,44 @@ index 7145363..2d5fdf9 100644 static void save_image (GdkTexture *texture, const char *test_name, -@@ -237,12 +243,35 @@ main (int argc, char **argv) - - if (diff_texture) - { -+ char *keyfile_path = get_test_keyfile (node_file); -+ GKeyFile *keyfile = g_key_file_new (); -+ guint64 tolerated_diff = 0; -+ guint64 tolerated_pixels = 0; +@@ -290,11 +296,34 @@ main (int argc, char **argv) + &max_diff, &pixels_changed, &pixels); + if (diff_texture) + { ++ char *keyfile_path = get_test_keyfile (node_file); ++ GKeyFile *keyfile = g_key_file_new (); ++ guint64 tolerated_diff = 0; ++ guint64 tolerated_pixels = 0; + -+ if (keyfile_path != NULL && g_file_test (keyfile_path, G_FILE_TEST_EXISTS)) -+ { -+ GError *error = NULL; -+ g_key_file_load_from_file (keyfile, keyfile_path, G_KEY_FILE_NONE, &error); -+ g_assert_no_error (error); -+ tolerated_diff = g_key_file_get_uint64 (keyfile, "reftest", "tolerated-diff-level", NULL); -+ g_print ("Maximum difference tolerated: %" G_GUINT64_FORMAT " levels\n", tolerated_diff); -+ tolerated_pixels = g_key_file_get_uint64 (keyfile, "reftest", "tolerated-diff-pixels", NULL); -+ g_print ("Different pixels tolerated: %" G_GUINT64_FORMAT "\n", tolerated_pixels); -+ } ++ if (keyfile_path != NULL && g_file_test (keyfile_path, G_FILE_TEST_EXISTS)) ++ { ++ GError *error = NULL; ++ g_key_file_load_from_file (keyfile, keyfile_path, G_KEY_FILE_NONE, &error); ++ g_assert_no_error (error); ++ tolerated_diff = g_key_file_get_uint64 (keyfile, "reftest", "tolerated-diff-level", NULL); ++ g_print ("Maximum difference tolerated: %" G_GUINT64_FORMAT " levels\n", tolerated_diff); ++ tolerated_pixels = g_key_file_get_uint64 (keyfile, "reftest", "tolerated-diff-pixels", NULL); ++ g_print ("Different pixels tolerated: %" G_GUINT64_FORMAT "\n", tolerated_pixels); ++ } + - g_print ("%u (out of %u) pixels differ from reference by up to %u levels\n", - pixels_changed, pixels, max_diff); - - save_image (diff_texture, node_file, ".diff.png"); - g_object_unref (diff_texture); -- success = FALSE; + g_print ("%u (out of %u) pixels differ from reference by up to %u levels\n", + pixels_changed, pixels, max_diff); + save_image (diff_texture, node_file, ".diff.png"); + g_object_unref (diff_texture); +- success = FALSE; + -+ if (max_diff <= tolerated_diff && pixels_changed <= tolerated_pixels) -+ g_print ("not right, but close enough?\n"); -+ else -+ success = FALSE; ++ if (max_diff <= tolerated_diff && pixels_changed <= tolerated_pixels) ++ g_print ("not right, but close enough?\n"); ++ else ++ success = FALSE; + -+ g_key_file_unref (keyfile); -+ g_free (keyfile_path); - } ++ g_key_file_unref (keyfile); ++ g_free (keyfile_path); } + g_clear_object (&reference_texture); diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index fba6aa3..a2c046c 100644 +index 046751d..5945aa8 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -302,6 +302,12 @@ save_image (GdkTexture *texture, diff --git a/debian/patches/debian/subprojects-Add-gst-player-1.0-as-subporject.patch b/debian/patches/debian/subprojects-Add-gst-player-1.0-as-subporject.patch index 867b67eaa4..d6f1698d47 100644 --- a/debian/patches/debian/subprojects-Add-gst-player-1.0-as-subporject.patch +++ b/debian/patches/debian/subprojects-Add-gst-player-1.0-as-subporject.patch @@ -1,6 +1,6 @@ From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= Date: Fri, 17 Mar 2023 19:50:10 +0100 -Subject: subprojects: Add gst-player-1.0 as subporject +Subject: subprojects: Add gst-player-1.0 as subproject Origin: https://gitlab.gnome.org/3v1n0/gtk/-/commits/gst-player-subproject Forwarded: not-needed