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-1.8.15.src.tar.gz b/doxygen-1.8.15.src.tar.gz deleted file mode 100644 index a26f38f..0000000 --- a/doxygen-1.8.15.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d -size 5097791 diff --git a/doxygen-1.8.16.src.tar.gz b/doxygen-1.8.16.src.tar.gz new file mode 100644 index 0000000..a2139b0 --- /dev/null +++ b/doxygen-1.8.16.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82 +size 5497317 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 - - --