diff --git a/devel/doxygen/files/patch-doc-doxygen_manual.tex b/devel/doxygen/files/patch-doc-doxygen_manual.tex deleted file mode 100644 index 0665af5b15f2..000000000000 --- a/devel/doxygen/files/patch-doc-doxygen_manual.tex +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/doxygen_manual.tex.orig 2019-08-04 11:51:41 UTC -+++ doc/doxygen_manual.tex -@@ -22,7 +22,7 @@ - \usepackage{array}[=2016-10-06] - \fi - %% --\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry} -+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry} - \usepackage{makeidx} - \usepackage{natbib} - \usepackage{graphicx} diff --git a/devel/doxygen/files/patch-doc-translator.py b/devel/doxygen/files/patch-doc-translator.py deleted file mode 100644 index 646f420a67e1..000000000000 --- a/devel/doxygen/files/patch-doc-translator.py +++ /dev/null @@ -1,23 +0,0 @@ -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. ---- doc/translator.py -+++ 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: