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

- version update to 1.8.16

Browse Source 
- 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

- 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

OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=139
This commit is contained in:
Petr Gajdos 2019-09-30 11:22:33 +00:00 committed by Git OBS Bridge
parent 27abbe9ba3
commit 718ad89419
10 changed files with 66 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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 --- doxygen-1.8.16.orig/Doxyfile 2019-09-30 09:31:11.324583274 +0200
+++ Doxyfile 2014-05-13 09:07:52.475141202 +0200 +++ doxygen-1.8.16/Doxyfile 2019-09-30 09:31:20.108631879 +0200
@@ -148,7 +148,7 @@ @@ -158,7 +158,7 @@ HTML_EXTRA_FILES =
HTML_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_HUE = 220
HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_SAT = 100
HTML_COLORSTYLE_GAMMA = 80 HTML_COLORSTYLE_GAMMA = 80
-HTML_TIMESTAMP = YES -HTML_TIMESTAMP = YES
+HTML_TIMESTAMP = NO +HTML_TIMESTAMP = NO
HTML_DYNAMIC_MENUS = YES
HTML_DYNAMIC_SECTIONS = YES HTML_DYNAMIC_SECTIONS = YES
HTML_INDEX_NUM_ENTRIES = 100 HTML_INDEX_NUM_ENTRIES = 100
GENERATE_DOCSET = YES

16
doxygen.changes
View File

@ -1,3 +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
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 7 14:45:46 UTC 2019 - Petr Gajdos <pgajdos@suse.com> Mon Jan 7 14:45:46 UTC 2019 - Petr Gajdos <pgajdos@suse.com>

15
doxygen.spec
View File

@ -17,7 +17,7 @@
Name: doxygen Name: doxygen
Version: 1.8.15 Version: 1.8.16
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,10 +33,8 @@ Patch1: %{name}-no-lowercase-man-names.patch
Patch3: vhdlparser-no-return.patch Patch3: vhdlparser-no-return.patch
# suse specific, for ppc64le ppc64, workaround for bnc#921577 # suse specific, for ppc64le ppc64, workaround for bnc#921577
Patch4: doxygen-dot-one-thread.patch Patch4: doxygen-dot-one-thread.patch
# https://github.com/doxygen/doxygen/issues/6725 # really do not require git executable
Patch5: doxygen-latex-makeindex.patch Patch5: doxygen-git-not-required.patch
# https://github.com/doxygen/doxygen/issues/6749
Patch6: doxygen-empty-strings-segfault.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12
BuildRequires: flex BuildRequires: flex
@ -57,14 +55,13 @@ as well.
%prep %prep
%setup -q %setup -q
%patch0 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%ifarch ppc64le ppc64 %ifarch ppc64le ppc64
%patch4 -p1 %patch4 -p1
%endif %endif
%patch5 -p1 %patch5 -p1
%patch6 -p1
%build %build
%cmake \ %cmake \
@ -74,7 +71,9 @@ as well.
-Dbuild_wizard=OFF \ -Dbuild_wizard=OFF \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -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_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 %make_jobs
%install %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> Fri Jan 11 08:13:11 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
- remove upstreamed doxywizard-qt-5.11.patch - remove upstreamed doxywizard-qt-5.11.patch

9
doxywizard.spec
View File

@ -17,7 +17,7 @@
Name: doxywizard Name: doxywizard
Version: 1.8.15 Version: 1.8.16
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,6 +28,8 @@ 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
@ -54,6 +56,7 @@ 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"
@ -62,7 +65,9 @@ export CXXFLAGS="%{optflags} -fPIC"
-Dbuild_wizard=ON \ -Dbuild_wizard=ON \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -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_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 %make_jobs
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315