app-doc/doxygen: bump to 1.9.1

* USE=doc now generates fine with the
  added dependency of dev-texlive/texlive-plaingeneric
  for listofitems.

* Add a patch to ignore files we can't decode
  when generating docs. Ideally those files
  shouldn't exist anyway when we're generating docs,
  or be ignored earlier, but this works.

Closes: https://bugs.gentoo.org/688658
Closes: https://bugs.gentoo.org/749630
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 23 insertions, 0 deletions

diff --git a/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch b/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
new file mode 100644
index 000000000000..5dd7578f24ec
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
@@ -0,0 +1,23 @@
+Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in position 45: invalid start byte"
+in src/._xmlgen.cpp which is binary. This doesn't seem like it should be present at the time the docs
+are generated, but this is simpler for now.
+--- a/doc/translator.py
++++ b/doc/translator.py
+@@ -1454,10 +1454,13 @@ class TrManager:
+ 
+         # Read content of the file as one string.

+         assert os.path.isfile(fname)

+-        f = xopen(fname)

+-        cont = f.read()

+-        cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.

+-        f.close()

++        try:

++            with xopen(fname) as f:

++                cont = f.read()

++                cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.

++        except UnicodeDecodeError:

++            print("Skipping {0} because of decoding errors".format(fname))

++            return

+ 

+         # Remove the items for identifiers that were found in the file.

+         while lst_in: