From 6e6595e61171ea75ae0238ddd1d6e9e047ff73ac Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 22 Jun 2020 11:57:17 +0200 Subject: [PATCH] Avoid requiring a too new gtk-doc version for building glib We don't have new enough gtk-doc in rawhide yet. --- glib2.spec | 3 +++ gtk-doc-1-32.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 gtk-doc-1-32.patch diff --git a/glib2.spec b/glib2.spec index ec44109..1f55435 100644 --- a/glib2.spec +++ b/glib2.spec @@ -7,6 +7,9 @@ License: LGPLv2+ URL: http://www.gtk.org Source0: http://download.gnome.org/sources/glib/2.65/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++ diff --git a/gtk-doc-1-32.patch b/gtk-doc-1-32.patch new file mode 100644 index 0000000..7f10371 --- /dev/null +++ b/gtk-doc-1-32.patch @@ -0,0 +1,29 @@ +From 1b51f84c873f493301f889a14943f530bd821d70 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +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 +