Accepting request 459321 from devel:tools

1

OBS-URL: https://build.opensuse.org/request/show/459321
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2017-02-21 12:37:09 +00:00 committed by Git OBS Bridge
commit 5dd166c5aa
10 changed files with 60 additions and 38 deletions

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Tue Sep 6 21:07:53 UTC 2016 - foss@grueninger.de

View File

@ -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+

View File

@ -1,28 +0,0 @@
From bf9415698e53d79b4b94bdf64a52be4347eb3150 Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
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");
+ }
}
}

View File

@ -0,0 +1,25 @@
From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
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";

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- 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

View File

@ -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,10 +32,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
# 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
# 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
@ -60,8 +60,8 @@ as well.
%ifarch ppc64le ppc64
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p0
%patch7 -p1
%build
export CFLAGS="%{optflags} -fPIC"

View File

@ -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

View File

@ -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