[gtk/gtk-3-24: 90/90] Merge branch 'gtk-3-24-meson' into 'gtk-3-24'



commit bcb9babc5fae1fe56cffd63dd24452581f4c77d4
Merge: c19ae9635e e96c6c40f8
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Apr 11 16:34:47 2019 +0000

    Merge branch 'gtk-3-24-meson' into 'gtk-3-24'
    
    GTK 3 meson port
    
    See merge request GNOME/gtk!716

 .gitlab-ci.yml                                     |   36 +-
 .gitlab-ci/Dockerfile                              |   14 +-
 .gitlab-ci/run-docker.sh                           |    2 +-
 .gitlab-ci/test-docker-autotools.sh                |   16 +
 .gitlab-ci/test-docker-meson.sh                    |   29 +
 .gitlab-ci/test-docker.sh                          |   10 -
 .../{test-msys2.sh => test-msys2-autotools.sh}     |    1 -
 .gitlab-ci/test-msys2-meson.sh                     |   49 +
 Makefile.am                                        |    8 +-
 README.win32                                       |   90 ++
 build-aux/meson/post-install.py                    |   45 +
 config.h.meson                                     |  298 ++++++
 configure.ac                                       |    1 +
 demos/Makefile.am                                  |    3 +
 demos/gtk-demo/Makefile.am                         |    4 +-
 demos/gtk-demo/geninclude.py                       |  108 ++
 demos/gtk-demo/meson.build                         |  143 +++
 demos/icon-browser/Makefile.am                     |    3 +-
 demos/icon-browser/meson.build                     |   24 +
 demos/meson.build                                  |    3 +
 demos/widget-factory/Makefile.am                   |    3 +-
 demos/widget-factory/meson.build                   |   29 +
 docs/reference/Makefile.am                         |    3 +
 docs/reference/gdk/Makefile.am                     |    4 +-
 docs/reference/gdk/meson.build                     |  180 ++++
 docs/reference/gtk/Makefile.am                     |   10 +-
 ...{getting_started.xml => getting_started.xml.in} |   42 +-
 docs/reference/gtk/meson.build                     |  535 ++++++++++
 docs/reference/libgail-util/Makefile.am            |    4 +-
 docs/reference/libgail-util/meson.build            |   21 +
 docs/reference/meson.build                         |   22 +
 docs/tools/Makefile.am                             |    3 +
 docs/tools/meson.build                             |   12 +
 examples/Makefile.am                               |    4 +-
 examples/application1/Makefile.am                  |    3 +
 examples/application1/meson.build                  |   11 +
 examples/application10/Makefile.am                 |    3 +-
 examples/application10/meson.build                 |   23 +
 examples/application2/Makefile.am                  |    3 +-
 examples/application2/meson.build                  |   17 +
 examples/application3/Makefile.am                  |    3 +-
 examples/application3/meson.build                  |   17 +
 examples/application4/Makefile.am                  |    3 +-
 examples/application4/meson.build                  |   17 +
 examples/application5/Makefile.am                  |    3 +-
 examples/application5/meson.build                  |   21 +
 examples/application6/Makefile.am                  |    3 +-
 examples/application6/meson.build                  |   23 +
 examples/application7/Makefile.am                  |    3 +-
 examples/application7/meson.build                  |   23 +
 examples/application8/Makefile.am                  |    3 +-
 examples/application8/meson.build                  |   23 +
 examples/application9/Makefile.am                  |    3 +-
 examples/application9/meson.build                  |   23 +
 examples/bp/Makefile.am                            |    4 +-
 examples/bp/bloatpad.c                             |    2 +-
 examples/bp/meson.build                            |   13 +
 examples/meson.build                               |   60 ++
 gdk/Makefile.am                                    |    5 +-
 gdk/broadway/Makefile.am                           |    4 +
 gdk/broadway/gen-c-array.py                        |   22 +
 gdk/broadway/meson.build                           |   78 ++
 gdk/gdkconfig.h.meson                              |   20 +
 gdk/gdkenumtypes.h.template                        |    2 +-
 gdk/gen-gdk-gresources-xml.py                      |   33 +
 gdk/meson.build                                    |  376 +++++++
 gdk/quartz/Makefile.am                             |    2 +
 gdk/quartz/meson.build                             |   57 +
 gdk/wayland/Makefile.am                            |    3 +-
 gdk/wayland/meson.build                            |  105 ++
 gdk/win32/Makefile.am                              |    3 +-
 gdk/win32/meson.build                              |   57 +
 gdk/win32/rc/gdk.rc.in                             |    2 +-
 gdk/x11/Makefile.am                                |    3 +-
 gdk/x11/meson.build                                |   80 ++
 gtk/Makefile.am                                    |   18 +-
 gtk/a11y/meson.build                               |  114 ++
 gtk/deprecated/meson.build                         |   87 ++
 gtk/gen-gtk-gresources-xml.py                      |   89 ++
 gtk/gen-rc.py                                      |   21 +
 gtk/gentypefuncs.py                                |   55 +
 gtk/gtk-launch.c                                   |    6 +-
 gtk/gtk-win32.rc.body.in                           |    2 +-
 gtk/gtkdnd-quartz.c                                |    2 +-
 gtk/gtkpixelcache.c                                |    2 +-
 gtk/gtktestutils.c                                 |    2 +-
 gtk/gtktypebuiltins.h.template                     |    2 +-
 gtk/inspector/meson.build                          |   31 +
 gtk/meson.build                                    | 1090 ++++++++++++++++++++
 gtk/theme/Adwaita/meson.build                      |   30 +
 gtk/theme/HighContrast/meson.build                 |   29 +
 libgail-util/Makefile.am                           |    5 +-
 libgail-util/meson.build                           |   30 +
 meson.build                                        |  974 +++++++++++++++++
 meson_options.txt                                  |   43 +
 modules/Makefile.am                                |    3 +
 modules/input/Makefile.am                          |    6 +-
 modules/input/meson.build                          |   20 +
 modules/meson.build                                |    2 +
 modules/printbackends/Makefile.am                  |    3 +
 modules/printbackends/meson.build                  |  177 ++++
 po-properties/meson.build                          |    3 +
 po/meson.build                                     |    3 +
 subprojects/atk.wrap                               |    5 +
 subprojects/cairo.wrap                             |    5 +
 subprojects/expat.wrap                             |   10 +
 subprojects/fontconfig.wrap                        |    5 +
 subprojects/freetype2.wrap                         |    5 +
 subprojects/fribidi.wrap                           |    5 +
 subprojects/gdk-pixbuf.wrap                        |    5 +
 subprojects/glib.wrap                              |    5 +
 subprojects/harfbuzz.wrap                          |    5 +
 subprojects/libcroco.wrap                          |    5 +
 subprojects/libepoxy.wrap                          |    5 +
 subprojects/libffi.wrap                            |    5 +
 subprojects/libpng.wrap                            |   10 +
 subprojects/librsvg.wrap                           |    5 +
 subprojects/libxml2.wrap                           |    9 +
 subprojects/pango.wrap                             |    5 +
 subprojects/pixman.wrap                            |    5 +
 subprojects/proxy-libintl.wrap                     |    4 +
 subprojects/zlib.wrap                              |   10 +
 tests/Makefile.am                                  |    3 +-
 tests/animated-resizing.c                          |    2 +-
 tests/meson.build                                  |  156 +++
 tests/testanimation.c                              |    5 +-
 tests/testbaseline.c                               |    6 +-
 tests/testspinbutton.c                             |    3 +-
 tests/video-timer.c                                |    5 +-
 tests/visuals/Makefile.am                          |    3 +-
 tests/visuals/meson.build                          |    6 +
 testsuite/Makefile.am                              |    3 +
 testsuite/a11y/accessibility-dump.c                |    4 +
 testsuite/css/Makefile.am                          |    4 +-
 testsuite/css/meson.build                          |    6 +
 testsuite/css/nodes/Makefile.am                    |    2 +-
 testsuite/css/nodes/meson.build                    |    3 +
 testsuite/css/nodes/test-css-nodes.c               |    4 +
 testsuite/css/parser/Makefile.am                   |    6 +-
 testsuite/css/parser/meson.build                   |    3 +
 testsuite/css/parser/test-css-parser.c             |    4 +
 testsuite/css/style/Makefile.am                    |    1 +
 testsuite/css/style/meson.build                    |   14 +
 testsuite/css/style/test-css-style.c               |    4 +
 testsuite/gdk/Makefile.am                          |    3 +
 testsuite/gdk/meson.build                          |   26 +
 testsuite/gtk/Makefile.am                          |    1 +
 testsuite/gtk/builder.c                            |   38 +-
 testsuite/gtk/defaultvalue.c                       |    3 +-
 testsuite/gtk/meson.build                          |  110 ++
 testsuite/gtk/notify.c                             |    3 +-
 testsuite/gtk/object.c                             |    3 +-
 testsuite/gtk/objects-finalize.c                   |    3 +-
 testsuite/gtk/stylecontext.c                       |    3 +-
 testsuite/gtk/templates.c                          |    3 +-
 testsuite/meson.build                              |    3 +
 testsuite/reftests/gtk-reftest.c                   |    4 +
 157 files changed, 6212 insertions(+), 118 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]