From 5548a911c055cc64c5a57ebbf04ad7453290a2234def89a0c6e964c1034175b9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 6 Sep 2016 19:56:43 +0000 Subject: [PATCH] Accepting request 425143 from home:mathletic:branches:devel:tools update to Doxygen 1.8.12 OBS-URL: https://build.opensuse.org/request/show/425143 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=107 --- doxygen-1.8.11.src.tar.gz | 3 --- doxygen-1.8.12.src.tar.gz | 3 +++ doxygen-dot-one-thread.patch | 15 ++++----------- doxygen.changes | 7 +++++++ doxygen.spec | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 doxygen-1.8.11.src.tar.gz create mode 100644 doxygen-1.8.12.src.tar.gz diff --git a/doxygen-1.8.11.src.tar.gz b/doxygen-1.8.11.src.tar.gz deleted file mode 100644 index 3aa5459..0000000 --- a/doxygen-1.8.11.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 -size 4834291 diff --git a/doxygen-1.8.12.src.tar.gz b/doxygen-1.8.12.src.tar.gz new file mode 100644 index 0000000..3f26b7c --- /dev/null +++ b/doxygen-1.8.12.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c +size 4880613 diff --git a/doxygen-dot-one-thread.patch b/doxygen-dot-one-thread.patch index c7017e8..a19e378 100644 --- a/doxygen-dot-one-thread.patch +++ b/doxygen-dot-one-thread.patch @@ -4,19 +4,13 @@ Date: Wed, 07 Oct 2015 14:11:22 +0200 doxygen ppc64le ignore DOT NUM THREADS to 0 as a bypass to boo#921577 -Signed-off-by: Michel Normand ---- - src/dot.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -Index: doxygen-1.8.10/src/dot.cpp =================================================================== ---- doxygen-1.8.10.orig/src/dot.cpp -+++ doxygen-1.8.10/src/dot.cpp -@@ -1240,9 +1240,12 @@ DotManager::DotManager() : m_dotMaps(100 +--- doxygen-1.8.12/src/dot.cpp 2016-05-10 21:51:52.000000000 +0200 ++++ doxygen-1.8.12_new/src/dot.cpp 2016-09-06 19:42:27.244474872 +0200 +@@ -1192,9 +1192,12 @@ m_queue = new DotRunnerQueue; int i; - int numThreads = QMIN(32,Config_getInt("DOT_NUM_THREADS")); + int numThreads = QMIN(32,Config_getInt(DOT_NUM_THREADS)); + if (numThreads==0) { + numThreads = 1; + msg("use single threaded despite DOT_NUM_THREADS=0 (bypass boo#921577)\n"); @@ -27,4 +21,3 @@ Index: doxygen-1.8.10/src/dot.cpp for (i=0;i