Merge branch 'matthiasc/for-main' into 'main'

gtk-demo: Add keywords to some demos

See merge request GNOME/gtk!6910

NEWS

@@ -1,6 +1,12 @@
 Overview of Changes in 4.13.8, xx-xx-xxxx
 =========================================
 
+Note: The new renderers and dmabuf support are using graphics drivers
+in different ways than the old gl renderer, and trigger new driver bugs,
+(see for example https://gitlab.gnome.org/GNOME/gtk/-/issues/6418 and
+https://gitlab.gnome.org/GNOME/gtk/-/issues/6388). Therefore, it is
+recommended to use the latest mesa release (24.0) with the new renderers.
+
 Overview of Changes in 4.13.7, 11-02-2024
 =========================================
 

demos/gtk-demo/listview_selections.c

@@ -1,4 +1,5 @@
 /* Lists/Selections
+ * #Keywords: suggestion, completion
  *
  * The GtkDropDown widget is a modern alternative to GtkComboBox.
  * It uses list models instead of tree models, and the content is

testsuite/gsk/meson.build

@@ -206,9 +206,10 @@ variants = {
 }
 
 compare_xfails = {
-  'ngl': { 
+  'ngl': {
            'repeat-scaling': ['clipped'], # 6429
            'radial-gradient-with-64-colorstops': ['clipped'],
+           'blur-child-bounds-oversize-nogl': ['clipped'], # 6450
          },
   'vulkan': {
               'big-checkerboard': ['clipped'], # 6444
@@ -456,7 +457,7 @@ tests = [
   [ 'normalize', [ 'normalize.c', '../reftests/reftest-compare.c' ] ],
   [ 'transform' ],
   [ 'shader' ],
-  [ 'path', [ 'path-utils.c' ] ],
+  [ 'path', [ 'path-utils.c' ], [ 'flaky'] ],
   [ 'path-special-cases' ],
   [ 'scaling' ],
 ]
@@ -466,13 +467,11 @@ test_cargs = []
 foreach t : tests
   test_name = t.get(0)
   test_srcs = ['@0@.c'.format(test_name)] + t.get(1, [])
-  test_extra_cargs = t.get(2, [])
-  test_extra_ldflags = t.get(3, [])
+  test_extra_suites = t.get(2, [])
 
   test_exe = executable(test_name, test_srcs,
     dependencies : libgtk_dep,
-    c_args : test_cargs + test_extra_cargs + common_cflags,
-    link_args : test_extra_ldflags,
+    c_args : test_cargs + common_cflags,
   )
 
   test(test_name, test_exe,
@@ -484,13 +483,13 @@ foreach t : tests
       'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
       'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir())
     ],
-    suite: 'gsk',
+    suite: [ 'gsk' ] + test_extra_suites,
   )
 endforeach
 
 internal_tests = [
   [ 'boundingbox'],
-  [ 'curve' ],
+  [ 'curve', [ ], [ 'flaky' ]],
   [ 'curve-special-cases' ],
   [ 'diff' ],
   [ 'half-float' ],
@@ -502,14 +501,12 @@ internal_tests = [
 foreach t : internal_tests
   test_name = t.get(0)
   test_srcs = ['@0@.c'.format(test_name)] + t.get(1, [])
-  test_extra_cargs = t.get(2, [])
-  test_extra_ldflags = t.get(3, [])
+  test_extra_suites = t.get(2, [])
 
   test_exe = executable(test_name,
     sources: test_srcs,
     dependencies : libgtk_static_dep,
-    c_args : test_cargs + test_extra_cargs + common_cflags + ['-DGTK_COMPILATION'],
-    link_args : test_extra_ldflags,
+    c_args : test_cargs + common_cflags + ['-DGTK_COMPILATION'],
   )
 
   test(test_name, test_exe,
@@ -521,7 +518,7 @@ foreach t : internal_tests
       'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
       'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir())
     ],
-    suite: 'gsk',
+    suite: [ 'gsk' ] + test_extra_suites,
   )
 endforeach