[gtk: 12/12] Merge branch 'matthiasc/builder-requires' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 74a7f73239af76d06015d166fc51894059bfb24e
Merge: a047b7d6d1 d6a0948182
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 11 03:53:52 2020 +0000

    Merge branch 'matthiasc/builder-requires' into 'master'
    
    Matthiasc/builder requires
    
    See merge request GNOME/gtk!2806

 demos/gtk-demo/blendmodes.ui                       |  1 -
 demos/gtk-demo/filtermodel.ui                      |  1 -
 demos/gtk-demo/font-features.ui                    |  1 -
 docs/reference/gtk/migrating-3to4.md               |  3 +++
 examples/bp/gtk/help-overlay.ui                    |  1 -
 gtk/gtkbuilder.c                                   |  2 +-
 gtk/gtkbuilderparser.c                             | 11 +++++---
 gtk/tools/gtk-builder-tool-simplify.c              | 29 ++++++++++++++++++++++
 gtk/ui/gtkplacesview.ui                            |  1 -
 gtk/ui/gtkplacesviewrow.ui                         |  1 -
 tests/testheightforwidth.c                         | 14 +++++------
 testsuite/css/change/test1.ui                      |  1 -
 testsuite/css/change/test2.ui                      |  1 -
 testsuite/css/change/test3.ui                      |  1 -
 testsuite/css/change/test4.ui                      |  1 -
 testsuite/css/nodes/scale.ui                       |  1 -
 testsuite/css/style/adjacent-states.ui             |  1 -
 testsuite/css/style/colornames.ui                  |  1 -
 testsuite/css/style/currentcolor.ui                |  1 -
 testsuite/css/style/font.ui                        |  1 -
 testsuite/css/style/gradient.ui                    |  1 -
 testsuite/css/style/inherit.ui                     |  1 -
 testsuite/css/style/label.ui                       |  1 -
 testsuite/css/style/nth-child.ui                   |  2 --
 testsuite/gtk/builder.c                            |  5 ++--
 testsuite/reftests/animation-direction.ref.ui      |  1 -
 testsuite/reftests/animation-direction.ui          |  1 -
 .../animation-fill-mode-iteration-count.ref.ui     |  1 -
 .../animation-fill-mode-iteration-count.ui         |  1 -
 .../border-corner-zero-width-rendering.ref.ui      |  1 -
 .../reftests/border-corner-zero-width-rendering.ui |  1 -
 testsuite/reftests/box-order.ref.ui                |  1 -
 testsuite/reftests/box-order.ui                    |  1 -
 .../reftests/box-shadow-changes-modify-clip.ref.ui |  1 -
 .../reftests/box-shadow-changes-modify-clip.ui     |  1 -
 testsuite/reftests/box-shadow-spread.ref.ui        |  1 -
 testsuite/reftests/box-shadow-spread.ui            |  1 -
 .../reftests/box-shadow-with-blend-mode.ref.ui     |  1 -
 testsuite/reftests/box-shadow-with-blend-mode.ui   |  1 -
 testsuite/reftests/css-em-label-size.ref.ui        |  1 -
 testsuite/reftests/css-em-label-size.ui            |  1 -
 testsuite/reftests/css-rem-label-size.ref.ui       |  1 -
 testsuite/reftests/css-rem-label-size.ui           |  1 -
 testsuite/reftests/flipping-icons.ref.ui           |  1 -
 testsuite/reftests/flipping-icons.ui               |  1 -
 testsuite/reftests/gtk-icontheme-sizing.ref.ui     |  1 -
 testsuite/reftests/gtk-icontheme-sizing.ui         |  1 -
 testsuite/reftests/icon-effect-missing.ref.ui      |  1 -
 testsuite/reftests/icon-effect-missing.ui          |  1 -
 testsuite/reftests/icon-shadow-no-transform.ref.ui |  1 -
 testsuite/reftests/icon-shadow-no-transform.ui     |  1 -
 testsuite/reftests/icon-style-basics.ref.ui        |  1 -
 testsuite/reftests/icon-style-basics.ui            |  1 -
 testsuite/reftests/icon-vfuncs.ref.ui              |  1 -
 testsuite/reftests/icon-vfuncs.ui                  |  1 -
 .../reftests/image-icon-name-use-fallback.ref.ui   |  1 -
 testsuite/reftests/image-icon-name-use-fallback.ui |  1 -
 .../reftests/image-icon-shadow-clipping.ref.ui     |  1 -
 testsuite/reftests/image-icon-shadow-clipping.ui   |  1 -
 testsuite/reftests/label-background.ref.ui         |  1 -
 testsuite/reftests/label-background.ui             |  1 -
 testsuite/reftests/label-box-shadow-clip.ref.ui    |  1 -
 testsuite/reftests/label-box-shadow-clip.ui        |  1 -
 testsuite/reftests/label-clipping.ref.ui           |  1 -
 testsuite/reftests/label-clipping.ui               |  1 -
 .../label-text-shadow-changes-modify-clip.ref.ui   |  1 -
 .../label-text-shadow-changes-modify-clip.ui       |  1 -
 .../reftests/label-text-shadow-clipping.ref.ui     |  1 -
 testsuite/reftests/label-text-shadow-clipping.ui   |  1 -
 testsuite/reftests/letter-spacing.ref.ui           |  1 -
 testsuite/reftests/notebook-tab-position.ref.ui    |  1 -
 testsuite/reftests/notebook-tab-position.ui        |  1 -
 testsuite/reftests/opacity-initial.ref.ui          |  1 -
 testsuite/reftests/opacity-initial.ui              |  1 -
 testsuite/reftests/overlay-no-main-widget.ref.ui   |  1 -
 testsuite/reftests/overlay-no-main-widget.ui       |  1 -
 testsuite/reftests/pseudoclass-on-box.ref.ui       |  1 -
 testsuite/reftests/pseudoclass-on-box.ui           |  1 -
 testsuite/reftests/pseudoclass-on-parent.ref.ui    |  1 -
 testsuite/reftests/pseudoclass-on-parent.ui        |  1 -
 testsuite/reftests/set-default-direction.ref.ui    |  1 -
 testsuite/reftests/set-default-direction.ui        |  1 -
 testsuite/reftests/shadow-clip-rounding.ref.ui     |  1 -
 testsuite/reftests/shadow-clip-rounding.ui         |  1 -
 testsuite/reftests/sibling-pseudoclasses.ref.ui    |  1 -
 testsuite/reftests/sibling-pseudoclasses.ui        |  1 -
 testsuite/reftests/statusbar-remove-all.ref.ui     |  1 -
 testsuite/reftests/statusbar-remove-all.ui         |  1 -
 .../reftests/style-context-save-inheritance.ref.ui |  1 -
 .../reftests/style-context-save-inheritance.ui     |  1 -
 testsuite/reftests/textview-border-windows.ref.ui  |  1 -
 testsuite/reftests/textview-border-windows.ui      |  1 -
 testsuite/reftests/textview-margins.ref.ui         |  1 -
 testsuite/reftests/textview-margins.ui             |  1 -
 testsuite/reftests/treeview-crash-too-wide.ref.ui  |  1 -
 testsuite/reftests/treeview-crash-too-wide.ui      |  1 -
 .../reftests/window-show-contents-on-map.ref.ui    |  1 -
 testsuite/reftests/window-show-contents-on-map.ui  |  1 -
 .../tools/simplify-data-3to4/actionbar.expected    |  2 +-
 testsuite/tools/simplify-data-3to4/actionbar.ui    |  1 -
 .../tools/simplify-data-3to4/assistant.expected    |  1 +
 testsuite/tools/simplify-data-3to4/assistant.ui    |  1 -
 testsuite/tools/simplify-data-3to4/bin.expected    |  1 +
 testsuite/tools/simplify-data-3to4/box.expected    |  2 +-
 testsuite/tools/simplify-data-3to4/box.ui          |  2 --
 testsuite/tools/simplify-data-3to4/dialog.expected |  1 +
 testsuite/tools/simplify-data-3to4/fixed.expected  |  2 +-
 testsuite/tools/simplify-data-3to4/fixed.ui        |  2 --
 testsuite/tools/simplify-data-3to4/grid.expected   |  1 +
 testsuite/tools/simplify-data-3to4/grid.ui         |  1 -
 .../gtkfilechooserdialog.expected                  |  1 +
 .../simplify-data-3to4/gtkfilechooserdialog.ui     |  1 -
 .../tools/simplify-data-3to4/headerbar.expected    |  1 +
 testsuite/tools/simplify-data-3to4/headerbar.ui    |  1 -
 .../tools/simplify-data-3to4/nm-crash.expected     |  1 +
 .../tools/simplify-data-3to4/notebook.expected     |  1 +
 testsuite/tools/simplify-data-3to4/notebook.ui     |  1 -
 .../simplify-data-3to4/office-runner.expected      |  1 +
 .../tools/simplify-data-3to4/office-runner.ui      |  1 -
 .../tools/simplify-data-3to4/overlay.expected      |  2 +-
 testsuite/tools/simplify-data-3to4/paned.expected  |  2 +-
 .../tools/simplify-data-3to4/popover.expected      |  1 +
 testsuite/tools/simplify-data-3to4/scale.expected  |  1 +
 testsuite/tools/simplify-data-3to4/stack.expected  |  1 +
 testsuite/tools/simplify-data-3to4/stack.ui        |  1 -
 .../tools/simplify-data-3to4/toolbar.expected      |  2 +-
 testsuite/tools/validate-data/invalid5.expected    |  1 +
 testsuite/tools/validate-data/invalid5.ui          |  3 +++
 testsuite/tools/validate-data/valid3.expected      |  0
 testsuite/tools/validate-data/valid3.ui            |  5 ++++
 testsuite/tools/validate-data/valid4.expected      |  0
 testsuite/tools/validate-data/valid4.ui            |  5 ++++
 132 files changed, 81 insertions(+), 126 deletions(-)
---