[packages/hotdoc] - updated to 0.16

qboosh qboosh at pld-linux.org
Wed Mar 13 21:53:09 CET 2024


commit 53c9ab0d6d308204aa9557177a18951a724f598f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Mar 13 21:46:44 2024 +0100

    - updated to 0.16

 clang_libdir.patch | 34 +++++++++++++++++-----------------
 hotdoc-setup.patch | 10 +++++-----
 hotdoc.spec        | 14 +++++++-------
 3 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/hotdoc.spec b/hotdoc.spec
index 2dee93c..cb86b3d 100644
--- a/hotdoc.spec
+++ b/hotdoc.spec
@@ -7,22 +7,22 @@
 Summary:	A documentation tool micro-framework
 Summary(pl.UTF-8):	Mikroszkielet narzędzia do tworzenia dokumentacji
 Name:		hotdoc
-Version:	0.14.0
+Version:	0.16
 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:	45374acdd7e720a4461d0ad5b7300008
+# Source0-md5:	a14a38e7950c8056c88f0e131429b38f
 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
 # Source2-md5:	bf45a06cebc01ef5f36b4521bf97b410
-Source3:	https://github.com/hotdoc/hotdoc_bootstrap_theme/archive/4b33630/hotdoc_bootstrap_theme-4b33630.tar.gz
-# Source3-md5:	a9a83a80b5f84a8860e9689937dc3e1f
+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
-# Source4-md5:	482aad21167fe84bd06fe219ef8ec17f
+# Source4-md5:	38a5d173bf901dc1697e65760883a03b
 Patch0:		%{name}-setup.patch
 Patch1:		clang_libdir.patch
 URL:		https://hotdoc.github.io/
@@ -38,10 +38,10 @@ 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 >= 5.1
+BuildRequires:	python3-PyYAML >= 6
 BuildRequires:	python3-appdirs
-BuildRequires:	python3-charset_normalizer
 BuildRequires:	python3-dbus-deviation >= 0.4.0
+BuildRequires:	python3-faust-cchardet
 BuildRequires:	python3-feedgen
 BuildRequires:	python3-lxml
 BuildRequires:	python3-networkx >= 2.5
diff --git a/clang_libdir.patch b/clang_libdir.patch
index fdab96e..4fa885c 100644
--- a/clang_libdir.patch
+++ b/clang_libdir.patch
@@ -1,18 +1,18 @@
---- hotdoc-0.13.3/hotdoc/extensions/c/c_extension.py.orig	2021-03-08 15:49:16.000000000 +0100
-+++ hotdoc-0.13.3/hotdoc/extensions/c/c_extension.py	2022-02-17 10:03:43.620343184 +0100
-@@ -77,11 +77,11 @@
- def get_clang_headers():
-     version = subprocess.check_output(['llvm-config', '--version']).strip().decode()
-     prefix = subprocess.check_output(['llvm-config', '--prefix']).strip().decode()
-+    libdir = subprocess.check_output(['llvm-config', '--libdir']).strip().decode()
- 
--    for lib in ['lib', 'lib64']:
--        p = os.path.join(prefix, lib, 'clang', version, 'include')
--        if os.path.exists(p):
--            return p
-+    p = os.path.join(libdir, 'clang', version, 'include')
-+    if os.path.exists(p):
-+        return p
- 
-     warn('clang-headers-not-found', CLANG_HEADERS_WARNING)
+--- 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()
+     prefix = subprocess.check_output(
+         ['llvm-config', '--prefix']).strip().decode()
++    libdir = subprocess.check_output(
++        ['llvm-config', '--libdir']).strip().decode()
+     versions = (version, version.split('.').pop(0))
+-    for (ver, lib) in itertools.product(
+-            versions,
+-            ['lib', 'lib64']):
+-        p = os.path.join(prefix, lib, 'clang', ver, 'include')
++    for ver in versions:
++        p = os.path.join(libdir, 'clang', ver, 'include')
+         if os.path.exists(p):
+             return p
  
diff --git a/hotdoc-setup.patch b/hotdoc-setup.patch
index d57ef57..73a710f 100644
--- a/hotdoc-setup.patch
+++ b/hotdoc-setup.patch
@@ -1,8 +1,8 @@
---- hotdoc-0.10.0/setup.py.orig	2019-08-18 00:54:00.000000000 +0200
-+++ hotdoc-0.10.0/setup.py	2020-09-11 06:33:51.916754338 +0200
-@@ -373,7 +373,8 @@
-         src_dir = os.path.dirname (self.__flex_sources[0])
-         built_scanner_path = src(os.path.join (src_dir, 'scanner.c'))
+--- hotdoc-0.16/setup.py.orig	2023-11-09 15:08:48.000000000 +0100
++++ hotdoc-0.16/setup.py	2024-03-13 19:08:01.337366694 +0100
+@@ -361,7 +361,8 @@ class FlexExtension (Extension):
+         src_dir = os.path.dirname(self.__flex_sources[0])
+         built_scanner_path = src(os.path.join(src_dir, 'scanner.c'))
  
 -        self.sources.append(built_scanner_path)
 +        if built_scanner_path not in self.sources:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hotdoc.git/commitdiff/53c9ab0d6d308204aa9557177a18951a724f598f



More information about the pld-cvs-commit mailing list