[packages/hotdoc] - updated to 0.18.2 (supports setuptools 81+, but requires networkx upgrade)

Tue May 26 21:22:04 CEST 2026

commit 5a4e4c5841f157cfc8e4d6711482c3d04484df32
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 26 21:22:10 2026 +0200

    - updated to 0.18.2 (supports setuptools 81+, but requires networkx upgrade)

 clang_libdir.patch          | 12 ++++++------
 hotdoc-callback-field.patch | 13 ------------
 hotdoc.spec                 | 48 ++++++++++++++++++++++++---------------------
 3 files changed, 32 insertions(+), 41 deletions(-)
---

diff --git a/hotdoc.spec b/hotdoc.spec
index 8514cc9..0c966b7 100644
--- a/hotdoc.spec
+++ b/hotdoc.spec
@@ -1,19 +1,18 @@
-# TODO: allow build without network (npm install)
 #
 # Condional build:
 %bcond_without	tests	# unit tests
-%bcond_with	npm	# bootstrap with npm
+%bcond_with	npm	# bootstrap with npm (requires network)
 
 Summary:	A documentation tool micro-framework
 Summary(pl.UTF-8):	Mikroszkielet narzędzia do tworzenia dokumentacji
 Name:		hotdoc
-Version:	0.16
-Release:	6
+Version:	0.18.2
+Release:	1
 License:	LGPL v2.1+
 Group:		Development/Tools
 #Source0Download: https://github.com/hotdoc/hotdoc/tags
 Source0:	https://github.com/hotdoc/hotdoc/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	a14a38e7950c8056c88f0e131429b38f
+# Source0-md5:	cee0bbe488e7a4117d595117b24a5a8c
 Source1:	https://github.com/MathieuDuponchelle/cmark/archive/b548e6f/cmark-b548e6f.tar.gz
 # Source1-md5:	e0e3f082400d34ddc5b748989b22dc5b
 Source2:	https://github.com/PrismJS/prism/archive/eccf09f/prism-eccf09f.tar.gz
@@ -21,11 +20,11 @@ Source2:	https://github.com/PrismJS/prism/archive/eccf09f/prism-eccf09f.tar.gz
 Source3:	https://github.com/hotdoc/hotdoc_bootstrap_theme/archive/ba24bed/hotdoc_bootstrap_theme-ba24bed.tar.gz
 # Source3-md5:	a9cb2c938ea1712c71e0ba7c4797b94e
 # compressed hotdoc/hotdoc_bootstrap_theme/dist after bootstrapping npm with network (node_modules not needed?)
-Source4:	hotdoc-%{version}-hotdoc_bootstrap_theme-dist.tar.xz
+# (there was no changes since hotdoc 0.16, so reuse the old tarball)
+Source4:	hotdoc-0.16-hotdoc_bootstrap_theme-dist.tar.xz
 # Source4-md5:	38a5d173bf901dc1697e65760883a03b
 Patch0:		%{name}-setup.patch
 Patch1:		clang_libdir.patch
-Patch2:		%{name}-callback-field.patch
 URL:		https://hotdoc.github.io/
 BuildRequires:	cmake >= 2.8.9
 BuildRequires:	flex
@@ -39,18 +38,20 @@ BuildRequires:	python3-modules >= 1:3.5
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-wheel
 # runtime dependencies, but required at build time to avoid fetching wheels from network
-BuildRequires:	python3-PyYAML >= 6
-BuildRequires:	python3-appdirs
-BuildRequires:	python3-dbus-deviation >= 0.4.0
+BuildRequires:	python3-PyYAML >= 6.0.2
+BuildRequires:	python3-appdirs >= 1.4.4
+BuildRequires:	python3-dbus-deviation >= 0.6.1
 BuildRequires:	python3-faust-cchardet
