[rpms/glib2] cve-2026-58016-f44: Drop gtk-doc patch as we finally have a new enough gtk-doc

[rpms/glib2] cve-2026-58016-f44: Drop gtk-doc patch as we finally have a new enough gtk-doc

[Kalev Lember]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : 9b1f9aa2f2c888d5acfbc2c3729fe8a0a54bfb1f
Author : Kalev Lember <klember@redhat.com>
Date   : 2020-10-19T19:12:40+02:00
Stats  : +1/-32 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/9b1f9aa2f2c888d5acfbc2c3729fe8a0a54bfb1f?branch=cve-2026-58016-f44

Log:
Drop gtk-doc patch as we finally have a new enough gtk-doc

---
diff --git a/glib2.spec b/glib2.spec
index 535e157..e125fc0 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -7,9 +7,6 @@ License: LGPLv2+
 URL: http://www.gtk.org
 Source0: http://download.gnome.org/sources/glib/2.66/glib-%{version}.tar.xz
 
-# Avoid requiring a too new gtk-doc version for building glib
-Patch0: gtk-doc-1-32.patch
-
 BuildRequires: chrpath
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -219,6 +216,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %changelog
 * Mon Oct 19 2020 Kalev Lember <klember@redhat.com> - 2.66.2-1
 - Update to 2.66.2
+- Drop gtk-doc patch as we finally have a new enough gtk-doc
 
 * Wed Oct 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.66.1-3
 - Fix yet another timezone bug

diff --git a/gtk-doc-1-32.patch b/gtk-doc-1-32.patch
deleted file mode 100644
index 7f10371..0000000
--- a/gtk-doc-1-32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1b51f84c873f493301f889a14943f530bd821d70 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Mon, 22 Jun 2020 11:55:14 +0200
-Subject: [PATCH] Revert "docs: Bump gtk-doc requirement for unit tests to
- 1.32.1"
-
-We don't have new enough gtk-doc in rawhide yet.
-
-This reverts commit 60dd272b6a21a3cadecc0d2dc448e012de946a99.
----
- docs/reference/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/reference/meson.build b/docs/reference/meson.build
-index a676af12d..7c3e589ab 100644
---- a/docs/reference/meson.build
-+++ b/docs/reference/meson.build
-@@ -52,7 +52,7 @@ if get_option('gtk_doc')
-   endif
-   # Check we have the minimum gtk-doc version required. Older versions won't
-   # generate correct documentation.
--  dependency('gtk-doc', version : '>=1.32.1',
-+  dependency('gtk-doc', version : '>=1.32',
-     fallback : ['gtk-doc', 'dummy_dep'],
-     default_options : ['tests=false'])
- endif
--- 
-2.26.2
-