Hello community,

here is the log from the commit of package doxygen for openSUSE:Factory checked 
in at 2015-10-14 16:34:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/doxygen (Old)
 and      /work/SRC/openSUSE:Factory/.doxygen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "doxygen"

Changes:
--------
--- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes  2015-09-09 
20:20:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.doxygen.new/doxygen.changes     2015-10-14 
16:34:53.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct  5 14:05:14 UTC 2015 - [email protected]
+
+- work around Power8 double free or corruption [bnc#921577]
+  + doxygen-dot-one-thread.patch
+
+-------------------------------------------------------------------

New:
----
  doxygen-dot-one-thread.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ doxygen-doc.spec ++++++
--- /var/tmp/diff_new_pack.nEwvji/_old  2015-10-14 16:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.nEwvji/_new  2015-10-14 16:34:54.000000000 +0200
@@ -29,6 +29,8 @@
 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 @@
 %setup -q -n doxygen-%{version} 
 %patch2 -p1
 %patch3 -p1
+%ifarch ppc64le
+# see bnc#921577
+%patch4 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags} -fPIC"

++++++ doxygen.spec ++++++
--- /var/tmp/diff_new_pack.nEwvji/_old  2015-10-14 16:34:54.000000000 +0200
+++ /var/tmp/diff_new_pack.nEwvji/_new  2015-10-14 16:34:54.000000000 +0200
@@ -33,6 +33,8 @@
 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:  flex
@@ -55,6 +57,9 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%ifarch ppc64le
+%patch4 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags} -fPIC"

++++++ doxygen-dot-one-thread.patch ++++++
From: Michel Normand <[email protected]>
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 <[email protected]>
---
 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
   m_queue = new DotRunnerQueue;
   int i;
   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");
+  }
   if (numThreads!=1)
   {
-    if (numThreads==0) numThreads = QMAX(2,QThread::idealThreadCount()+1);
     for (i=0;i<numThreads;i++)
     {
       DotWorkerThread *thread = new DotWorkerThread(m_queue);


Reply via email to