diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/fedora-base.Dockerfile | 7 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 2 | ||||
| -rw-r--r-- | gtk/gtknativedialog.c | 7 | ||||
| -rw-r--r-- | meson.build | 2 |
5 files changed, 5 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c6d15c8a7..8476616092 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: 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:v27" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v28" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25" diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile index 613d492d34..04377f05e5 100644 --- a/.gitlab-ci/fedora-base.Dockerfile +++ b/.gitlab-ci/fedora-base.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:31 +FROM fedora:33 RUN dnf -y install \ adwaita-icon-theme \ @@ -66,7 +66,7 @@ RUN dnf -y install \ mesa-dri-drivers \ mesa-libEGL-devel \ mesa-libGLES-devel \ - mesa-libwayland-egl-devel \ + meson \ ninja-build \ pango-devel \ pcre-devel \ @@ -87,6 +87,3 @@ RUN dnf -y install \ which \ xorg-x11-server-Xvfb \ && dnf clean all - -RUN pip3 install meson==0.55.3 - diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index ddcc18f287..c64f0947b7 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v27 +FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28 # Enable sudo for wheel users RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers diff --git a/gtk/gtknativedialog.c b/gtk/gtknativedialog.c index 73ad13ea3a..71cceb4f8c 100644 --- a/gtk/gtknativedialog.c +++ b/gtk/gtknativedialog.c @@ -68,10 +68,6 @@ struct _GtkNativeDialogPrivate guint visible : 1; guint modal : 1; - - /* Run state */ - int run_response_id; - GMainLoop *run_loop; /* Non-NULL when in run */ }; enum { @@ -347,9 +343,6 @@ gtk_native_dialog_hide (GtkNativeDialog *self) klass->hide (self); - if (priv->run_loop && g_main_loop_is_running (priv->run_loop)) - g_main_loop_quit (priv->run_loop); - g_object_notify_by_pspec (G_OBJECT (self), native_props[PROP_VISIBLE]); } diff --git a/meson.build b/meson.build index 729aa3ea19..8677754121 100644 --- a/meson.build +++ b/meson.build @@ -198,7 +198,7 @@ check_functions = [ '_lock_file', 'flockfile', 'mkstemp', - 'mallinfo', + 'mallinfo2', 'sincos', 'sincosf', ] |