Control: tags -1 ftbfs

On Tue, Aug 06, 2024 at 12:00:52AM +0200, Samuel Thibault wrote:
> Source: python-charset-normalizer
> Version: 3.3.2-1
> Severity: important
> Tags: patch
> 
> Hello,
> 
> python-charset-normalizer currently unconditionally build-depends on
> python3-sphinx, which depends on python3-requests, which depends on
> python3-charset-normalizer, thus forming a bootstrap loop for new ports.
> 
> The attached patch fixes that by dropping the python3-sphinx build-dep
> in the nodoc build profile, could you apply it?

That would still require a manual bootstrap, e.g. currently on alpha.

The documentation is in the binary-all package,
there is no point in building it also in the binary-any build.

Since the binary-all build builds only documentation,
we can then further simplify by dropping all nodoc handling.

Patch below.

> Thanks,
> Samuel
>...

cu
Adrian

diff -Nru python-charset-normalizer-3.3.2/debian/control 
python-charset-normalizer-3.3.2/debian/control
--- python-charset-normalizer-3.3.2/debian/control      2024-08-03 
17:28:29.000000000 +0300
+++ python-charset-normalizer-3.3.2/debian/control      2024-08-03 
17:31:55.000000000 +0300
@@ -13,8 +13,10 @@
  python3-pytest <!nocheck>,
  python3-pytest-cov <!nocheck>,
  python3-setuptools,
+ sphinx-common,
+Build-Depends-Indep:
  python3-sphinx,
- furo <!nodoc>,
+ furo,
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://github.com/ousret/charset_normalizer
diff -Nru python-charset-normalizer-3.3.2/debian/rules 
python-charset-normalizer-3.3.2/debian/rules
--- python-charset-normalizer-3.3.2/debian/rules        2024-08-03 
17:13:47.000000000 +0300
+++ python-charset-normalizer-3.3.2/debian/rules        2024-08-03 
17:31:55.000000000 +0300
@@ -16,8 +16,8 @@
 %:
        dh $@ --with=sphinxdoc --buildsystem=pybuild
 
-execute_before_dh_sphinxdoc:
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+override_dh_sphinxdoc-arch:
+
+execute_before_dh_sphinxdoc-indep:
        PYTHONPATH=. python3 -m sphinx -b html $(SPHINXOPTS) docs/ 
$(CURDIR)/debian/python-charset-normalizer-doc/usr/share/doc/python-charset-normalizer-doc/html
        rm 
$(CURDIR)/debian/python-charset-normalizer-doc/usr/share/doc/python-charset-normalizer-doc/html/.nojekyll
-endif

Reply via email to