diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f425ca327..166d77e47b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,13 +16,13 @@ stages: # Common variables variables: - COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dgtk:werror=true" + COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false" BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v23" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v25" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" - DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19" + DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25" .only-default: only: @@ -74,7 +74,6 @@ fedora-x86_64: script: - meson subprojects update - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} - -Dsysprof=enabled _build - ninja -C _build - .gitlab-ci/run-tests.sh _build x11 diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile index 2dec8c1a9c..7719fe5e56 100644 --- a/.gitlab-ci/fedora-base.Dockerfile +++ b/.gitlab-ci/fedora-base.Dockerfile @@ -87,5 +87,5 @@ RUN dnf -y install \ xorg-x11-server-Xvfb \ && dnf clean all -RUN pip3 install meson==0.53.1 +RUN pip3 install meson==0.55.3 diff --git a/.gitlab-ci/fedora-docs.Dockerfile b/.gitlab-ci/fedora-docs.Dockerfile index a99a15e6c2..d2e8c5ad40 100644 --- a/.gitlab-ci/fedora-docs.Dockerfile +++ b/.gitlab-ci/fedora-docs.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19 +FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25 RUN dnf -y install pandoc diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 0b86a6dbd5..a7a35b4299 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v23 +FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25 # Enable sudo for wheel users RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml index 2b7cdc0a8a..224b4736e2 100644 --- a/demos/gtk-demo/demo.gresource.xml +++ b/demos/gtk-demo/demo.gresource.xml @@ -138,6 +138,8 @@ gtkshaderstack.h gtkshaderbin.h gtkshaderbin.c + gskshaderpaintable.h + gskshaderpaintable.c ripple.glsl background.glsl transition1.glsl diff --git a/demos/gtk-demo/gltransition.c b/demos/gtk-demo/gltransition.c index 6b49a3cea5..7d51d32be4 100644 --- a/demos/gtk-demo/gltransition.c +++ b/demos/gtk-demo/gltransition.c @@ -259,13 +259,13 @@ make_shader_stack (const char *name, gtk_box_append (GTK_BOX (vbox), hbox); - button = gtk_button_new_from_icon_name ("go-previous"); + button = gtk_button_new_from_icon_name ("go-previous-symbolic"); g_signal_connect (button, "clicked", G_CALLBACK (go_back), stack); bin = ripple_bin_new (); gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button); gtk_box_append (GTK_BOX (hbox), bin); - button = gtk_button_new_from_icon_name ("go-next"); + button = gtk_button_new_from_icon_name ("go-next-symbolic"); g_signal_connect (button, "clicked", G_CALLBACK (go_forward), stack); bin = ripple_bin_new (); gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button); diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 76525011ba..4536addda4 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -1,15 +1,11 @@ if get_option('gtk_doc') - if not meson.version().version_compare('>=0.52.0') - error('Building the GTK documentation requires Meson 0.52.0') - endif - - glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') + glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr') glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') - cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix') + cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix', default_value: '/usr') cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo') - gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix') + gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr') gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf') docpath = join_paths(gtk_datadir, 'gtk-doc', 'html') diff --git a/gsk/broadway/gskbroadwayrenderer.c b/gsk/broadway/gskbroadwayrenderer.c index bb6de84846..e2b43146fe 100644 --- a/gsk/broadway/gskbroadwayrenderer.c +++ b/gsk/broadway/gskbroadwayrenderer.c @@ -261,7 +261,9 @@ collect_reused_child_nodes (GskRenderer *renderer, case GSK_GL_SHADER_NODE: case GSK_COLOR_MATRIX_NODE: case GSK_TEXT_NODE: + case GSK_RADIAL_GRADIENT_NODE: case GSK_REPEATING_LINEAR_GRADIENT_NODE: + case GSK_REPEATING_RADIAL_GRADIENT_NODE: case GSK_REPEAT_NODE: case GSK_BLEND_NODE: case GSK_CROSS_FADE_NODE: @@ -843,7 +845,9 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer, break; /* Fallback */ case GSK_TEXT_NODE: + case GSK_RADIAL_GRADIENT_NODE: case GSK_REPEATING_LINEAR_GRADIENT_NODE: + case GSK_REPEATING_RADIAL_GRADIENT_NODE: case GSK_REPEAT_NODE: case GSK_BLEND_NODE: case GSK_CROSS_FADE_NODE: diff --git a/meson.build b/meson.build index 6ad27d2158..ac940638fc 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project('gtk', 'c', # https://github.com/mesonbuild/meson/issues/2289 'c_std=gnu99', ], - meson_version : '>= 0.53', + meson_version : '>= 0.54', license: 'LGPLv2.1+') glib_major_req = 2 diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c index 982f1c0a6c..b88d76011c 100644 --- a/modules/printbackends/gtkprintbackendcups.c +++ b/modules/printbackends/gtkprintbackendcups.c @@ -647,9 +647,7 @@ add_cups_options (const char *key, custom_value = TRUE; break; -#if CUPS_VERSION_MAJOR == 2 && CUPS_VERSION_MINOR >= 3 case PPD_CUSTOM_UNKNOWN: -#endif default : custom_value = FALSE; }