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

Accepting request 746480 from devel:tools

Browse Source 
Fixes build for e.g. libftdi1 (see Staging:O)

- 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 (forwarded request 746429 from StefanBruens)

OBS-URL: https://build.opensuse.org/request/show/746480
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=75
This commit is contained in:
Dominique Leuenberger
2019-12-07 14:16:31 +00:00
committed by Git OBS Bridge
parent d7b0b168ae fb4d4356c6
commit 40c26a205d
13 changed files with 159 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
PR_7193_fix_blank_file_patterns.patch Normal file
View File

@@ -0,0 +1,48 @@
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.15.src.tar.gz
View File

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

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

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

23
doxygen-dot-one-thread.patch
View File

@@ -1,23 +0,0 @@
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
===================================================================
--- 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<numThreads;i++)
{
DotWorkerThread *thread = new DotWorkerThread(m_queue);

45
doxygen-empty-strings-segfault.patch
View File

@@ -1,45 +0,0 @@
diff --git a/src/util.cpp b/src/util.cpp
index f9c2492fb..9a0e513b5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -5444,6 +5444,7 @@ QCString escapeCharsInString(const char *name,bool allowDots,bool allowUnderscor
static bool allowUnicodeNames = Config_getBool(ALLOW_UNICODE_NAMES);
static GrowBuf growBuf;
growBuf.clear();
+ if (name==0) return "";
char c;
const char *p=name;
while ((c=*p++)!=0)
@@ -6962,6 +6963,7 @@ void filterLatexString(FTextStream &t,const char *str,
QCString latexEscapeLabelName(const char *s)
{
+ if (s==0) return "";
QGString result;
QCString tmp(qstrlen(s)+1);
FTextStream t(&result);
@@ -6999,6 +7001,7 @@ QCString latexEscapeLabelName(const char *s)
QCString latexEscapeIndexChars(const char *s)
{
+ if (s==0) return "";
QGString result;
QCString tmp(qstrlen(s)+1);
FTextStream t(&result);
@@ -7037,6 +7040,7 @@ QCString latexEscapeIndexChars(const char *s)
QCString latexEscapePDFString(const char *s)
{
+ if (s==0) return "";
QGString result;
FTextStream t(&result);
const char *p=s;
@@ -7061,6 +7065,7 @@ QCString latexEscapePDFString(const char *s)
QCString latexFilterURL(const char *s)
{
+ if (s==0) return "";
QGString result;
FTextStream t(&result);
const char *p=s;

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

@@ -0,0 +1,13 @@
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)

13
doxygen-latex-makeindex.patch
View File

@@ -1,13 +0,0 @@
Index: doxygen-1.8.15/src/config.xml
===================================================================
--- doxygen-1.8.15.orig/src/config.xml 2018-12-27 19:05:37.000000000 +0100
+++ doxygen-1.8.15/src/config.xml 2019-01-07 13:11:07.980751501 +0100
@@ -2594,7 +2594,7 @@ EXTRA_SEARCH_MAPPINGS = tagname1=loc1 ta
]]>
</docs>
</option>
- <option type='string' id='LATEX_MAKEINDEX_CMD' defval='\makeindex' depends='GENERATE_LATEX'>
+ <option type='string' id='LATEX_MAKEINDEX_CMD' defval='makeindex' depends='GENERATE_LATEX'>
<docs>
<![CDATA[
The \c LATEX_MAKEINDEX_CMD tag can be used to specify the command name to

13
doxygen-llvm-libs.patch Normal file
View File

@@ -0,0 +1,13 @@
--- src/CMakeLists.txt~ 2019-07-28 13:32:49.436473952 +0200
+++ src/CMakeLists.txt 2019-07-28 13:33:52.016439550 +0200
@@ -261,9 +261,8 @@
endif()
include_directories(${LLVM_INCLUDE_DIRS})
add_definitions(${LLVM_DEFINITIONS})
- llvm_map_components_to_libnames(llvm_libs support core option)
target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
- set(CLANG_LIBS libclang clangTooling ${llvm_libs})
+ set(CLANG_LIBS libclang clangTooling LLVM)
endif()
target_link_libraries(doxygen

11
doxygen-modify_footer.patch
View File

@@ -1,14 +1,13 @@
Index: Doxyfile
Index: doxygen-1.8.16/Doxyfile
===================================================================
--- Doxyfile.orig 2014-02-08 14:06:14.000000000 +0100
+++ Doxyfile 2014-05-13 09:07:52.475141202 +0200
@@ -148,7 +148,7 @@
--- doxygen-1.8.16.orig/Doxyfile 2019-09-30 09:31:11.324583274 +0200
+++ doxygen-1.8.16/Doxyfile 2019-09-30 09:31:20.108631879 +0200
@@ -158,7 +158,7 @@ HTML_EXTRA_FILES =
HTML_COLORSTYLE_HUE = 220
HTML_COLORSTYLE_SAT = 100
HTML_COLORSTYLE_GAMMA = 80
-HTML_TIMESTAMP = YES
+HTML_TIMESTAMP = NO
HTML_DYNAMIC_MENUS = YES
HTML_DYNAMIC_SECTIONS = YES
HTML_INDEX_NUM_ENTRIES = 100
GENERATE_DOCSET = YES

32
doxygen.changes
View File

@@ -1,3 +1,35 @@
-------------------------------------------------------------------
Thu Nov 7 21:07:47 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <franz.sirl-obs@lauterbach.com>
- Optional build with libclang support:
* add doxygen-llvm-libs.patch to link with monolithic libLLVM
* support "--with libclang" in specfile
-------------------------------------------------------------------
Mon Sep 30 11:13:23 UTC 2019 - pgajdos@suse.com
- version update to 1.8.16
- many bugs fixed
- many features implemented
- http://www.doxygen.nl/manual/changelog.html
- modified patches
% doxygen-modify_footer.patch (refreshed)
- deleted patches
- doxygen-empty-strings-segfault.patch (upstreamed)
- doxygen-latex-makeindex.patch (upstreamed)
- added patches
really do not require git executable
+ doxygen-git-not-required.patch
-------------------------------------------------------------------
Mon Jan 7 14:45:46 UTC 2019 - Petr Gajdos <pgajdos@suse.com>

36
doxygen.spec
View File

@@ -16,8 +16,11 @@
#
# build with "--with libclang" to enable libclang support
%bcond_with libclang
Name: doxygen
Version: 1.8.15
Version: 1.8.16
Release: 0
Summary: Automated C, C++, and Java Documentation Generator
# qtools are used for building and they are GPL-3.0 licensed
@@ -31,18 +34,20 @@ 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
# https://github.com/doxygen/doxygen/issues/6725
Patch5: doxygen-latex-makeindex.patch
# https://github.com/doxygen/doxygen/issues/6749
Patch6: doxygen-empty-strings-segfault.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
BuildRequires: gcc-c++
BuildRequires: python3-base
BuildRequires: python3-xml
%if %{with libclang}
BuildRequires: llvm-clang-devel
%endif
# Do not bother building documentation with latex since it is present on the
# web trivialy for all versions of doxygen
Obsoletes: doxygen-doc
@@ -57,14 +62,14 @@ as well.
%prep
%setup -q
%patch0
%patch0 -p1
%patch1 -p1
%patch3 -p1
%ifarch ppc64le ppc64
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
%if %{with libclang}
%patch6
%endif
%patch7 -p1
%build
%cmake \
@@ -72,9 +77,14 @@ as well.
-Dbuild_xmlparser=ON \
-Dbuild_search=OFF \
-Dbuild_wizard=OFF \
%if %{with libclang}
-Duse_libclang=ON \
%endif
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now"
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_STATIC_LIBS=ON
%make_jobs
%install

15
doxywizard.changes
View File

@@ -1,4 +1,19 @@
-------------------------------------------------------------------
Mon Sep 30 11:13:23 UTC 2019 - pgajdos@suse.com
- version update to 1.8.16
- many bugs fixed
- many features implemented
- http://www.doxygen.nl/manual/changelog.html
- modified patches
% doxygen-modify_footer.patch (refreshed)
- deleted patches
- doxygen-empty-strings-segfault.patch (upstreamed)
- doxygen-latex-makeindex.patch (upstreamed)
- added patches
really do not require git executable
+ doxygen-git-not-required.patch
-------------------------------------------------------------------
Fri Jan 11 08:13:11 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
- remove upstreamed doxywizard-qt-5.11.patch

9
doxywizard.spec
View File

@@ -17,7 +17,7 @@
Name: doxywizard
Version: 1.8.15
Version: 1.8.16
Release: 0
Summary: Graphical User Interface for Doxygen
# qtools are used for building and they are GPL-3.0 licensed
@@ -28,6 +28,8 @@ Source: http://doxygen.nl/files/doxygen-%{version}.src.tar.gz
Source1: doxywizard.desktop
# PATCH-FIX-UPSTREAM: add missing returns to non-void functions
Patch3: vhdlparser-no-return.patch
# really do not require git executable
Patch4: doxygen-git-not-required.patch
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: flex
@@ -54,6 +56,7 @@ configuration files.
%prep
%setup -q -n doxygen-%{version}
%patch3 -p1
%patch4 -p1
%build
export CFLAGS="%{optflags} -fPIC"
@@ -62,7 +65,9 @@ export CXXFLAGS="%{optflags} -fPIC"
-Dbuild_wizard=ON \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now"
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_STATIC_LIBS=ON
%make_jobs
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315