[packages/gtk-doc] - updated to 1.36.0, now builds with meson

qboosh qboosh at pld-linux.org
Tue Mar 24 20:13:59 CET 2026 

commit 0d63bebd238b9dc453cdf8a91d02d94f1074e8ad
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Mar 24 20:14:11 2026 +0100

    - updated to 1.36.0, now builds with meson

 gtk-doc-cmake.patch  | 10 --------
 gtk-doc-noarch.patch | 67 +++++++++++++---------------------------------------
 gtk-doc.spec         | 48 +++++++++++++++----------------------
 3 files changed, 35 insertions(+), 90 deletions(-)
---
diff --git a/gtk-doc.spec b/gtk-doc.spec
index 9e0c5b8..02a5079 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -8,29 +8,29 @@ Summary(es.UTF-8):	El generador de documentación del GTK
 Summary(pl.UTF-8):	Narzędzie do generowania dokumentacji API do GTK+ i GNOME
 Summary(pt_BR.UTF-8):	O gerador de documentação do GTK
 Name:		gtk-doc
-Version:	1.35.1
+Version:	1.36.0
 Release:	1
 License:	GPL v2+
 Group:		Development/Tools
-Source0:	https://download.gnome.org/sources/gtk-doc/1.35/%{name}-%{version}.tar.xz
-# Source0-md5:	16817ad9e0bef63358b29b63f7738bbd
+Source0:	https://download.gnome.org/sources/gtk-doc/1.36/%{name}-%{version}.tar.xz
+# Source0-md5:	69c1105d8c968cb5303a40bc88685eac
 Patch0:		%{name}-noarch.patch
-Patch1:		%{name}-cmake.patch
 Patch2:		%{name}-struct-end.patch
 URL:		https://wiki.gnome.org/DocumentationProject/GtkDoc
-BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd43-xml
 BuildRequires:	docbook-style-xsl-nons >= 1.74.0
-%{?with_tests:BuildRequires:	glib2-devel >= 1:2.6.0}
-%{?with_tests:BuildRequires:	libtool >= 2:2.2}
+%{?with_tests:BuildRequires:	glib2-devel >= 1:2.68}
 BuildRequires:	libxml2 >= 1:2.3.6
 BuildRequires:	libxslt-progs >= 1.1.15
+BuildRequires:	meson >= 0.64
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	python3 >= 1:3.2
+BuildRequires:	python3-pygments
+%{?with_tests:BuildRequires:	python3-parameterized}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	rpmbuild(macros) >= 2.042
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 %{?with_gnome:BuildRequires:	yelp-tools}
@@ -42,7 +42,7 @@ Requires:	libxslt-progs >= 1.1.15
 Requires:	python3-pygments
 # +for mkhtml2: python3-anytree python3-lxml
 Conflicts:	pkgconfig < 1:0.19
-%{!?with_tests:BuildArch:	noarch}
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,7 +61,6 @@ Requires:	automake
 Requires:	pkgconfig
 Conflicts:	glib2-devel < 1:2.10.0
 Conflicts:	gtk-doc < 0:1.4-3
-BuildArch:	noarch
 
 %description automake
 Automake macros for gtk-doc.
@@ -72,8 +71,7 @@ Makra automake'a do gtk-doc.
 %package common
 Summary:	Common directories for documetation generated using gtk-doc
 Summary(pl.UTF-8):	Katalogi na dokumentację wygenerowaną za pomocą gtk-doc
-Group:		Development
-BuildArch:	noarch
+Group:		Documentation
 
 %description common
 Common directories for API documentation for various packages,
@@ -85,32 +83,24 @@ pomocą gtk-doc.
 
 %prep
 %setup -q
-%{!?with_tests:%patch -P0 -p1}
-%patch -P1 -p1
+%patch -P0 -p1
 %patch -P2 -p1
 
 %{__mv} doc/README doc/README.docs
 
 %build
