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

Accepting request 664565 from devel:tools

Browse Source 
- add doxygen-latex-makeindex.patch to fix build of libssh and
  cmocka [https://github.com/doxygen/doxygen/issues/6725]
- add doxygen-empty-strings-segfault.patch to fix build of ldb
  [https://github.com/doxygen/doxygen/pull/6751]

- fix url and source url

- Update to 1.8.15:
  * Another year, another lengthy set of fixes
    http://www.doxygen.nl/manual/changelog.html#log_1_8_15
- Removed res2cc_sort_resources.diff (issue fixed upstream)

- remove upstreamed doxywizard-qt-5.11.patch

- fix url and source url

- Update to 1.8.15:
  * Another year, another lengthy set of development changes:
    http://www.doxygen.nl/manual/changelog.html#log_1_8_15

OBS-URL: https://build.opensuse.org/request/show/664565
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger
2019-01-15 12:16:23 +00:00
committed by Git OBS Bridge
parent 55154e9243 27abbe9ba3
commit d7b0b168ae
10 changed files with 116 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -0,0 +1,45 @@
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-latex-makeindex.patch Normal file
View File

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

22
doxygen.changes
View File

@@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Jan 7 14:45:46 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
- add doxygen-latex-makeindex.patch to fix build of libssh and
cmocka [https://github.com/doxygen/doxygen/issues/6725]
- add doxygen-empty-strings-segfault.patch to fix build of ldb
[https://github.com/doxygen/doxygen/pull/6751]
-------------------------------------------------------------------
Mon Dec 31 08:45:19 UTC 2018 - Petr Gajdos <pgajdos@suse.com>
- fix url and source url
-------------------------------------------------------------------
Mon Dec 31 07:07:14 UTC 2018 - sean@suspend.net
- Update to 1.8.15:
* Another year, another lengthy set of fixes
http://www.doxygen.nl/manual/changelog.html#log_1_8_15
- Removed res2cc_sort_resources.diff (issue fixed upstream)
-------------------------------------------------------------------
Wed Jan 3 12:52:54 UTC 2018 - tchvatal@suse.com

19
doxygen.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package doxygen
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: doxygen
Version: 1.8.14
Version: 1.8.15
Release: 0
Summary: Automated C, C++, and Java Documentation Generator
# qtools are used for building and they are GPL-3.0 licensed
License: GPL-2.0-or-later AND GPL-3.0-only
Group: Development/Tools/Doc Generators
Url: http://www.stack.nl/~dimitri/doxygen/
Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
Url: http://www.doxygen.nl/
Source0: http://doxygen.nl/files/doxygen-%{version}.src.tar.gz
# suse specific
Patch0: %{name}-modify_footer.patch
# suse specific
@@ -33,8 +33,10 @@ Patch1: %{name}-no-lowercase-man-names.patch
Patch3: vhdlparser-no-return.patch
# suse specific, for ppc64le ppc64, workaround for bnc#921577
Patch4: doxygen-dot-one-thread.patch
# Submitted upstream, fix for https://bugzilla.gnome.org/show_bug.cgi?id=777672
Patch6: res2cc_sort_resources.diff
# 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
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: flex
@@ -61,7 +63,8 @@ as well.
%ifarch ppc64le ppc64
%patch4 -p1
%endif
%patch6
%patch5 -p1
%patch6 -p1
%build
%cmake \

38
doxywizard-qt-5.11.patch
View File

@@ -1,38 +0,0 @@
--- a/addon/doxywizard/CMakeLists.txt
+++ a/addon/doxywizard/CMakeLists.txt
@@ -4,9 +4,6 @@ if (NOT force_qt4)
if (Qt5Core_FOUND)
message(STATUS "Using Qt5")
find_package(Qt5 COMPONENTS Widgets Gui Xml)
- macro(qt_use_modules)
- qt5_use_modules(${ARGN})
- endmacro()
macro(qt_wrap_cpp)
qt5_wrap_cpp(${ARGN})
endmacro()
@@ -23,8 +20,6 @@ if (NOT Qt5Core_FOUND)
message(STATUS "Using Qt4")
endif()
find_package(Qt4 REQUIRED COMPONENTS QtCore QtXml QtGui)
- macro(qt_use_modules)
- endmacro()
macro(qt_wrap_cpp)
qt4_wrap_cpp(${ARGN})
endmacro()
@@ -104,9 +99,11 @@ ${GENERATED_SRC_WIZARD}/configdoc.cpp
${doxywizard_MOC}
${doxywizard_RESOURCES_RCC}
)
-qt_use_modules(doxywizard Core Gui Widgets Xml)
-target_link_libraries(doxywizard
-${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}
-)
+
+if(Qt5Core_FOUND)
+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
+else()
+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+endif()
install(TARGETS doxywizard DESTINATION bin)

17
doxywizard.changes
View File

@@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Jan 11 08:13:11 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
- remove upstreamed doxywizard-qt-5.11.patch
-------------------------------------------------------------------
Mon Dec 31 08:47:21 UTC 2018 - Petr Gajdos <pgajdos@suse.com>
- fix url and source url
-------------------------------------------------------------------
Mon Dec 31 01:19:11 UTC 2018 - sean@suspend.net
- Update to 1.8.15:
* Another year, another lengthy set of development changes:
http://www.doxygen.nl/manual/changelog.html#log_1_8_15
-------------------------------------------------------------------
Tue Jun 19 09:51:37 UTC 2018 - pgajdos@suse.com

12
doxywizard.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package doxywizard
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,23 +12,22 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: doxywizard
Version: 1.8.14
Version: 1.8.15
Release: 0
Summary: Graphical User Interface for Doxygen
# qtools are used for building and they are GPL-3.0 licensed
License: GPL-2.0-or-later AND GPL-3.0-only
Group: Development/Tools/Doc Generators
Url: http://www.stack.nl/~dimitri/doxygen/
Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
Url: http://www.doxygen.nl/
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
Patch4: doxywizard-qt-5.11.patch
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: flex
@@ -55,7 +54,6 @@ configuration files.
%prep
%setup -q -n doxygen-%{version}
%patch3 -p1
%patch4 -p1
%build
export CFLAGS="%{optflags} -fPIC"

15
res2cc_sort_resources.diff
View File

@@ -1,15 +0,0 @@
--- src/res2cc_cmd.py_orig 2016-05-10 21:51:52.000000000 +0200
+++ src/res2cc_cmd.py 2017-01-23 23:54:53.499507342 +0100
@@ -98,10 +98,11 @@
directory = sys.argv[1]
files = []
for dirName, subdirList, fileList in walk(directory):
- for fname in sorted(fileList):
+ for fname in fileList:
subdir = dirName[len(directory)+1:] if dirName.startswith(directory) else dirName
if subdir:
files.append(File.factory(directory,subdir,fname))
+ files.sort(key=lambda f: f.subdir + "/" + f.fileName)
outputFile = open(sys.argv[2],"w")
print("#include \"resourcemgr.h\"\n",file=outputFile)
for f in files: