From c1b10c0276068850d72e8f624361bc02be7843777c7862ad4d5f44464c8aad42 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 14 Feb 2017 10:16:35 +0000 Subject: [PATCH 1/3] Accepting request 457042 from home:mathletic:branches:devel:tools update to 1.8.13 OBS-URL: https://build.opensuse.org/request/show/457042 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=114 --- doxygen-1.8.12.src.tar.gz | 3 --- doxygen-1.8.13.src.tar.gz | 3 +++ doxygen-doc.changes | 7 +++++++ doxygen-doc.spec | 2 +- doxygen-fix-QCH-files.patch | 28 ---------------------------- doxygen.changes | 6 ++++++ doxygen.spec | 5 +---- doxywizard.changes | 6 ++++++ doxywizard.spec | 4 ++-- 9 files changed, 26 insertions(+), 38 deletions(-) delete mode 100644 doxygen-1.8.12.src.tar.gz create mode 100644 doxygen-1.8.13.src.tar.gz delete mode 100644 doxygen-fix-QCH-files.patch diff --git a/doxygen-1.8.12.src.tar.gz b/doxygen-1.8.12.src.tar.gz deleted file mode 100644 index 3f26b7c..0000000 --- a/doxygen-1.8.12.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c -size 4880613 diff --git a/doxygen-1.8.13.src.tar.gz b/doxygen-1.8.13.src.tar.gz new file mode 100644 index 0000000..71afe27 --- /dev/null +++ b/doxygen-1.8.13.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b +size 4893912 diff --git a/doxygen-doc.changes b/doxygen-doc.changes index 0e5ee39..639588f 100644 --- a/doxygen-doc.changes +++ b/doxygen-doc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 14 08:09:53 UTC 2017 - foss@grueninger.de + +- Update to 1.8.13 + See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_13 +- dropped doxygen-fix-QCH-files.patch, it is part of the release + ------------------------------------------------------------------- Tue Sep 6 21:07:53 UTC 2016 - foss@grueninger.de diff --git a/doxygen-doc.spec b/doxygen-doc.spec index a185947..38b9646 100644 --- a/doxygen-doc.spec +++ b/doxygen-doc.spec @@ -17,7 +17,7 @@ Name: doxygen-doc -Version: 1.8.12 +Version: 1.8.13 Release: 0 Summary: Automated C, C++, and Java Documentation Generator License: GPL-2.0+ diff --git a/doxygen-fix-QCH-files.patch b/doxygen-fix-QCH-files.patch deleted file mode 100644 index 774ab2a..0000000 --- a/doxygen-fix-QCH-files.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bf9415698e53d79b4b94bdf64a52be4347eb3150 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" -Date: Sun, 30 Oct 2016 11:15:14 +0100 -Subject: [PATCH] Fix: Add missing jquery.js, dynsections.js & optional - svgpan.js to QCH file - ---- - src/htmlgen.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp -index 5b4519b..0ca7182 100644 ---- a/src/htmlgen.cpp -+++ b/src/htmlgen.cpp -@@ -1026,6 +1026,13 @@ void HtmlGenerator::writeStyleInfo(int part) - } - } - } -+ -+ Doxygen::indexList->addStyleSheetFile("jquery.js"); -+ Doxygen::indexList->addStyleSheetFile("dynsections.js"); -+ if (Config_getBool(INTERACTIVE_SVG)) -+ { -+ Doxygen::indexList->addStyleSheetFile("svgpan.js"); -+ } - } - } - diff --git a/doxygen.changes b/doxygen.changes index 1f431f7..8e4380c 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 14 08:10:21 UTC 2017 - foss@grueninger.de + +- Update to 1.8.13 + See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_13 + ------------------------------------------------------------------- Tue Jan 24 12:28:25 UTC 2017 - stefan.bruens@rwth-aachen.de diff --git a/doxygen.spec b/doxygen.spec index 194323c..2f11948 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -17,7 +17,7 @@ Name: doxygen -Version: 1.8.12 +Version: 1.8.13 Release: 0 Summary: Automated C, C++, and Java Documentation Generator License: GPL-2.0+ @@ -32,8 +32,6 @@ 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 -# is upstreamed, bnc#1011331 -Patch5: doxygen-fix-QCH-files.patch # Submitted upstream, fix for https://bugzilla.gnome.org/show_bug.cgi?id=777672 Patch6: res2cc_sort_resources.diff BuildRequires: bison @@ -60,7 +58,6 @@ as well. %ifarch ppc64le ppc64 %patch4 -p1 %endif -%patch5 -p1 %patch6 -p0 %build diff --git a/doxywizard.changes b/doxywizard.changes index 56f0e80..3bcc3d3 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 14 08:10:28 UTC 2017 - foss@grueninger.de + +- Update to 1.8.13 + See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_13 + ------------------------------------------------------------------- Tue Sep 6 21:07:24 UTC 2016 - foss@grueninger.de diff --git a/doxywizard.spec b/doxywizard.spec index a1f17ce..70c0022 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -17,7 +17,7 @@ Name: doxywizard -Version: 1.8.12 +Version: 1.8.13 Release: 0 Summary: Graphical User Interface for Doxygen License: GPL-2.0+ @@ -28,7 +28,7 @@ Source1: doxywizard.desktop # PATCH-FIX-UPSTREAM: add missing returns to non-void functions Patch3: vhdlparser-no-return.patch BuildRequires: bison -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 2.8.13 BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: libjpeg-devel From 5c273b8c9d0be07df20109f40c6225db05f0bfa03d61af859c0e013d1814a930 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 14 Feb 2017 10:36:54 +0000 Subject: [PATCH 2/3] doxygen-fix-QCH-files.patch was dropped from doxygen.spec OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=115 --- doxygen-doc.changes | 1 - doxygen.changes | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/doxygen-doc.changes b/doxygen-doc.changes index 639588f..5e13ce5 100644 --- a/doxygen-doc.changes +++ b/doxygen-doc.changes @@ -3,7 +3,6 @@ Tue Feb 14 08:09:53 UTC 2017 - foss@grueninger.de - Update to 1.8.13 See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_13 -- dropped doxygen-fix-QCH-files.patch, it is part of the release ------------------------------------------------------------------- Tue Sep 6 21:07:53 UTC 2016 - foss@grueninger.de diff --git a/doxygen.changes b/doxygen.changes index 8e4380c..b58a689 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -3,6 +3,7 @@ Tue Feb 14 08:10:21 UTC 2017 - foss@grueninger.de - Update to 1.8.13 See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_13 +- dropped doxygen-fix-QCH-files.patch, it is part of the release ------------------------------------------------------------------- Tue Jan 24 12:28:25 UTC 2017 - stefan.bruens@rwth-aachen.de From 65aa325f64601572168bed6b76b413e6aa1ad86528c4103b38f3c1fb0eb8af93 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 20 Feb 2017 19:40:23 +0000 Subject: [PATCH 3/3] Accepting request 459311 from home:dimstar:Factory Fix the segfault seen in :J OBS-URL: https://build.opensuse.org/request/show/459311 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=116 --- doxygen-guard-null-variable.patch | 25 +++++++++++++++++++++++++ doxygen.changes | 6 ++++++ doxygen.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 doxygen-guard-null-variable.patch diff --git a/doxygen-guard-null-variable.patch b/doxygen-guard-null-variable.patch new file mode 100644 index 0000000..98a5e07 --- /dev/null +++ b/doxygen-guard-null-variable.patch @@ -0,0 +1,25 @@ +From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001 +From: albert-github +Date: Wed, 4 Jan 2017 12:24:55 +0100 +Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the + breathe docs + +Protected against NULL pointer of variable al +--- + src/xmlgen.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp +index fe95c7a..70e198a 100644 +--- a/src/xmlgen.cpp ++++ b/src/xmlgen.cpp +@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De + if (md->isInline()) t << "yes"; else t << "no"; + t << "\""; + +- if (al->refQualifier!=RefQualifierNone) ++ if (al!=0 && al->refQualifier!=RefQualifierNone) + { + t << " refqual=\""; + if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue"; + diff --git a/doxygen.changes b/doxygen.changes index b58a689..4c7800b 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 20 17:51:08 UTC 2017 - dimstar@opensuse.org + +- Add doxygen-guard-null-variable.patch: Protected against NULL + pointer of variable al, upstream commit 0f02761. + ------------------------------------------------------------------- Tue Feb 14 08:10:21 UTC 2017 - foss@grueninger.de diff --git a/doxygen.spec b/doxygen.spec index 2f11948..107277c 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -34,6 +34,8 @@ Patch3: vhdlparser-no-return.patch Patch4: doxygen-dot-one-thread.patch # Submitted upstream, fix for https://bugzilla.gnome.org/show_bug.cgi?id=777672 Patch6: res2cc_sort_resources.diff +# PATCH-FIX-UPSTREAM doxygen-guard-null-variable.patch gh#doxygen/doxygen#555 dimstar@opensuse.org -- Protected against NULL pointer of variable al +Patch7: doxygen-guard-null-variable.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -59,6 +61,7 @@ as well. %patch4 -p1 %endif %patch6 -p0 +%patch7 -p1 %build export CFLAGS="%{optflags} -fPIC"