pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

reuse-tool: Reproducible build



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Oct 9 17:15:42 2024 +0200
Changeset:	121e6edfeec494edb935db2b63c5f60c1c634ae1

Modified Files:
	reuse-tool/Makefile
	reuse-tool/TODO
	reuse-tool/distinfo
	reuse-tool/patches/patch-docs_conf.py

Log Message:
reuse-tool: Reproducible build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=121e6edfeec494edb935db2b63c5f60c1c634ae1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 reuse-tool/Makefile                   |  4 ++--
 reuse-tool/TODO                       |  2 +-
 reuse-tool/distinfo                   |  2 +-
 reuse-tool/patches/patch-docs_conf.py | 25 +++++++++++++++++++++----
 4 files changed, 25 insertions(+), 8 deletions(-)

diffs:
diff --git a/reuse-tool/Makefile b/reuse-tool/Makefile
index f0ce535848..ee83e14f19 100644
--- a/reuse-tool/Makefile
+++ b/reuse-tool/Makefile
@@ -17,7 +17,6 @@ TOOL_DEPENDS+=	${PYPKGPREFIX}-myst-parser>=3.0.1:../../textproc/py-myst-parser
 TOOL_DEPENDS+=	${PYPKGPREFIX}-pbr>=6.0.0:../../devel/py-pbr
 TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=1.9.0:../../devel/py-poetry-core
 TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx>=7.3.7:../../textproc/py-sphinx
-TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinxcontrib-apidoc>=0.5.0:../../wip/py-sphinxcontrib-apidoc
 DEPENDS+=	${PYPKGPREFIX}-attrs>=21.3:../../devel/py-attrs
 DEPENDS+=	${PYPKGPREFIX}-binaryornot>=0.4.4:../../devel/py-binaryornot
 DEPENDS+=	${PYPKGPREFIX}-debian>=0.1.34<0.1.45:../../wip/py-debian
@@ -29,7 +28,8 @@ DEPENDS+=	${PYPKGPREFIX}-tomlkit>=0.8:../../textproc/py-tomlkit
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 post-build:
-	cd ${WRKSRC}/docs && env ${MAKE_ENV} sphinx-build-${PYVERSSUFFIX} -b man "." "_build"
+	cd ${WRKSRC}/docs && env ${MAKE_ENV} \
+		sphinx-build-${PYVERSSUFFIX} -D release=${PKGVERSION_NOREV} -D today="2024-07-08" -b man "." "_build"
 
 post-install:
 	for manpage in \
diff --git a/reuse-tool/TODO b/reuse-tool/TODO
index 06ca434bb9..7b78c85c24 100644
--- a/reuse-tool/TODO
+++ b/reuse-tool/TODO
@@ -1 +1 @@
-- Build is not reproducible yet
+- sphinx WARNING: toctree contains reference to nonexisting document 'api/reuse'
diff --git a/reuse-tool/distinfo b/reuse-tool/distinfo
index 2770dc5448..522748f701 100644
--- a/reuse-tool/distinfo
+++ b/reuse-tool/distinfo
@@ -3,4 +3,4 @@ $NetBSD$
 BLAKE2s (reuse-tool-4.0.3.tar.gz) = 387c6737cd9098d5f6074247260c745b08acc881464c9fe188284c3356401185
 SHA512 (reuse-tool-4.0.3.tar.gz) = 2f9dca807a0f3eed9356c1fcbe9f7bc8fd9711ac3583811decf90bbb28818a0af64925fa31ee84e8c0e8241d64e9194209b03cb422bf1aeb6b160eca3289bec6
 Size (reuse-tool-4.0.3.tar.gz) = 360402 bytes
-SHA1 (patch-docs_conf.py) = 2296913e40af6f528e2bc1f9f989daa53280cf66
+SHA1 (patch-docs_conf.py) = 50ed766eb22fee68a1e39c634e71d3ef040f1410
diff --git a/reuse-tool/patches/patch-docs_conf.py b/reuse-tool/patches/patch-docs_conf.py
index bcce8bce45..3598fbcddd 100644
--- a/reuse-tool/patches/patch-docs_conf.py
+++ b/reuse-tool/patches/patch-docs_conf.py
@@ -1,17 +1,34 @@
 $NetBSD$
 
+Disable "apidoc" (not required for building man pages).
 Disable "intersphinx_mapping" (wants do fetch stuff from network).
 pkgsrc-wip package for py-furo is broken (not required for building man pages).
 
 --- docs/conf.py.orig	2024-07-08 11:58:05.000000000 +0000
 +++ docs/conf.py
-@@ -69,12 +69,12 @@ apidoc_extra_args = ["--maxdepth", "2"]
+@@ -52,29 +52,15 @@ extensions = [
+     "sphinx.ext.intersphinx",
+     "sphinx.ext.viewcode",
+     "sphinx.ext.napoleon",
+-    "sphinxcontrib.apidoc",
+ ]
  
- autodoc_member_order = "bysource"
+ templates_path = ["_templates"]
+ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
  
+-# -- Extensions configuration ------------------------------------------------
+-
+-apidoc_module_dir = str(ROOT_DIR / "src/reuse")
+-# apidoc_output_dir = "api"
+-# apidoc_excluded_paths = []
+-apidoc_separate_modules = True
+-apidoc_toc_file = False
+-apidoc_extra_args = ["--maxdepth", "2"]
+-
+-autodoc_member_order = "bysource"
+-
 -intersphinx_mapping = {"python": ("https://docs.python.org/3";, None)}
-+#intersphinx_mapping = {"python": ("https://docs.python.org/3";, None)}
- 
+-
  # -- Options for HTML output -------------------------------------------------
  # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
  


Home | Main Index | Thread Index | Old Index