From f810f3c034818f92544f727debafd5c3f653790c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 22 2016 05:46:00 +0000 Subject: Add patch to build with python rc --- diff --git a/doxygen-rc.patch b/doxygen-rc.patch new file mode 100644 index 0000000..89a9518 --- /dev/null +++ b/doxygen-rc.patch @@ -0,0 +1,22 @@ +diff -up doxygen-1.8.12/addon/doxywizard/doxywizard.rc doxygen-1.8.12/addon/doxywizard/doxywizard +diff -up doxygen-1.8.12/doc/translator.py.rc doxygen-1.8.12/doc/translator.py +--- doxygen-1.8.12/doc/translator.py.rc 2016-05-10 13:51:51.000000000 -0600 ++++ doxygen-1.8.12/doc/translator.py 2016-12-21 22:34:41.007132208 -0700 +@@ -83,7 +83,7 @@ def xopen(fname, mode='r', encoding='utf + the default 'utf-8-sig' is used (skips the BOM automatically). + ''' + +- major, minor, patch = (int(e) for e in platform.python_version_tuple()) ++ major, minor, patch = (int(re.sub('[a-z].*','',e)) for e in platform.python_version_tuple()) + if major == 2: + return open(fname, mode=mode) # Python 2 without encoding + else: +@@ -1990,7 +1990,7 @@ class TrManager: + if __name__ == '__main__': + + # The Python 2.6+ or 3.3+ is required. +- major, minor, patch = (int(e) for e in platform.python_version_tuple()) ++ major, minor, patch = (int(re.sub('[a-z].*','',e)) for e in platform.python_version_tuple()) + if (major == 2 and minor < 6) or (major == 3 and minor < 0): + print('Python 2.6+ or Python 3.0+ are required for the script') + sys.exit(1) diff --git a/doxygen.spec b/doxygen.spec index 802c30b..8557c44 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -21,6 +21,9 @@ Patch5: doxygen-707266.patch Patch6: doxygen-774949.patch Patch7: doxygen-775245.patch +# Build with python rc +Patch10: doxygen-rc.patch + BuildRequires: perl BuildRequires: tex(dvips) BuildRequires: tex(latex) @@ -141,6 +144,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} %changelog * Thu Dec 22 2016 Orion Poplawski - 1:1.8.12-7 - Rebuild for xapian soname bump +- Add patch to build with python rc * Mon Dec 12 2016 Than Ngo - 1:1.8.12-6 - backport upstream patch to fix