-install -d build-aux
-%{?with_tests:%{__libtoolize}}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__automake}
-%configure \
-	PKG_CONFIG=/usr/bin/pkg-config \
-	PYTHON=%{__python3} \
-	--disable-silent-rules
-
-%{__make}
+%meson \
+	%{!?with_tests:-Dtests=false} \
+	%{!?with_gnome:-Dyelp_manual=false}
+
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_gtkdocdir} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 
 cp -p examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -123,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files %{?with_gnome:-f gtk-doc-manual.lang}
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README doc/*
+%doc NEWS README.md doc/*
 %attr(755,root,root) %{_bindir}/gtkdoc-*
 %attr(755,root,root) %{_bindir}/gtkdocize
 %{_datadir}/cmake/GtkDoc
diff --git a/gtk-doc-cmake.patch b/gtk-doc-cmake.patch
deleted file mode 100644
index c83b149..0000000
--- a/gtk-doc-cmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk-doc-1.33.2/buildsystems/cmake/GtkDocScanGObjWrapper.cmake.orig	2021-01-19 18:08:26.489552300 +0100
-+++ gtk-doc-1.33.2/buildsystems/cmake/GtkDocScanGObjWrapper.cmake	2021-04-17 18:03:56.254096313 +0200
-@@ -21,6 +21,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)
-+include(CMakeGenericSystem)
- 
- if(NOT APPLE)
-     # We use pkg-config to find glib et al
diff --git a/gtk-doc-noarch.patch b/gtk-doc-noarch.patch
index e6f8f11..2b3344e 100644
--- a/gtk-doc-noarch.patch
+++ b/gtk-doc-noarch.patch
@@ -1,53 +1,18 @@
---- gtk-doc-1.29/Makefile.am.orig	2018-10-18 15:21:45.100689104 +0200
-+++ gtk-doc-1.29/Makefile.am	2018-10-18 15:22:18.694022055 +0200
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
+--- gtk-doc-1.36.0/buildsystems/cmake/meson.build	2026-03-10 11:57:12.000000000 +0100
++++ gtk-doc-1.36.0/buildsystems/cmake/meson.build.orig	2026-03-24 19:44:24.633798087 +0100
+@@ -6,7 +6,7 @@ configure_file(
+   output: 'GtkDocConfigVersion.cmake',
+   configuration: cmake_in,
+   install: true,
+-  install_dir: get_option('libdir') / 'cmake' / 'GtkDoc',
++  install_dir: get_option('datadir') / 'cmake' / 'GtkDoc',
+ )
  
--SUBDIRS = buildsystems/autotools buildsystems/cmake help tests
-+SUBDIRS = buildsystems/autotools buildsystems/cmake help
+ gtkdoc_cmake_data = [
+@@ -16,5 +16,5 @@ gtkdoc_cmake_data = [
  
- bin_SCRIPTS = \
- 	gtkdoc-check    \
---- gtk-doc-1.33.2/configure.ac.orig	2021-01-19 18:08:26.490552200 +0100
-+++ gtk-doc-1.33.2/configure.ac	2021-02-25 22:07:43.105807410 +0100
-@@ -22,10 +22,6 @@
- # Check for programs
- AC_PROG_CC
- 
--# Initialize libtool
--LT_PREREQ([2.2])
--LT_INIT
--
- dnl Make sure we have pkg-config >= 0.19, so installing in $(datadir) is OK.
- PKG_PROG_PKG_CONFIG([0.19])
- 
-@@ -163,28 +159,6 @@
- gtkdoc/config_data.py
- help/Makefile
- help/manual/Makefile
--tests/Makefile
--tests/annotations/Makefile
--tests/annotations/src/Makefile
--tests/annotations/docs/Makefile
--tests/bugs/Makefile
--tests/bugs/src/Makefile
--tests/bugs/docs/Makefile
--tests/empty/Makefile
--tests/empty/src/Makefile
--tests/empty/docs/Makefile
--tests/fail/Makefile
--tests/fail/src/Makefile
--tests/fail/docs/Makefile
--tests/gobject/Makefile
--tests/gobject/src/Makefile
--tests/gobject/docs/Makefile
--tests/program/Makefile
--tests/program/src/Makefile
--tests/program/docs/Makefile
--tests/repro/Makefile
--tests/repro/src/Makefile
--tests/repro/docs/Makefile
- ])
- 
- dnl run chmod on these after parsing them.
+ install_data(
+   gtkdoc_cmake_data,
+-  install_dir: get_option('libdir') / 'cmake' / 'GtkDoc',
++  install_dir: get_option('datadir') / 'cmake' / 'GtkDoc',
+ )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-doc.git/commitdiff/0d63bebd238b9dc453cdf8a91d02d94f1074e8ad

More information about the pld-cvs-commit mailing list