From 718ad894199b65b8b5ad0f52faf4a26f11abf998a90e18dee9b99cc120563b85 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 30 Sep 2019 11:22:33 +0000 Subject: [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 - 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 --- doxygen-1.8.15.src.tar.gz | 3 -- doxygen-1.8.16.src.tar.gz | 3 ++ doxygen-empty-strings-segfault.patch | 45 ---------------------------- doxygen-git-not-required.patch | 13 ++++++++ doxygen-latex-makeindex.patch | 13 -------- doxygen-modify_footer.patch | 11 ++++--- doxygen.changes | 16 ++++++++++ doxygen.spec | 15 +++++----- doxywizard.changes | 15 ++++++++++ doxywizard.spec | 9 ++++-- 10 files changed, 66 insertions(+), 77 deletions(-) delete mode 100644 doxygen-1.8.15.src.tar.gz create mode 100644 doxygen-1.8.16.src.tar.gz delete mode 100644 doxygen-empty-strings-segfault.patch create mode 100644 doxygen-git-not-required.patch delete mode 100644 doxygen-latex-makeindex.patch 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-empty-strings-segfault.patch b/doxygen-empty-strings-segfault.patch deleted file mode 100644 index af5a50d..0000000 --- a/doxygen-empty-strings-segfault.patch +++ /dev/null @@ -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; - diff --git a/doxygen-git-not-required.patch b/doxygen-git-not-required.patch new file mode 100644 index 0000000..abc003b --- /dev/null +++ b/doxygen-git-not-required.patch @@ -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) + diff --git a/doxygen-latex-makeindex.patch b/doxygen-latex-makeindex.patch deleted file mode 100644 index 330c8e6..0000000 --- a/doxygen-latex-makeindex.patch +++ /dev/null @@ -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 - ]]> - - --