-BuildRequires:	python3-feedgen
-BuildRequires:	python3-lxml
-BuildRequires:	python3-networkx >= 2.5
-BuildRequires:	python3-pkgconfig
-BuildRequires:	python3-schema
-BuildRequires:	python3-toposort >= 1.4
-# fails on python3.13 with wheezy.template 3.1.0
-BuildRequires:	python3-wheezy.template >= 3.2
+BuildRequires:	python3-feedgen >= 1.0.0
+%if "%{_ver_lt %{py3_ver} 3.10}" == "1"
+BuildRequires:	python3-importlib_metadata
+%endif
+BuildRequires:	python3-lxml >= 5.4.0
+BuildRequires:	python3-networkx >= 3.4
+BuildRequires:	python3-pkgconfig >= 1.6.0
+BuildRequires:	python3-schema >= 0.7.7
+BuildRequires:	python3-toposort >= 1.10
+BuildRequires:	python3-wheezy.template >= 3.2.3
 Requires:	clang
 # libclang.so dlopen in c extension
 Requires:	clang-devel
@@ -70,9 +71,8 @@ itp.).
 
 %prep
 %setup -q -a1 -a2 -a3
-%patch -P 0 -p1
-%patch -P 1 -p1
-%patch -P 2 -p1
+%patch -P0 -p1
+%patch -P1 -p1
 
 %{__mv} cmark-*/* cmark
 %{__mv} prism-*/* hotdoc/extensions/syntax_highlighting/prism
@@ -85,7 +85,11 @@ itp.).
 %{__sed} -i -e '1s, /usr/bin/env sh,/bin/sh,' hotdoc/extensions/gi/transition_scripts/translate_sections.sh
 
 %build
-%py3_build %{?with_tests:test}
+%py3_build
+
+%if %{with tests}
+%{__python3} -m unittest discover -s hotdoc/tests
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/clang_libdir.patch b/clang_libdir.patch
index 4fa885c..223e485 100644
--- a/clang_libdir.patch
+++ b/clang_libdir.patch
@@ -1,11 +1,11 @@
---- hotdoc-0.16/hotdoc/extensions/c/c_extension.py.orig	2024-03-13 06:16:15.409235888 +0100
-+++ hotdoc-0.16/hotdoc/extensions/c/c_extension.py	2024-03-13 06:28:20.782664346 +0100
-@@ -96,11 +96,11 @@ def get_clang_headers():
-         ['llvm-config', '--version']).strip().decode()
+--- hotdoc-0.17.4/hotdoc/extensions/c/c_extension.py.orig	2025-01-30 12:05:06.000000000 +0100
++++ hotdoc-0.17.4/hotdoc/extensions/c/c_extension.py	2025-05-28 18:39:22.705637721 +0200
+@@ -100,11 +100,11 @@ def get_clang_headers():
+         [LLVM_CONFIG, '--version']).strip().decode()
      prefix = subprocess.check_output(
-         ['llvm-config', '--prefix']).strip().decode()
+         [LLVM_CONFIG, '--prefix']).strip().decode()
 +    libdir = subprocess.check_output(
-+        ['llvm-config', '--libdir']).strip().decode()
++        [LLVM_CONFIG, '--libdir']).strip().decode()
      versions = (version, version.split('.').pop(0))
 -    for (ver, lib) in itertools.product(
 -            versions,
diff --git a/hotdoc-callback-field.patch b/hotdoc-callback-field.patch
deleted file mode 100644
index 3cdcd6f..0000000
--- a/hotdoc-callback-field.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Tag <callback> might appear also as further (not just the first) node within <field>
-(causing hotdoc to crash after not finding <type> in such <field> node)
---- hotdoc-0.16/hotdoc/extensions/gi/gi_extension.py.orig	2023-11-09 15:08:48.000000000 +0100
-+++ hotdoc-0.16/hotdoc/extensions/gi/gi_extension.py	2024-03-14 19:43:28.904438367 +0100
-@@ -350,7 +350,7 @@ class GIExtension(Extension):
-             if field.attrib.get('private', False):
-                 continue
- 
--            if children[0].tag == core_ns('callback'):
-+            if any(child.tag == core_ns('callback') for child in children):
-                 continue
- 
-             type_desc = type_description_from_node(field)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hotdoc.git/commitdiff/5a4e4c5841f157cfc8e4d6711482c3d04484df32

