rpm/doxygen
SHA256
1
0
Fork 0
forked from pool/doxygen
Code Pull Requests Activity

Accepting request 819899 from devel:tools

Browse Source 
- version update to 1.8.18
  Removed functionality
    * Removed support for TCL (code is too buggy and unmaintained, language not very popular)
  Features
    * Added the few missing French translations [view]
    * Updated Swedish translation to match the latest version [view]
    * Adding check on configuration setting EXTENSION_MAPPING [view]
    * Adding commands `\rtfinclude`, `\docbookinclude`, `\maninclude` and `\xmlinclude` [view]
    * output on doxyparse if a function is a prototype [view]
    * print protection information on doxyparse [view]
    * Creation of svg images for formulas with inkscape [view]
    * Improve formula handling and rendering. [view]
    * Doxygen version in the messages output (#7640) [view]
    * Doxygen version information (#7645) [view]
    * Enabling Travis builds for s390x [view]
    * Relative markdown file reference (#7032) [view]
  Bugs fixed
    * see https://www.doxygen.nl/manual/changelog.html
- modified patches
  % doxygen-no-lowercase-man-names.patch (refreshed)
  % vhdlparser-no-return.patch (refreshed)
- deleted patches
  - 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch (upstreamed)
  - PR_7193_fix_blank_file_patterns.patch (upstreamed)
  - doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch (upstreamed)
  - doxygen-git-not-required.patch (upstreamed)
  - reproducible-sort.patch (upstreamed)

- Improve build with libclang support:
  * add doxygen-libclang-cpp.patch to support linking against libclang-cpp

OBS-URL: https://build.opensuse.org/request/show/819899
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=78
This commit is contained in:
Dominique Leuenberger 2020-07-13 07:04:44 +00:00 committed by Git OBS Bridge
commit fd7cd2c3c4
13 changed files with 1236 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch
View File

@ -1,51 +0,0 @@
From 316902302c6af1ec43f9d1ad4d57d30a9a9fadf7 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 9 Sep 2019 13:28:28 +0200
Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
broken index.qhp
Ignore automatically generated anchor names when importing a tag file.
---
src/tagreader.cpp | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 56dbe7d..d79d9b5 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
void endDocAnchor()
{
+ // Check whether or not the tag is automatically generate, in that case ignore the tag.
+ switch(m_state)
+ {
+ case InClass:
+ case InFile:
+ case InNamespace:
+ case InGroup:
+ case InPage:
+ case InMember:
+ case InPackage:
+ case InDir:
+ if (QString(m_curString).startsWith("autotoc_md")) return;
+ break;
+ default:
+ warn("Unexpected tag 'docanchor' found");
+ return;
+ }
switch(m_state)
{
case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
- default: warn("Unexpected tag 'docanchor' found"); break;
+ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore
}
}
--
2.24.1

48
PR_7193_fix_blank_file_patterns.patch
View File

@ -1,48 +0,0 @@
From a27369dbf3cccbe4b96bfde1aca49d96d4b396f0 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
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

3
doxygen-1.8.16.src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82
size 5497317

3
doxygen-1.8.18.src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18173d9edc46d2d116c1f92a95d683ec76b6b4b45b817ac4f245bb1073d00656
size 5188787

13
doxygen-git-not-required.patch
View File

@ -1,13 +0,0 @@
Index: doxygen-1.8.16/cmake/git_watcher.cmake
===================================================================
--- doxygen-1.8.16.orig/cmake/git_watcher.cmake 2019-07-30 15:10:10.000000000 +0200
+++ doxygen-1.8.16/cmake/git_watcher.cmake 2019-09-30 10:10:55.145977348 +0200
@@ -69,7 +69,7 @@ CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR
# Check the optional git variable.
# If it's not set, we'll try to find it using the CMake packaging system.
if(NOT DEFINED GIT_EXECUTABLE)
- find_package(Git QUIET REQUIRED)
+ find_package(Git QUIET)
endif()
CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE)

33
doxygen-libclang-cpp.patch Normal file
View File

@ -0,0 +1,33 @@
--- doxygen-1.8.16/addon/doxyapp/CMakeLists.txt~ 2020-07-07 16:52:25.526347653 +0200
+++ doxygen-1.8.16/addon/doxyapp/CMakeLists.txt 2020-07-07 17:07:15.382642253 +0200
@@ -14,7 +14,7 @@
)
if (use_libclang)
- set(CLANG_LIBS libclang clangTooling ${llvm_libs})
+ set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
endif()
target_link_libraries(doxyapp
--- doxygen-1.8.16/addon/doxyparse/CMakeLists.txt~ 2020-07-07 16:52:25.526347653 +0200
+++ doxygen-1.8.16/addon/doxyparse/CMakeLists.txt 2020-07-07 17:07:38.729600748 +0200
@@ -14,7 +14,7 @@
)
if (use_libclang)
- set(CLANG_LIBS libclang clangTooling ${llvm_libs})
+ set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
endif()
target_link_libraries(doxyparse
--- doxygen-1.8.16/src/CMakeLists.txt~ 2020-07-07 16:52:25.538347118 +0200
+++ doxygen-1.8.16/src/CMakeLists.txt 2020-07-07 17:08:18.567823582 +0200
@@ -269,7 +269,7 @@
include_directories(${LLVM_INCLUDE_DIRS})
add_definitions(${LLVM_DEFINITIONS})
target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
- set(CLANG_LIBS libclang clangTooling LLVM)
+ set(CLANG_LIBS libclang clang-cpp LLVM)
endif()
target_link_libraries(doxygen

20
doxygen-no-lowercase-man-names.patch
View File

@ -1,12 +1,12 @@
Index: doxygen-1.8.10/src/fortranscanner.l Index: doxygen-1.8.18/src/fortranscanner.l
=================================================================== ===================================================================
--- doxygen-1.8.10.orig/src/fortranscanner.l --- doxygen-1.8.18.orig/src/fortranscanner.l 2020-07-10 09:10:24.205905062 +0200
+++ doxygen-1.8.10/src/fortranscanner.l +++ doxygen-1.8.18/src/fortranscanner.l 2020-07-10 09:13:31.570972499 +0200
@@ -2090,7 +2090,6 @@ static void initEntry() @@ -2357,7 +2357,6 @@ static void initEntry(yyscan_t yyscanner
*/ static void addCurrentEntry(yyscan_t yyscanner,bool case_insens)
static void addCurrentEntry(int case_insens)
{ {
- if (case_insens) current->name = current->name.lower(); struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
//printf("===Adding entry %s to %s\n", current->name.data(), current_root->name.data()); - if (case_insens) yyextra->current->name = yyextra->current->name.lower();
current_root->addSubEntry(current); //printf("===Adding entry %s to %s\n", yyextra->current->name.data(), yyextra->current_root->name.data());
last_entry = current; yyextra->last_entry = yyextra->current;
yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);

39
doxygen.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Fri Jul 10 07:34:45 UTC 2020 - pgajdos@suse.com
- version update to 1.8.18
Removed functionality
* Removed support for TCL (code is too buggy and unmaintained, language not very popular)
Features
* Added the few missing French translations [view]
* Updated Swedish translation to match the latest version [view]
* Adding check on configuration setting EXTENSION_MAPPING [view]
* Adding commands `\rtfinclude`, `\docbookinclude`, `\maninclude` and `\xmlinclude` [view]
* output on doxyparse if a function is a prototype [view]
* print protection information on doxyparse [view]
* Creation of svg images for formulas with inkscape [view]
* Improve formula handling and rendering. [view]
* Doxygen version in the messages output (#7640) [view]
* Doxygen version information (#7645) [view]
* Enabling Travis builds for s390x [view]
* Relative markdown file reference (#7032) [view]
Bugs fixed
* see https://www.doxygen.nl/manual/changelog.html
- modified patches
% doxygen-no-lowercase-man-names.patch (refreshed)
% vhdlparser-no-return.patch (refreshed)
- deleted patches
- 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch (upstreamed)
- PR_7193_fix_blank_file_patterns.patch (upstreamed)
- doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch (upstreamed)
- doxygen-git-not-required.patch (upstreamed)
- reproducible-sort.patch (upstreamed)
-------------------------------------------------------------------
Wed Jul 8 07:53:57 UTC 2020 - Franz Sirl <franz.sirl-obs@lauterbach.com>
- Improve build with libclang support:
* add doxygen-libclang-cpp.patch to support linking against libclang-cpp
* add upstream doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch
to support clang-10
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 22 17:31:41 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com> Wed Jan 22 17:31:41 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>

19
doxygen.spec
View File

@ -19,7 +19,7 @@
# build with "--with libclang" to enable libclang support # build with "--with libclang" to enable libclang support
%bcond_with libclang %bcond_with libclang
Name: doxygen Name: doxygen
Version: 1.8.16 Version: 1.8.18
Release: 0 Release: 0
Summary: Automated C, C++, and Java Documentation Generator Summary: Automated C, C++, and Java Documentation Generator
# qtools are used for building and they are GPL-3.0 licensed # qtools are used for building and they are GPL-3.0 licensed
@ -33,14 +33,8 @@ Patch0: %{name}-modify_footer.patch
Patch1: %{name}-no-lowercase-man-names.patch Patch1: %{name}-no-lowercase-man-names.patch
# PATCH-FIX-UPSTREAM: add missing returns to non-void functions # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
Patch3: vhdlparser-no-return.patch Patch3: vhdlparser-no-return.patch
# really do not require git executable
Patch5: doxygen-git-not-required.patch
Patch6: doxygen-llvm-libs.patch Patch6: doxygen-llvm-libs.patch
# PATCH-FIX-UPSTREAM: Populate FILE_PATTERN default if not set (issue#7190) Patch10: doxygen-libclang-cpp.patch
Patch7: PR_7193_fix_blank_file_patterns.patch
# PATCH-FIX-UPSTREAM Including external tag files with TOC produces a broken index.qhp
Patch8: 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch
Patch9: reproducible-sort.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12
BuildRequires: flex BuildRequires: flex
@ -67,13 +61,14 @@ as well.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch5 -p1
%if %{with libclang} %if %{with libclang}
%patch6 %patch6
%endif %endif
%patch7 -p1 %if %{with libclang}
%patch8 -p1 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
%patch9 -p1 %patch10 -p1
%endif
%endif
%build %build
%cmake \ %cmake \

31
doxywizard.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Jul 10 07:34:45 UTC 2020 - pgajdos@suse.com
- version update to 1.8.18
Removed functionality
* Removed support for TCL (code is too buggy and unmaintained, language not very popular)
Features
* Added the few missing French translations [view]
* Updated Swedish translation to match the latest version [view]
* Adding check on configuration setting EXTENSION_MAPPING [view]
* Adding commands `\rtfinclude`, `\docbookinclude`, `\maninclude` and `\xmlinclude` [view]
* output on doxyparse if a function is a prototype [view]
* print protection information on doxyparse [view]
* Creation of svg images for formulas with inkscape [view]
* Improve formula handling and rendering. [view]
* Doxygen version in the messages output (#7640) [view]
* Doxygen version information (#7645) [view]
* Enabling Travis builds for s390x [view]
* Relative markdown file reference (#7032) [view]
Bugs fixed
* see https://www.doxygen.nl/manual/changelog.html
- modified patches
% doxygen-no-lowercase-man-names.patch (refreshed)
% vhdlparser-no-return.patch (refreshed)
- deleted patches
- 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch (upstreamed)
- PR_7193_fix_blank_file_patterns.patch (upstreamed)
- doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch (upstreamed)
- doxygen-git-not-required.patch (upstreamed)
- reproducible-sort.patch (upstreamed)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 10 09:14:32 UTC 2020 - Martin Pluskal <mpluskal@suse.com> Fri Jan 10 09:14:32 UTC 2020 - Martin Pluskal <mpluskal@suse.com>

5
doxywizard.spec
View File

@ -17,7 +17,7 @@
Name: doxywizard Name: doxywizard
Version: 1.8.16 Version: 1.8.18
Release: 0 Release: 0
Summary: Graphical User Interface for Doxygen Summary: Graphical User Interface for Doxygen
# qtools are used for building and they are GPL-3.0 licensed # qtools are used for building and they are GPL-3.0 licensed
@ -28,8 +28,6 @@ Source: http://doxygen.nl/files/doxygen-%{version}.src.tar.gz
Source1: doxywizard.desktop Source1: doxywizard.desktop
# PATCH-FIX-UPSTREAM: add missing returns to non-void functions # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
Patch3: vhdlparser-no-return.patch Patch3: vhdlparser-no-return.patch
# really do not require git executable
Patch4: doxygen-git-not-required.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12
BuildRequires: flex BuildRequires: flex
@ -57,7 +55,6 @@ configuration files.
%prep %prep
%setup -q -n doxygen-%{version} %setup -q -n doxygen-%{version}
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
export CFLAGS="%{optflags} -fPIC" export CFLAGS="%{optflags} -fPIC"

31
reproducible-sort.patch
View File

@ -1,31 +0,0 @@
From dc67dbe5bd5a48756c591ad02b9f68fbd2a57687 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 19 Jan 2020 20:31:52 +0100
Subject: [PATCH] issue #7474: [1.8.16 regression] HTML output varies from ASLR
---
src/memberlist.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/memberlist.cpp b/src/memberlist.cpp
index 278023bb6..edd164bec 100644
--- a/src/memberlist.cpp
+++ b/src/memberlist.cpp
@@ -75,8 +75,15 @@ int MemberList::compareValues(const MemberDef *c1, const MemberDef *c2) const
return 1;
}
int cmp = qstricmp(c1->name(),c2->name());
- if (cmp==0) cmp = qstricmp(c1->argsString(),c2->argsString());
- return cmp!=0 ? cmp : c1->getDefLine()-c2->getDefLine();
+ if (cmp==0 && c1->argsString() && c2->argsString())
+ {
+ cmp = qstricmp(c1->argsString(),c2->argsString());
+ }
+ if (cmp==0)
+ {
+ cmp = c1->getDefLine()-c2->getDefLine();
+ }
+ return cmp;
}
int MemberList::countInheritableMembers(const ClassDef *inheritedFrom) const

1272
vhdlparser-no-return.patch
View File

File diff suppressed because it is too large Load Diff