From 4c11cc45567a031cf6e98d311e82a6c2f5e0f0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Tue, 22 Dec 2020 14:14:37 +0400
Subject: [PATCH] Build gtk4-devel-docs again

---
 gtk4.spec | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/gtk4.spec b/gtk4.spec
index cdda821..3fc05b7 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -17,7 +17,7 @@
 
 Name:           gtk4
 Version:        4.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK graphical user interface library
 
 License:        LGPLv2+
@@ -28,6 +28,8 @@ Patch0:         %{name}-gcc11.patch
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl
+BuildRequires:  gtk-doc
+BuildRequires:  pandoc
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
@@ -112,7 +114,17 @@ Requires: gtk4%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains the libraries and header files that are needed
-for writing applications with version 4 of the GTK widget toolkit.
+for writing applications with version 4 of the GTK widget toolkit. If
+you plan to develop applications with GTK, consider installing the
+gtk4-devel-docs package.
+
+%package devel-docs
+Summary: Developer documentation for GTK
+Requires: gtk4 = %{version}-%{release}
+
+%description devel-docs
+This package contains developer documentation for version 4 of the GTK
+widget toolkit.
 
 %prep
 %autosetup -p1 -n gtk-%{version}
@@ -129,11 +141,13 @@ export CFLAGS='-fno-strict-aliasing %optflags'
         -Dmedia-gstreamer=enabled \
         -Dxinerama=enabled \
         -Dcolord=enabled \
-        -Dgtk_doc=false \
+        -Dgtk_doc=true \
         -Dman-pages=true \
         -Dinstall-tests=false
 
 %meson_build
+# Workaround for https://github.com/mesonbuild/meson/issues/8117
+%meson_build gtk4-doc:custom
 
 %install
 %meson_install
@@ -215,7 +229,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_mandir}/man1/gtk4-query-settings.1*
 %{_mandir}/man1/gtk4-widget-factory.1*
 
+%files devel-docs
+%{_datadir}/gtk-doc
+
 %changelog
+* Tue Dec 22 14:13:09 +04 2020 Marc-André Lureau <marcandre.lureau@redhat.com> - 4.0.0-2
+- Add back gtk4-devel-docs
+
 * Wed Dec 16 2020 Kalev Lember <klember@redhat.com> - 4.0.0-1
 - Update to 4.0.0
 - Tighten soname globs