diff --git a/PR_7193_fix_blank_file_patterns.patch b/PR_7193_fix_blank_file_patterns.patch new file mode 100644 index 0000000..1d70466 --- /dev/null +++ b/PR_7193_fix_blank_file_patterns.patch @@ -0,0 +1,48 @@ +From a27369dbf3cccbe4b96bfde1aca49d96d4b396f0 Mon Sep 17 00:00:00 2001 +From: albert-github +Date: Tue, 13 Aug 2019 19:23:42 +0200 +Subject: [PATCH] issue #7190 1.8.16: Blank FILE_PATTERNS => no files processed + +This is actually a regression on #7195. Due to the fact that the init() routine has moved up, the settings for `FILE_PATTERNS` have already been done and a call to init does not operate on the `FILE_PATTERNS` variable but on the structure from which the `FILE_PATTERNS` was derived. We have should here operate on the `FILE_PATTERNS` directly as well., bu getting the default values out of the underlying structure. +--- + src/configimpl.h | 1 + + src/configimpl.l | 12 +++++++++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/src/configimpl.h b/src/configimpl.h +index 1594d47a3..55e056e8b 100644 +--- a/src/configimpl.h ++++ b/src/configimpl.h +@@ -126,6 +126,7 @@ class ConfigList : public ConfigOption + void setWidgetType(WidgetType w) { m_widgetType = w; } + WidgetType widgetType() const { return m_widgetType; } + QStrList *valueRef() { return &m_value; } ++ QStrList getDefault() { return m_defaultValue; } + void writeTemplate(FTextStream &t,bool sl,bool); + void compareDoxyfile(FTextStream &t); + void substEnvVars(); +diff --git a/src/configimpl.l b/src/configimpl.l +index bcb5a8c34..2d91e1206 100644 +--- a/src/configimpl.l ++++ b/src/configimpl.l +@@ -1652,11 +1652,17 @@ void Config::checkAndCorrect() + QStrList &filePatternList = Config_getList(FILE_PATTERNS); + if (filePatternList.isEmpty()) + { +- ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); +- if (opt->kind()==ConfigOption::O_List) ++ ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); ++ if (opt->kind()==ConfigOption::O_List) ++ { ++ QStrList l = ((ConfigList*)opt)->getDefault(); ++ const char *p = l.first(); ++ while (p) + { +- ((ConfigList*)opt)->init(); ++ filePatternList.append(p); ++ p = l.next(); + } ++ } + } + + // add default pattern if needed diff --git a/doxygen-dot-one-thread.patch b/doxygen-dot-one-thread.patch deleted file mode 100644 index a19e378..0000000 --- a/doxygen-dot-one-thread.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Michel Normand -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 - -=================================================================== ---- 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)); -+ 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 + +- Add PR_7193_fix_blank_file_patterns.patch to populate the + default for FILE_PATTERNS if not set, otherwise no files are + processed [https://github.com/doxygen/doxygen/issues/7190] +- Remove obsolete and no longer applying patch: + doxygen-dot-one-thread.patch + ------------------------------------------------------------------- Mon Sep 30 13:06:06 UTC 2019 - Franz Sirl diff --git a/doxygen.spec b/doxygen.spec index 396ae0b..47abc17 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -34,11 +34,11 @@ Patch0: %{name}-modify_footer.patch Patch1: %{name}-no-lowercase-man-names.patch # PATCH-FIX-UPSTREAM: add missing returns to non-void functions Patch3: vhdlparser-no-return.patch -# suse specific, for ppc64le ppc64, workaround for bnc#921577 -Patch4: doxygen-dot-one-thread.patch # really do not require git executable Patch5: doxygen-git-not-required.patch Patch6: doxygen-llvm-libs.patch +# PATCH-FIX-UPSTREAM: Populate FILE_PATTERN default if not set (issue#7190) +Patch7: PR_7193_fix_blank_file_patterns.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -65,13 +65,11 @@ as well. %patch0 -p1 %patch1 -p1 %patch3 -p1 -%ifarch ppc64le ppc64 -%patch4 -p1 -%endif %patch5 -p1 %if %{with libclang} %patch6 %endif +%patch7 -p1 %build %cmake \