From 1fa4d01bc5b26050c81c8caa9dcf2130197b35e1 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Thu, 25 Apr 2024 13:08:33 +0200
Subject: [PATCH] gtk: Drop deprecated demos/gtk_doc build options

---
 .github/workflows/windows-msvc.yml | 2 +-
 Dockerfile                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
index 1744c511b043..19c4e039725b 100644
--- a/.github/workflows/windows-msvc.yml
+++ b/.github/workflows/windows-msvc.yml
@@ -75,7 +75,7 @@ jobs:
         working-directory: /gtk
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          meson setup builddir --prefix=C:/gnome -Dbackend_max_links=1 -Ddemos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled
+          meson setup builddir --prefix=C:/gnome -Dbackend_max_links=1 -Dbuild-demos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled
 
       - name: Build and install GTK
         working-directory: /gtk
diff --git a/Dockerfile b/Dockerfile
index c251bd2cd91b..3fe7d661883d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN dnf update --assumeyes && \
 
 RUN git clone https://gitlab.gnome.org/gnome/gtk.git --depth=1 && \
     (cd /gtk && \
-        meson setup builddir --prefix=/usr --buildtype release -Dgtk_doc=false -Dintrospection=enabled -Dbuild-examples=false -Dbuild-tests=false -Ddemos=false -Dmedia-gstreamer=disabled -Dlibepoxy:tests=false && \
+        meson setup builddir --prefix=/usr --buildtype release -Dintrospection=enabled -Dbuild-examples=false -Dbuild-tests=false -Dmedia-gstreamer=disabled -Dlibepoxy:tests=false && \
         meson install -C builddir) && \
     git clone https://gitlab.gnome.org/GNOME/libadwaita.git --depth=1 --branch libadwaita-1-5 && \
     (cd /libadwaita && \