Control: tags -1 patch On 2025-01-12 John David Anglin <d...@parisc-linux.org> wrote: > Source: gnupg2 > Version: 2.2.46-1 > Severity: normal
> Dear Maintainer, > The gnupg2 build fails here: > convert `test -f '../../doc/gnupg-module-overview.svg' || echo > '../../doc/'`../../doc/gnupg-module-overview.svg gnupg-module-overview.pdf > sh: 1: Syntax error: "&" unexpected > sh: 1: Syntax error: "&" unexpected > convert: delegate failed `'rsvg-convert' --dpi-x %x --dpi-y %y -o > '%o' '%i'' @ error/delegate.c/InvokeDelegate/1913. [...] Hello, convert delegates svg->png and svg->pdf to rsvg-convert which is not available on these ports due to missing rust. I think we will need to avoid image regeneration on these ports. Suggested patch attached. Not committing directly since Daniel has been quite busy on the repo recently and I want to avoid churn. cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
diff --git a/debian/clean b/debian/clean index b81863d64..9095d9d43 100644 --- a/debian/clean +++ b/debian/clean @@ -8,8 +8,6 @@ doc/gnupg.info doc/gnupg.info-1 doc/gnupg.info-2 doc/gnupg.info-3 -doc/*.pdf -doc/*.png ChangeLog regexp/_unicode_mapping.c regexp/UnicodeData.txt diff --git a/debian/rules b/debian/rules index 27812a690..41481c15e 100755 --- a/debian/rules +++ b/debian/rules @@ -103,6 +103,12 @@ override_dh_auto_build-indep: cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe strip build-gpgv-win32/g10/gpgv.exe +execute_after_dh_clean: + # convert delegates to rsvg-convert for svg -> *, which uses rust + # and is n/a on some ports. Only force re-generation of images + # on archs with rust. + if which rsvg-convert > /dev/null ; then \ + rm -vf doc/*.pdf doc/*.png ; fi override_dh_auto_test: dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)
