Accepting request 337261 from home:pgajdos:doxygen-ppc64le

OBS-URL: https://build.opensuse.org/request/show/337261
OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=97

doxygen-doc.spec

@@ -29,6 +29,8 @@ Source0:        http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar
 Patch2:         doxygen-no-shared-libs.patch
 # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
 Patch3:         vhdlparser-no-return.patch
+# suse specific, for ppc64le, workaround for bnc#921577
+Patch4:         doxygen-dot-one-thread.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  fdupes
@@ -77,6 +79,10 @@ This package contains only documentation
 %setup -q -n doxygen-%{version} 
 %patch2 -p1
 %patch3 -p1
+%ifarch ppc64le
+# see bnc#921577
+%patch4 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags} -fPIC"

doxygen-dot-one-thread.patch

@@ -1,13 +1,30 @@
-Index: src/config.xml
+From: Michel Normand <normand@linux.vnet.ibm.com>
+Subject: doxygen ppc64le ignore DOT NUM THREADS to 0
+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 <normand@linux.vnet.ibm.com>
+---
+ src/dot.cpp |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: doxygen-1.8.10/src/dot.cpp
 ===================================================================
---- src/config.xml.orig	2015-06-27 13:40:48.000000000 +0200
+--- doxygen-1.8.10.orig/src/dot.cpp
-+++ src/config.xml	2015-10-05 15:50:05.584725277 +0200
++++ doxygen-1.8.10/src/dot.cpp
-@@ -3130,7 +3130,7 @@
+@@ -1240,9 +1240,12 @@ DotManager::DotManager() : m_dotMaps(100
- ]]>
+   m_queue = new DotRunnerQueue;
-       </docs>
+   int i;
-     </option>
+   int numThreads = QMIN(32,Config_getInt("DOT_NUM_THREADS"));
--    <option type='int' id='DOT_NUM_THREADS' defval='0' minval='0' maxval='32' depends='HAVE_DOT'>
++  if (numThreads==0) {
-+    <option type='int' id='DOT_NUM_THREADS' defval='1' minval='0' maxval='32' depends='HAVE_DOT'>
++    numThreads = 1;
-       <docs>
++    msg("use single threaded despite DOT_NUM_THREADS=0 (bypass boo#921577)\n");
- <![CDATA[
++  }
-  The \c DOT_NUM_THREADS specifies the number of \c dot invocations doxygen is 
+   if (numThreads!=1)
+   {
+-    if (numThreads==0) numThreads = QMAX(2,QThread::idealThreadCount()+1);
+     for (i=0;i<numThreads;i++)
+     {
+       DotWorkerThread *thread = new DotWorkerThread(m_queue);
+

doxygen.spec

@@ -34,7 +34,7 @@ Patch2:         doxygen-no-shared-libs.patch
 # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
 Patch3:         vhdlparser-no-return.patch
 # suse specific, for ppc64le, workaround for bnc#921577
-Patch4:         %{name}-dot-one-thread.patch
+Patch4:         doxygen-dot-one-thread.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  flex
@@ -58,7 +58,7 @@ as well.
 %patch2 -p1
 %patch3 -p1
 %ifarch ppc64le
-%patch4
+%patch4 -p1
 %endif
 
 %build