From e6350dbd6f98b19058e7d8cdad6b4ef70d311d50 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 20 Mar 2025 17:55:33 +0800 Subject: [PATCH] Update CMake minimum version --- backport-Update-CMake-minimum-version.patch | 26 +++++++++++++++++++++ gtk-doc.spec | 6 ++++- gtk-doc.yaml | 8 +++---- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 backport-Update-CMake-minimum-version.patch diff --git a/backport-Update-CMake-minimum-version.patch b/backport-Update-CMake-minimum-version.patch new file mode 100644 index 0000000..b6e7aaa --- /dev/null +++ b/backport-Update-CMake-minimum-version.patch @@ -0,0 +1,26 @@ +From 813e79e0147b7fbdea82dfe8927f01634f866aa5 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Fri, 14 Mar 2025 00:58:14 -0400 +Subject: [PATCH] Update CMake minimum version from 3.2 to 3.12 + +Support CMake 4.0 (which drops support for CMake<3.5) +--- + buildsystems/cmake/GtkDocScanGObjWrapper.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildsystems/cmake/GtkDocScanGObjWrapper.cmake b/buildsystems/cmake/GtkDocScanGObjWrapper.cmake +index b187ebb2..47b8d643 100644 +--- a/buildsystems/cmake/GtkDocScanGObjWrapper.cmake ++++ b/buildsystems/cmake/GtkDocScanGObjWrapper.cmake +@@ -20,7 +20,7 @@ + + # This is needed for find_package(PkgConfig) to work correctly -- + # CMAKE_MINIMUM_REQUIRED_VERSION needs to be defined. +-cmake_minimum_required(VERSION 3.2) ++cmake_minimum_required(VERSION 3.12) + + if(NOT APPLE) + # We use pkg-config to find glib et al +-- +GitLab + diff --git a/gtk-doc.spec b/gtk-doc.spec index 46757e5..66ffab2 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -1,6 +1,6 @@ Name: gtk-doc Version: 1.34.0 -Release: 1 +Release: 2 Summary: Generate API documentation from comments that can be added to C code License: GPL-2.0-or-later AND GFDL-1.1-no-invariants-or-later URL: https://www.gtk.org/gtk-doc/ @@ -10,6 +10,7 @@ Patch1: fix-mkdb-not-found-file.patch Patch2: fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch Patch3: gtk-doc-1.34.0-simulate-meson-gnome.gtkdoc.patch Patch4: gtk-doc-install-cmake-config-files-into-datadir.patch +Patch5: backport-Update-CMake-minimum-version.patch BuildArch: noarch BuildRequires: docbook-utils libxslt gettext BuildRequires: itstool yelp-tools docbook-style-xsl gcc @@ -54,6 +55,9 @@ mv doc/README doc/README.1 %{_datadir}/help/*/%{name}-manual/ %changelog +* Thu Mar 20 2025 Funda Wang - 1.34.0-2 +- Update CMake module minimum version + * Tue Aug 13 2024 Funda Wang - 1.34.0-1 - update to 1.34.0 - install cmake files into datadir so that gtk-doc becomes noarch package diff --git a/gtk-doc.yaml b/gtk-doc.yaml index 36abe0e..77b0841 100644 --- a/gtk-doc.yaml +++ b/gtk-doc.yaml @@ -1,4 +1,4 @@ -version_control: gitlab.gnome -src_repo: gtk-doc -tag_prefix: GTK_DOC_ -seperator: _ +version_control: gitlab.gnome +src_repo: gtk-doc +tag_prefix: +separator: . -- Gitee